From ea46fe464f25ff7ce47e8227cca9915c857e9ceb Mon Sep 17 00:00:00 2001
From: MrStonedOne <kyleshome@gmail.com>
Date: Wed, 25 Feb 2015 13:09:41 -0800
Subject: [PATCH] Makes rainbowtide a config option. Defaults to enabling
 rainbowtide, even if the config entry is absent from the config file.

---
 code/controllers/configuration.dm | 3 +++
 code/game/jobs/job/assistant.dm   | 5 ++++-
 config/game_options.txt           | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 7e9ea75db89..1e25cff14b9 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -148,6 +148,7 @@
 	var/assistant_cap = -1
 
 	var/starlight = 0
+	var/gray_assistants = 0
 
 /datum/configuration/New()
 	var/list/L = typesof(/datum/game_mode) - /datum/game_mode
@@ -448,6 +449,8 @@
 					config.assistant_cap			= text2num(value)
 				if("starlight")
 					config.starlight			= 1
+				if("gray_assistants")
+					config.gray_assistants			= 1
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 
diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index 0491890c566..a0344a1ea34 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -15,7 +15,10 @@ Assistant
 
 /datum/job/assistant/equip_items(var/mob/living/carbon/human/H)
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes)
-	H.equip_to_slot_or_del(new /obj/item/clothing/under/color/random(H), slot_w_uniform)
+	if (config.gray_assistants)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
+	else
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/color/random(H), slot_w_uniform)
 
 /datum/job/assistant/get_access()
 	if((config.jobs_have_maint_access & ASSISTANTS_HAVE_MAINT_ACCESS) || !config.jobs_have_minimal_access) //Config has assistant maint access set
diff --git a/config/game_options.txt b/config/game_options.txt
index eb49184e9e1..2ddae76e38e 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -221,4 +221,7 @@ SILICON_MAX_LAW_AMOUNT 12
 ASSISTANT_CAP -1
 
 ## Starlight for exterior walls and breaches. Uncomment for starlight!
-STARLIGHT
\ No newline at end of file
+STARLIGHT
+
+## Uncomment to bring back old gray suit assistants instead of the now default rainbow colored assistants.
+#GRAY_ASSISTANTS
\ No newline at end of file