Skip to content

Commit

Permalink
Colorable Caps, Softcaps, & Windbreakers (#4114)
Browse files Browse the repository at this point in the history
## About The Pull Request

Resprites softcaps based off @Imaginos16's cap sprites, adds colorable
flapcaps based off @thgvr's sprites, and adds colorable windbreakers.
Adds all of these clothes to the loadout for players to customize their
blorbos with.


![image](https://github.com/user-attachments/assets/42117b03-b1fc-469d-8b6b-9fd770a237ed)

All spritework credited to Moffball. Major coding help from @Erikafox.

## Why It's Good For The Game

Decrusts softcaps. Fashionable clothes for casual wear is also good
(particularly for indies).

## Changelog

:cl:Moffball, MemeSnorfer, and Erikafox
add: Colorable Windbreakers!
add: Colorable Flapcaps!
imageadd: Resprites Softcaps, and makes them Colorable!
/:cl:
  • Loading branch information
MemeSnorfer authored Feb 7, 2025
1 parent 2fef8fc commit d5337ab
Show file tree
Hide file tree
Showing 19 changed files with 437 additions and 111 deletions.
2 changes: 1 addition & 1 deletion _maps/shuttles/pirate/pirate_tortuga.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4113,7 +4113,7 @@
pixel_y = 8;
pixel_x = 5
},
/obj/item/clothing/head/soft/mime,
/obj/item/clothing/head/soft,
/turf/open/floor/plasteel/white,
/area/ship/crew/canteen)
"ZC" = (
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
null, \
new/datum/stack_recipe("fingerless gloves", /obj/item/clothing/gloves/fingerless, 1), \
new/datum/stack_recipe("white gloves", /obj/item/clothing/gloves/color/white, 3), \
new/datum/stack_recipe("white softcap", /obj/item/clothing/head/soft/mime, 2), \
new/datum/stack_recipe("white softcap", /obj/item/clothing/head/soft, 2), \
new/datum/stack_recipe("white beanie", /obj/item/clothing/head/beanie, 2), \
null, \
new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/blindfold, 2), \
Expand Down
4 changes: 3 additions & 1 deletion code/game/objects/objs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
* * M The mob choosing a reskin option
*/

/obj/proc/reskin_obj(mob/M)
/obj/proc/reskin_obj(mob/M, change_name=FALSE)
if(!LAZYLEN(unique_reskin))
return

Expand All @@ -376,6 +376,8 @@
if(!allow_post_reskins)
current_skin = pick
icon_state = unique_reskin[pick]
if(change_name)
name = pick
to_chat(M, "[src] is now skinned as '[pick].'")
update_appearance()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
/obj/item/radio/headset/headset_srv = 2,
/obj/item/clothing/accessory/waistcoat = 2,
/obj/item/clothing/suit/apron/chef = 3,
/obj/item/clothing/head/soft/mime = 2,
/obj/item/clothing/head/soft = 2,
/obj/item/storage/box/mousetraps = 2,
/obj/item/circuitboard/machine/dish_drive = 1,
/obj/item/clothing/suit/toggle/chef = 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/white(src)
for(var/i in 1 to 3)
new /obj/item/clothing/head/soft/mime(src)
new /obj/item/clothing/head//mime(src)
return

/obj/structure/closet/wardrobe/pjs
Expand Down
27 changes: 6 additions & 21 deletions code/modules/client/loadout/loadout_hat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,27 +81,8 @@
//Soft caps

/datum/gear/hat/softcap
subtype_path = /datum/gear/hat/softcap

/datum/gear/hat/softcap/red
display_name = "cap, red"
path = /obj/item/clothing/head/soft/red

/datum/gear/hat/softcap/blue
display_name = "cap, blue"
path = /obj/item/clothing/head/soft/blue

/datum/gear/hat/softcap/grey
display_name = "cap, grey"
path = /obj/item/clothing/head/soft/grey

/datum/gear/hat/softcap/white
display_name = "cap, white"
path = /obj/item/clothing/head/soft/mime

/datum/gear/hat/softcap/black
display_name = "cap, black"
path = /obj/item/clothing/head/soft/black
display_name = "cap, recolorable"
path = /obj/item/clothing/head/soft

/datum/gear/hat/utility_black
display_name = "utility cover, black"
Expand Down Expand Up @@ -186,3 +167,7 @@
/datum/gear/hat/flowers
display_name = "plastic flower, pickable"
path = /obj/item/clothing/head/plastic_flower

/datum/gear/hat/flap
display_name = "flap cap, recolorable"
path = /obj/item/clothing/head/flap
4 changes: 4 additions & 0 deletions code/modules/client/loadout/loadout_suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@
display_name = "hazard jacket"
path = /obj/item/clothing/suit/toggle/hazard

/datum/gear/suit/jacket/windbreaker
display_name = "windbreaker, colorable"
path = /obj/item/clothing/suit/toggle/windbreaker

//Suspenders
/datum/gear/suit/suspenders
subtype_path = /datum/gear/suit/suspenders
Expand Down
3 changes: 2 additions & 1 deletion code/modules/clothing/factions/frontiersmen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,10 @@
name = "frontiersman cap"
desc = "An olive-green and grey baseball hat, worn by cargo technicians working under the Frontiersmen. Even they have the rights for a cool cap!"
icon_state = "frontiersoft"
soft_type = "frontier"
current_skin = "frontiersoft"
icon = 'icons/obj/clothing/faction/frontiersmen/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/head.dmi'
unique_reskin = null

/obj/item/clothing/head/beret/sec/frontier
name = "\improper Frontiersmen beret"
Expand Down
104 changes: 104 additions & 0 deletions code/modules/clothing/head/flaphat.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
//Civilian Flap Caps
/obj/item/clothing/head/flap
name = "Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects."
icon_state = "flapwhite"
cuttable = TRUE
clothamnt = 2
unique_reskin = list("white Betzu-il cap" = "flapwhite",
"grey Betzu-il cap" = "flapgrey",
"black Betzu-il cap" = "flapblack",
"red Betzu-il cap" = "flapred",
"maroon Betzu-il cap" = "flapmaroon",
"orange Betzu-il cap" = "flaporange",
"yellow Betzu-il cap" = "flapyellow",
"green Betzu-il cap" = "flapgreen",
"dark green Betzu-il cap" = "flapdarkgreen",
"teal Betzu-il cap" = "flapteal",
"blue Betzu-il cap" = "flapblue",
"dark Betzu-il cap" = "flapdarkblue",
"purple Betzu-il cap" = "flappurple",
"pink Betzu-il cap" = "flappink",
"brown Betzu-il cap" = "flapbrown",
"light brown Betzu-il cap" = "flaplightbrown"
)

/obj/item/clothing/head/flap/white
name = "white Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is white."
icon_state = "flapwhite"

/obj/item/clothing/head/flap/grey
name = "grey Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is grey."
icon_state = "flapgrey"

/obj/item/clothing/head/flap/black
name = "black Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is black."
icon_state = "flapblack"

/obj/item/clothing/head/flap/red
name = "red Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is red."
icon_state = "flapred"

/obj/item/clothing/head/flap/maroon
name = "maroon Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is maroon."
icon_state = "flapmaroon"

/obj/item/clothing/head/flap/orange
name = "orange Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is orange."
icon_state = "flaporange"

/obj/item/clothing/head/flap/yellow
name = "yellow Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is yellow."
icon_state = "flapyellow"

/obj/item/clothing/head/flap/green
name = "green Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is green."
icon_state = "flapgreen"

/obj/item/clothing/head/flap/darkgreen
name = "dark green Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is dark green."
icon_state = "flapdarkgreen"

/obj/item/clothing/head/flap/teal
name = "teal Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is teal."
icon_state = "flapteal"

/obj/item/clothing/head/flap/blue
name = "blue Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is blue."
icon_state = "flapblue"

/obj/item/clothing/head/flap/darkblue
name = "dark blue Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is dark blue."
icon_state = "flapdarkblue"

/obj/item/clothing/head/flap/purple
name = "purple Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is purple."
icon_state = "flappurple"

/obj/item/clothing/head/flap/pink
name = "pink Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is pink."
icon_state = "flappink"

/obj/item/clothing/head/flap/brown
name = "brown Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is brown."
icon_state = "flapbrown"

/obj/item/clothing/head/flap/lightbrown
name = "light brown Betzu-il cap"
desc = "A common cap popular among Kalixcian travellers. “Betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. This one is light brown."
icon_state = "flaplightbrown"
Loading

0 comments on commit d5337ab

Please sign in to comment.