Merge pull request #6447 from TheFurryFeline/TFF-Orange_Is_The_New_Orange_Part_2

Orange Is The New Orange Part 2

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -302,7 +302,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/prison,
+		/obj/item/clothing/under/color/prison,
 		/obj/item/clothing/shoes/orange)
 
 

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/prison = 3,
+		/obj/item/clothing/under/color/prison = 3,
 		/obj/item/clothing/shoes/orange = 3)
 
 

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

code/modules/admin/topic.dm

@@ -1057,7 +1057,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 << "<font color='red'>You have been sent to the prison station!</font>"

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 << "<font color='red'>You have been sent to the prison station!</font>"

code/modules/clothing/under/color.dm

@@ -31,13 +31,16 @@
 	rolled_sleeves = 0
 
 //TFF 5/8/19 - add a non perma-set orange jumpsuit, splits prison into its own obj with override var settings.
+//TFF 5/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"
 	icon_state = "orange"
 	rolled_sleeves = 0
 
-/obj/item/clothing/under/color/orange/prison
+/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
 

html/changelogs/TheFurryFeline - Orange_Is_The_New_Orange_Part_2.yml

@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: TheFurryFeline
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - imageadd: "Add a new sprite for the orange jumpsuit."
+  - tweak: "Refactors prison jumpsuits into its own thing, change a few files and dmis."