[MIRROR] yet another clothing port pr (#8665)

Co-authored-by: dan <75939194+PastelPrinceDan@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-07-22 06:43:14 -07:00
committed by GitHub
parent b3cb9b276d
commit dbb4138836
28 changed files with 156 additions and 3 deletions

View File

@@ -65,6 +65,7 @@
..() ..()
var/list/selector_uniforms = list( var/list/selector_uniforms = list(
"black"=/obj/item/clothing/gloves/fingerless, "black"=/obj/item/clothing/gloves/fingerless,
"black, alt" =/obj/item/clothing/gloves/fingerless/alt,
"recolourable white"=/obj/item/clothing/gloves/fingerless_recolourable "recolourable white"=/obj/item/clothing/gloves/fingerless_recolourable
) )
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))

View File

@@ -419,3 +419,18 @@
/datum/gear/head/giantbow/New() /datum/gear/head/giantbow/New()
..() ..()
gear_tweaks += gear_tweak_free_color_choice gear_tweaks += gear_tweak_free_color_choice
/datum/gear/head/bows
display_name = "hair bow selection, colorable"
path = /obj/item/clothing/head/bow
/datum/gear/head/bows/New()
..()
var/list/bows = list(
"large bow"=/obj/item/clothing/head/bow,
"small bow"=/obj/item/clothing/head/bow/small,
"back bow"=/obj/item/clothing/head/bow/back,
"sweet bow"=/obj/item/clothing/head/bow/sweet
)
gear_tweaks += list(new/datum/gear_tweak/path(bows), gear_tweak_free_color_choice)

View File

@@ -37,6 +37,14 @@
display_name = "jackboots. thigh-length" display_name = "jackboots. thigh-length"
path = /obj/item/clothing/shoes/boots/jackboots/thigh path = /obj/item/clothing/shoes/boots/jackboots/thigh
/datum/gear/shoes/colorboots
display_name = "jackboots, recolorable"
path = /obj/item/clothing/shoes/boots/jackboots/recolorable
/datum/gear/shoes/colorboots/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/shoes/workboots /datum/gear/shoes/workboots
display_name = "workboots" display_name = "workboots"
path = /obj/item/clothing/shoes/boots/workboots path = /obj/item/clothing/shoes/boots/workboots
@@ -264,3 +272,11 @@
/datum/gear/shoes/halfmoon /datum/gear/shoes/halfmoon
display_name = "half moon boots" display_name = "half moon boots"
path = /obj/item/clothing/shoes/boots/half_moon path = /obj/item/clothing/shoes/boots/half_moon
/datum/gear/shoes/sandals
display_name = "sandals, colorable"
path = /obj/item/clothing/shoes/sandals
/datum/gear/shoes/sandals/New()
..()
gear_tweaks += gear_tweak_free_color_choice

View File

@@ -324,6 +324,15 @@
) )
gear_tweaks += new/datum/gear_tweak/path(ranger_ponchos) gear_tweaks += new/datum/gear_tweak/path(ranger_ponchos)
/datum/gear/suit/neo_ranger //colorable ranger poncho
display_name = "ranger poncho, colorable"
path = /obj/item/clothing/accessory/poncho/roles/neo_ranger
cost = 1
/datum/gear/suit/neo_ranger/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/unathi_robe /datum/gear/suit/unathi_robe
display_name = "roughspun robe" display_name = "roughspun robe"
path = /obj/item/clothing/suit/unathi/robe path = /obj/item/clothing/suit/unathi/robe
@@ -737,7 +746,15 @@
) )
gear_tweaks += new/datum/gear_tweak/path(hoodedcloaks) gear_tweaks += new/datum/gear_tweak/path(hoodedcloaks)
//nerdy shirt //oversized shirts
/datum/gear/suit/nerdshirt /datum/gear/suit/nerdshirt
display_name = "nerdy shirt" display_name = "nerdy shirt"
path = /obj/item/clothing/suit/nerdshirt path = /obj/item/clothing/suit/nerdshirt
/datum/gear/suit/ianshirt
display_name = "worn corgi shirt"
path = /obj/item/clothing/suit/ianshirt
/datum/gear/suit/wornshirt
display_name = "worn shirt"
path = /obj/item/clothing/suit/wornshirt

View File

@@ -594,6 +594,19 @@
) )
gear_tweaks += list(new/datum/gear_tweak/path(turtlebaggys)) gear_tweaks += list(new/datum/gear_tweak/path(turtlebaggys))
//colorable sweaters
/datum/gear/uniform/bigsweaters
display_name = "sweater selection, colorable"
path = /obj/item/clothing/under/bigsweater
/datum/gear/uniform/bigsweaters/New()
..()
var/list/bigsweaters = list(
"cableknit sweater"=/obj/item/clothing/under/bigsweater,
"keyhole sweater"=/obj/item/clothing/under/bigsweater/keyhole
)
gear_tweaks += list(new/datum/gear_tweak/path(bigsweaters), gear_tweak_free_color_choice)
//half-moon outfit //half-moon outfit
/datum/gear/uniform/halfmoon /datum/gear/uniform/halfmoon
display_name = "half moon outfit" display_name = "half moon outfit"

View File

@@ -178,6 +178,7 @@ Talon jumpsuit
"puffy skirt"=/obj/item/clothing/under/skirt/colorable/puffy, "puffy skirt"=/obj/item/clothing/under/skirt/colorable/puffy,
"skater skirt"=/obj/item/clothing/under/skirt/colorable/skater, "skater skirt"=/obj/item/clothing/under/skirt/colorable/skater,
"pleated skirt"=/obj/item/clothing/under/skirt/colorable/pleated, "pleated skirt"=/obj/item/clothing/under/skirt/colorable/pleated,
"pleated skirt, alt"=/obj/item/clothing/under/skirt/colorable/pleated/alt,
"pencil skirt"=/obj/item/clothing/under/skirt/colorable/pencil, "pencil skirt"=/obj/item/clothing/under/skirt/colorable/pencil,
"plaid skirt"=/obj/item/clothing/under/skirt/colorable/plaid, "plaid skirt"=/obj/item/clothing/under/skirt/colorable/plaid,
"tube skirt"=/obj/item/clothing/under/skirt/colorable/tube, "tube skirt"=/obj/item/clothing/under/skirt/colorable/tube,

View File

@@ -162,8 +162,11 @@
icon_state = "fingerlessgloves" icon_state = "fingerlessgloves"
fingerprint_chance = 100 fingerprint_chance = 100
/obj/item/clothing/gloves/fingerless/alt
icon_state = "fingerlessgloves_alt"
/obj/item/clothing/gloves/fingerless_recolourable /obj/item/clothing/gloves/fingerless_recolourable
desc = "A pair of gloves that don't actually cover the fingers." desc = "A pair of gloves that don't actually cover the fingers."
name = "fingerless gloves" name = "fingerless gloves"
icon_state = "fingerlessgloves_rc" icon_state = "fingerlessgloves_rc"
fingerprint_chance = 100 fingerprint_chance = 100

View File

@@ -563,3 +563,26 @@
icon_state = "redtag" icon_state = "redtag"
flags_inv = HIDEEARS|BLOCKHEADHAIR flags_inv = HIDEEARS|BLOCKHEADHAIR
body_parts_covered = HEAD|EYES body_parts_covered = HEAD|EYES
//hair bows
/obj/item/clothing/head/bow
name = "large bow"
desc = "A large bow that you can place on top of your head."
icon_state = "large_bow"
body_parts_covered = 0
/obj/item/clothing/head/bow/small
name = "small bow"
desc = "A small compact bow that you can place on the side of your hair."
icon_state = "small_bow"
/obj/item/clothing/head/bow/back
name = "back bow"
desc = "A large bow that you can place on the back of your head."
icon_state = "back_bow"
/obj/item/clothing/head/bow/sweet
name = "sweet bow"
desc = "A sweet bow that you can place on the back of your head."
icon_state = "sweet_bow"

View File

@@ -95,6 +95,9 @@
item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots") item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots")
species_restricted = null species_restricted = null
/obj/item/clothing/shoes/boots/jackboots/recolorable
icon_state = "boots_recolor"
/obj/item/clothing/shoes/boots/workboots /obj/item/clothing/shoes/boots/workboots
name = "workboots" name = "workboots"
desc = "A pair of steel-toed work boots designed for use in industrial settings. Safety first." desc = "A pair of steel-toed work boots designed for use in industrial settings. Safety first."

View File

@@ -48,6 +48,11 @@
wizard_garb = 1 wizard_garb = 1
/obj/item/clothing/shoes/sandals
desc = "A pair of simple sandals."
name = "sandals"
icon_state = "sandals_recolor"
/obj/item/clothing/shoes/flipflop /obj/item/clothing/shoes/flipflop
name = "flip flops" name = "flip flops"
desc = "A pair of foam flip flops. For those not afraid to show a little ankle." desc = "A pair of foam flip flops. For those not afraid to show a little ankle."

View File

@@ -320,7 +320,7 @@
H.drop_from_inventory(H.handcuffed) H.drop_from_inventory(H.handcuffed)
/obj/item/clothing/suit/ianshirt /obj/item/clothing/suit/ianshirt
name = "worn shirt" name = "worn corgi shirt"
desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in." desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in."
icon_state = "ianshirt" icon_state = "ianshirt"
item_state_slots = list(slot_r_hand_str = "labcoat", slot_l_hand_str = "labcoat") //placeholder -S2- item_state_slots = list(slot_r_hand_str = "labcoat", slot_l_hand_str = "labcoat") //placeholder -S2-
@@ -333,6 +333,11 @@
desc = "A comfy white t-shirt with a picture of a cartoon hedgehog on it. Although clean, it still seems like the wearer should be embarrassed for owning it." desc = "A comfy white t-shirt with a picture of a cartoon hedgehog on it. Although clean, it still seems like the wearer should be embarrassed for owning it."
icon_state = "nerdshirt" icon_state = "nerdshirt"
/obj/item/clothing/suit/wornshirt
name = "worn shirt"
desc = "A worn out (or perhaps just baggy), curiously comfortable t-shirt."
icon_state = "wornshirt"
/* /*
* Kimonos * Kimonos
*/ */

View File

@@ -1172,3 +1172,31 @@
desc = "Barely more than a pair of long stirrup sleeves joined by a turtleneck. Has decorative red accents." desc = "Barely more than a pair of long stirrup sleeves joined by a turtleneck. Has decorative red accents."
icon_state = "gestaltjacket" icon_state = "gestaltjacket"
item_state = "gestaltjacket" item_state = "gestaltjacket"
//Neo Ranger Poncho
/obj/item/clothing/accessory/poncho/roles/neo_ranger
name = "ranger poncho"
desc = "Aim for the Heart, Ramon."
icon_state = "neo_ranger"
item_state = "neo_ranger"
action_button_name = "Adjust Poncho"
/obj/item/clothing/accessory/poncho/roles/neo_ranger/update_clothing_icon()
. = ..()
if(ismob(src.loc))
var/mob/M = src.loc
M.update_inv_wear_suit()
/obj/item/clothing/accessory/poncho/roles/neo_ranger/attack_self(mob/user as mob)
if(src.icon_state == initial(icon_state))
src.icon_state = "[icon_state]_open"
src.item_state = "[item_state]_open"
flags_inv = HIDETIE|HIDEHOLSTER
to_chat(user, "You adjust your poncho.")
else
src.icon_state = initial(icon_state)
src.item_state = initial(item_state)
flags_inv = HIDEHOLSTER
to_chat(user, "You adjust your poncho.")
update_clothing_icon()

View File

@@ -1694,6 +1694,24 @@
name = "feminine black baggy turtleneck" name = "feminine black baggy turtleneck"
icon_state = "bb_turtleblk_fem" icon_state = "bb_turtleblk_fem"
//more big sweaters
/obj/item/clothing/under/bigsweater
name = "cableknit sweater"
desc = "Why trade style for comfort?"
icon_state = "cableknit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/bigsweater/keyhole
icon_state = "keyhole"
/obj/item/clothing/under/keyhole
name = "cableknit sweater"
desc = "Why trade style for comfort?."
icon_state = "cableknit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
//half-moon outfit //half-moon outfit
/obj/item/clothing/under/half_moon /obj/item/clothing/under/half_moon
name = "half moon outfit" name = "half moon outfit"

View File

@@ -465,6 +465,11 @@
item_state = "skirt_pleated" item_state = "skirt_pleated"
worn_state = "skirt_pleated" worn_state = "skirt_pleated"
/obj/item/clothing/under/skirt/colorable/pleated/alt
icon_state = "skirt_pleated_alt"
item_state = "skirt_pleated_alt"
worn_state = "skirt_pleated_alt"
/obj/item/clothing/under/skirt/colorable/pencil /obj/item/clothing/under/skirt/colorable/pencil
name = "pencil skirt" name = "pencil skirt"
desc = "A short skirt that's almost as thin as a pencil. Almost." desc = "A short skirt that's almost as thin as a pencil. Almost."

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 267 KiB

After

Width:  |  Height:  |  Size: 268 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 KiB

After

Width:  |  Height:  |  Size: 238 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 694 KiB

After

Width:  |  Height:  |  Size: 693 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 KiB

After

Width:  |  Height:  |  Size: 194 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 114 KiB