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 68012a79d2..48a1427c22 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -287,7 +287,8 @@
/obj/item/weapon/reagent_containers/food/drinks/flask/detflask,
/obj/item/weapon/storage/briefcase/crimekit,
/obj/item/device/taperecorder,
- /obj/item/device/tape/random = 3)
+ /obj/item/device/tape/random = 3,
+ /obj/item/clothing/gloves/forensic) //TFF 20/9/19 CHOMPStation Addition - requested addition.
/obj/structure/closet/secure_closet/detective/update_icon()
if(broken)
@@ -318,7 +319,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/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 2a7d883d95..54d373765c 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -136,7 +136,7 @@
icon_closed = "orange"
starts_with = list(
- /obj/item/clothing/under/color/orange = 3,
+ /obj/item/clothing/under/color/prison = 3,
/obj/item/clothing/shoes/orange = 3)
@@ -188,7 +188,7 @@
name = "white wardrobe"
icon_state = "white"
icon_closed = "white"
-
+
starts_with = list(
/obj/item/clothing/under/color/white = 3,
/obj/item/clothing/shoes/white = 3,
@@ -254,7 +254,7 @@
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
starts_with += /obj/item/weapon/storage/backpack/satchel/tox
-
+
return ..()
@@ -340,12 +340,12 @@
name = "grey wardrobe"
icon_state = "grey"
icon_closed = "grey"
-
+
starts_with = list(
/obj/item/clothing/under/color/grey = 3,
/obj/item/clothing/shoes/black = 3,
/obj/item/clothing/head/soft/grey = 3)
-
+
/obj/structure/closet/wardrobe/mixed
name = "mixed wardrobe"
diff --git a/code/modules/admin/secrets/admin_secrets/prison_warp.dm b/code/modules/admin/secrets/admin_secrets/prison_warp.dm
index d0d41cea5d..6f0732e781 100644
--- a/code/modules/admin/secrets/admin_secrets/prison_warp.dm
+++ b/code/modules/admin/secrets/admin_secrets/prison_warp.dm
@@ -30,7 +30,7 @@
H.drop_from_inventory(W)
//teleport person to cell
H.loc = pick(prisonwarp)
- H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), slot_w_uniform)
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/color/prison(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), slot_shoes)
else
//teleport security person
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 3ecbcd4fb4..4df06532d8 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1011,7 +1011,7 @@
M.loc = prison_cell
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/prisoner = M
- prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform)
+ prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/prison(prisoner), slot_w_uniform)
prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes)
M << "You have been sent to the prison station!"
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 4a5c9c9341..dc80976d22 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -35,7 +35,7 @@
M.loc = pick(prisonwarp)
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/prisoner = M
- prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform)
+ prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/prison(prisoner), slot_w_uniform)
prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes)
spawn(50)
M << "You have been sent to the prison station!"
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index cc5d7ed917..8f57db9025 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -30,13 +30,18 @@
icon_state = "grey"
rolled_sleeves = 0
+//TFF 21/9/19 - add a different icon_state to both jumpsuits, orange and prison. Refactors orange and prison jumpsuit slightly.
/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/prison
+ name = "prison jumpsuit"
+ desc = "It's standardized prisoner-wear. Its suit sensors are permanently set to the \"Tracking\" position."
+ icon_state = "prison"
has_sensor = 2
sensor_mode = 3
- rolled_sleeves = 0
/obj/item/clothing/under/color/pink
name = "pink jumpsuit"
diff --git a/icons/mob/items/lefthand_uniforms.dmi b/icons/mob/items/lefthand_uniforms.dmi
index 33fcf070b1..f933dc76f1 100644
Binary files a/icons/mob/items/lefthand_uniforms.dmi and b/icons/mob/items/lefthand_uniforms.dmi differ
diff --git a/icons/mob/items/righthand_uniforms.dmi b/icons/mob/items/righthand_uniforms.dmi
index ca713f5455..241d8f6f2a 100644
Binary files a/icons/mob/items/righthand_uniforms.dmi and b/icons/mob/items/righthand_uniforms.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index de0f1e8a3a..ec0759bef5 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/mob/uniform_rolled_down.dmi b/icons/mob/uniform_rolled_down.dmi
index 9e49836b2d..8e4c1d7aab 100644
Binary files a/icons/mob/uniform_rolled_down.dmi and b/icons/mob/uniform_rolled_down.dmi differ
diff --git a/icons/mob/uniform_sleeves_rolled.dmi b/icons/mob/uniform_sleeves_rolled.dmi
index c938ae4ab8..dbb4edaf75 100644
Binary files a/icons/mob/uniform_sleeves_rolled.dmi and b/icons/mob/uniform_sleeves_rolled.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 959c3dcf68..de5b30506c 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ