Merge pull request #5584 from VOREStation/upstream-merge-6386

[MIRROR] Freebie Orange Jumpsuit

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

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"

html/changelogs/TheFurryFeline - Orange Is The New Orange.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: 
+  - rscadd: "New orange jumpsuit for loadout that doesn't get locked to tracking."
+  - tweak: "Prison jumpsuit filepath changed accordingly and closets with obj updated."