Merge pull request #13283 from faaaay/master

Adds recolourable hoodies with functional hoods
This commit is contained in:
Casey
2022-07-07 20:13:37 -04:00
committed by CHOMPStation2
parent ef3e059335
commit f0efe74732
8 changed files with 66 additions and 1 deletions

View File

@@ -129,3 +129,17 @@ Talon winter coat
/datum/gear/suit/russofurcoat /datum/gear/suit/russofurcoat
display_name = "long fur coat" display_name = "long fur coat"
path = /obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat path = /obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat
//Colorable Hoodie
/datum/gear/suit/hoodie_vr
display_name = "hoodie with hood (colorable)"
path = /obj/item/clothing/suit/storage/hooded/hoodie
/datum/gear/suit/hoodie_vr/New()
var/list/hoodies = list()
for(var/hoodie_style in typesof(/obj/item/clothing/suit/storage/hooded/hoodie))
var/obj/item/clothing/suit/storage/toggle/hoodie/hoodie = hoodie_style
hoodies[initial(hoodie.name)] = hoodie
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hoodies))
gear_tweaks += gear_tweak_free_color_choice

View File

@@ -203,9 +203,16 @@
name = "techpriest hood" name = "techpriest hood"
desc = "A techpriest hood." desc = "A techpriest hood."
icon_state = "techpriesthood" icon_state = "techpriesthood"
/obj/item/clothing/head/hood/siffet_hood /obj/item/clothing/head/hood/siffet_hood
name = "siffet hood" name = "siffet hood"
desc = "A hood that looks vaguely like a siffet's head. Guaranteed to traumatize your Promethean coworkers." desc = "A hood that looks vaguely like a siffet's head. Guaranteed to traumatize your Promethean coworkers."
icon_state = "siffet" icon_state = "siffet"
item_state_slots = list(slot_r_hand_str = "siffet", slot_l_hand_str = "siffet") item_state_slots = list(slot_r_hand_str = "siffet", slot_l_hand_str = "siffet")
/obj/item/clothing/head/hood/hoodie
name = "hood"
desc = "The hood of a hoodie. Cosy!"
icon = 'icons/inventory/head/item_vr.dmi'
icon_override = 'icons/inventory/head/mob_vr.dmi'
icon_state = "hood_plain"

View File

@@ -60,6 +60,8 @@
hood.canremove = FALSE hood.canremove = FALSE
icon_state = "[toggleicon]_t" icon_state = "[toggleicon]_t"
H.update_inv_wear_suit() H.update_inv_wear_suit()
if(color != hood.color)
hood.color = color
else else
RemoveHood() RemoveHood()

View File

@@ -78,3 +78,45 @@
icon_state = "taloncoat" icon_state = "taloncoat"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/hood/winter/talon hoodtype = /obj/item/clothing/head/hood/winter/talon
//Functional hoodie
/obj/item/clothing/suit/storage/hooded/hoodie
name = "hoodie"
desc = "A warm jacket, now featuring a hood!"
icon = 'icons/inventory/suit/item_vr.dmi'
icon_override = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "hoodie_plain"
item_state_slots = list(slot_r_hand_str = "grey_hoodie", slot_l_hand_str = "grey_hoodie")
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
flags_inv = HIDEHOLSTER
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
hoodtype = /obj/item/clothing/head/hood/hoodie
allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes,
/obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit)
/obj/item/clothing/suit/storage/hooded/hoodie/redtrim
name = "red-trimmed hoodie"
desc = "A warm jacket, now featuring a hood and a bold red trim!"
icon_state = "hoodie_redtrim"
/obj/item/clothing/suit/storage/hooded/hoodie/bluetrim
name = "blue-trimmed hoodie"
desc = "A warm jacket, now featuring a hood and a cool blue trim!"
icon_state = "hoodie_bluetrim"
/obj/item/clothing/suit/storage/hooded/hoodie/greentrim
name = "green-trimmed hoodie"
desc = "A warm jacket, now featuring a hood and a chilled green trim!"
icon_state = "hoodie_greentrim"
/obj/item/clothing/suit/storage/hooded/hoodie/purpletrim
name = "purple-trimmed hoodie"
desc = "A warm jacket, now featuring a hood and a smart purple trim!"
icon_state = "hoodie_purpletrim"
/obj/item/clothing/suit/storage/hooded/hoodie/yellowtrim
name = "yellow-trimmed hoodie"
desc = "A warm jacket, now featuring a hood and an eye-catching yellow trim!"
icon_state = "hoodie_yellowtrim"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 109 KiB