Merge pull request #4455 from Woodratt/12242017_SCadditions_WR

SC Stupid Sized Map Update

code/controllers/communications.dm

@@ -119,6 +119,7 @@ var/const/MED_FREQ = 1355
 var/const/SCI_FREQ = 1351
 var/const/SRV_FREQ = 1349
 var/const/SUP_FREQ = 1347
+var/const/EXP_FREQ = 1361
 
 // internal department channels
 var/const/MED_I_FREQ = 1485
@@ -137,6 +138,7 @@ var/list/radiochannels = list(
 	"Raider"		= RAID_FREQ,
 	"Supply" 		= SUP_FREQ,
 	"Service" 		= SRV_FREQ,
+	"Explorer"		= EXP_FREQ,
 	"AI Private"	= AI_FREQ,
 	"Entertainment" = ENT_FREQ,
 	"Medical(I)"	= MED_I_FREQ,
@@ -181,6 +183,8 @@ var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, ENT_FREQ, MED_FREQ, SEC
 		return "supradio"
 	if(frequency == SRV_FREQ) // service
 		return "srvradio"
+	if(frequency == EXP_FREQ) // explorer
+		return "expradio"
 	if(frequency == ENT_FREQ) // entertainment
 		return "entradio"
 	if(frequency in DEPT_FREQS)

code/game/area/Space Station 13 areas.dm

@@ -100,7 +100,7 @@ var/list/ghostteleportlocs = list()
 	icon_state = "space"
 	requires_power = 1
 	always_unpowered = 1
-	dynamic_lighting = 1
+	dynamic_lighting = 0
 	power_light = 0
 	power_equip = 0
 	power_environ = 0
@@ -156,6 +156,7 @@ area/space/atmosalert()
 
 /area/shuttle/arrival/station
 	icon_state = "shuttle"
+	dynamic_lighting = 0
 
 /area/shuttle/escape
 	name = "\improper Emergency Shuttle"
@@ -164,6 +165,7 @@ area/space/atmosalert()
 /area/shuttle/escape/station
 	name = "\improper Emergency Shuttle Station"
 	icon_state = "shuttle2"
+	dynamic_lighting = 0
 
 /area/shuttle/escape/centcom
 	name = "\improper Emergency Shuttle CentCom"

code/game/jobs/jobs.dm

@@ -41,10 +41,8 @@ var/const/CARGOTECH			=(1<<7)
 var/const/MINER				=(1<<8)
 var/const/LAWYER			=(1<<9)
 var/const/CHAPLAIN			=(1<<10)
-var/const/CLOWN				=(1<<11)
-var/const/MIME				=(1<<12)
-var/const/ASSISTANT			=(1<<13)
-var/const/BRIDGE			=(1<<14)
+var/const/ASSISTANT			=(1<<11)
+var/const/BRIDGE			=(1<<12)
 
 
 var/list/assistant_occupations = list(

code/game/machinery/telecomms/broadcaster.dm

@@ -384,6 +384,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 					blackbox.msg_cargo += blackbox_msg
 				if(SRV_FREQ)
 					blackbox.msg_service += blackbox_msg
+				if(EXP_FREQ)
+					blackbox.msg_explorer += blackbox_msg
 				else
 					blackbox.messages += blackbox_msg
 

code/game/objects/items/weapons/storage/boxes.dm

@@ -354,6 +354,15 @@
 	for(var/i = 1 to 7)
 		new /obj/item/weapon/grenade/chem_grenade/teargas(src)
 
+/obj/item/weapon/storage/box/flare
+	name = "box of flares"
+	desc = "A box containing 4 flares."
+
+/obj/item/weapon/storage/box/flare/New()
+	..()
+	for(var/i = 1 to 4)
+		new /obj/item/device/flashlight/flare(src)
+
 /obj/item/weapon/storage/box/trackimp
 	name = "boxed tracking implant kit"
 	desc = "Box full of scum-bag tracking utensils."

code/game/objects/structures/signs.dm

@@ -348,6 +348,11 @@
 	desc = "A direction sign, pointing out which way the Cargo department is."
 	icon_state = "direction_crg"
 
+/obj/structure/sign/directions/cryo
+	name = "\improper Cryogenic Storage"
+	desc = "A direction sign, pointing out which way cryogenic storage is."
+	icon_state = "direction_cry"
+
 /obj/structure/sign/directions/roomnum
 	name = "room number"
 	desc = "A sign detailing the number of the room beside it."

code/modules/mob/living/say.dm

@@ -15,6 +15,7 @@ var/list/department_radio_keys = list(
 	  ":u" = "Supply",		".u" = "Supply",
 	  ":v" = "Service",		".v" = "Service",
 	  ":p" = "AI Private",	".p" = "AI Private",
+	  ":y" = "Explorer",	".y" = "Explorer",
 
 	  ":R" = "right ear",	".R" = "right ear",
 	  ":L" = "left ear",	".L" = "left ear",
@@ -31,6 +32,7 @@ var/list/department_radio_keys = list(
 	  ":U" = "Supply",		".U" = "Supply",
 	  ":V" = "Service",		".V" = "Service",
 	  ":P" = "AI Private",	".P" = "AI Private",
+	  ":Y" = "Explorer",	".Y" = "Explorer",
 
 	  //kinda localization -- rastaf0
 	  //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.

code/modules/research/message_server.dm

@@ -245,6 +245,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 	var/list/msg_raider = list()
 	var/list/msg_cargo = list()
 	var/list/msg_service = list()
+	var/list/msg_explorer = list()
 
 	var/list/datum/feedback_variable/feedback = new()
 

code/modules/scripting/Implementations/Telecomms.dm

@@ -69,6 +69,7 @@
 		interpreter.SetVar("$engineering",ENG_FREQ)
 		interpreter.SetVar("$security",	SEC_FREQ)
 		interpreter.SetVar("$supply",	SUP_FREQ)
+		interpreter.SetVar("$explorer", EXP_FREQ)
 
 		// Signal data
 

code/stylesheet.dm

@@ -58,6 +58,7 @@ em						{font-style: normal;font-weight: bold;}
 .sciradio				{color: #993399;}
 .supradio				{color: #5F4519;}
 .srvradio				{color: #6eaa2c;}
+.expradio				{color: #555555;}
 
 /* Miscellaneous */
 .name					{font-weight: bold;}