Merge pull request #2767 from CHOMPStationBot/upstream-merge-11376

[MIRROR] non-departmental jackets
This commit is contained in:
Nadyr
2021-08-09 18:51:06 -04:00
committed by GitHub
6 changed files with 25 additions and 0 deletions

View File

@@ -551,6 +551,18 @@
) )
gear_tweaks += new/datum/gear_tweak/path(jacket) gear_tweaks += new/datum/gear_tweak/path(jacket)
/datum/gear/suit/miscellaneous/light_jacket
display_name = "light jacket selection"
path = /obj/item/clothing/suit/storage/toggle/light_jacket
/datum/gear/suit/miscellaneous/light_jacket/New()
..()
var/list/jacket = list(
"grey light jacket" = /obj/item/clothing/suit/storage/toggle/light_jacket,
"dark blue light jacket" = /obj/item/clothing/suit/storage/toggle/light_jacket/blue
)
gear_tweaks += new/datum/gear_tweak/path(jacket)
/datum/gear/suit/miscellaneous/peacoat /datum/gear/suit/miscellaneous/peacoat
display_name = "peacoat" display_name = "peacoat"
path = /obj/item/clothing/suit/storage/toggle/peacoat path = /obj/item/clothing/suit/storage/toggle/peacoat

View File

@@ -726,6 +726,19 @@
item_state_slots = list(slot_r_hand_str = "med_dep_jacket", slot_l_hand_str = "med_dep_jacket") item_state_slots = list(slot_r_hand_str = "med_dep_jacket", slot_l_hand_str = "med_dep_jacket")
flags_inv = HIDEHOLSTER flags_inv = HIDEHOLSTER
/obj/item/clothing/suit/storage/toggle/light_jacket
name = "grey light jacket"
desc = "A light, cozy jacket. Now in grey."
icon_state = "grey_dep_jacket"
item_state_slots = list(slot_r_hand_str = "grey_dep_jacket", slot_l_hand_str = "grey_dep_jacket")
flags_inv = HIDEHOLSTER
/obj/item/clothing/suit/storage/toggle/light_jacket/blue
name = "dark blue light jacket"
desc = "A light, cozy jacket. Now in dark blue."
icon_state = "blue_dep_jacket"
item_state_slots = list(slot_r_hand_str = "blue_dep_jacket", slot_l_hand_str = "blue_dep_jacket")
/* /*
* Track Jackets * Track Jackets
*/ */

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 198 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 587 KiB

After

Width:  |  Height:  |  Size: 587 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB