From bbf0dac15ee5588b0f20429ebf7d6a4ae34b8407 Mon Sep 17 00:00:00 2001 From: TheFurryFeline Date: Mon, 5 Aug 2019 19:33:47 -0400 Subject: [PATCH] Freebie Orange Jumpsuit Splits the orange jumpsuit into two objs. One for loadout and one for prison clothes. Closets updated to reflect changes. Follow-up of https://github.com/VOREStation/VOREStation/pull/5561 which has no effect here but will fix a bug that results from it. --- .../structures/crates_lockers/closets/secure/security.dm | 2 +- .../objects/structures/crates_lockers/closets/wardrobe.dm | 2 +- code/modules/clothing/under/color.dm | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 14d30b19a5..fc5ead8a2b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -298,7 +298,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br var/id = null starts_with = list( - /obj/item/clothing/under/color/orange, + /obj/item/clothing/under/color/orange/prison, /obj/item/clothing/shoes/orange) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 9bdc9659e2..3c3b5bbcff 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -140,7 +140,7 @@ icon_closed = "orange" starts_with = list( - /obj/item/clothing/under/color/orange = 3, + /obj/item/clothing/under/color/orange/prison = 3, /obj/item/clothing/shoes/orange = 3) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index cc5d7ed917..9384d6db7f 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -30,13 +30,16 @@ icon_state = "grey" rolled_sleeves = 0 +//TFF 5/8/19 - add a non perma-set orange jumpsuit, splits prison into its own obj with override var settings. /obj/item/clothing/under/color/orange name = "orange jumpsuit" - desc = "It's standardized prisoner-wear. Its suit sensors are permanently set to the \"Tracking\" position." icon_state = "orange" + rolled_sleeves = 0 + +/obj/item/clothing/under/color/orange/prison + desc = "It's standardized prisoner-wear. Its suit sensors are permanently set to the \"Tracking\" position." has_sensor = 2 sensor_mode = 3 - rolled_sleeves = 0 /obj/item/clothing/under/color/pink name = "pink jumpsuit"