Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

Conflicts:
	code/modules/mob/mob_defines.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/storage.dmi
	maps/tgstation.2.0.8.dmm

code/datums/datumvars.dm

@@ -349,15 +349,20 @@ client
 
 			if (L.len > 0 && !(name == "underlays" || name == "overlays" || name == "vars" || L.len > 500))
 				// not sure if this is completely right...
-				if (0) // (L.vars.len > 0)
+				if(0)   //(L.vars.len > 0)
 					html += "<ol>"
-					for (var/entry in L)
-						html += debug_variable(entry, L[entry], level + 1)
+
 					html += "</ol>"
 				else
 					html += "<ul>"
-					for (var/index = 1, index <= L.len, index++)
-						html += debug_variable("[index]", L[index], level + 1)
+					var/index = 1
+					for (var/entry in L)
+						if(istext(entry))
+							html += debug_variable(entry, L[entry], level + 1)
+						//html += debug_variable("[index]", L[index], level + 1)
+						else
+							html += debug_variable(index, L[index], level + 1)
+						index++
 					html += "</ul>"
 		else
 			html += "[name] = <span class='value'>[value]</span>"

code/datums/shuttle_controller.dm

@@ -20,7 +20,7 @@ datum/shuttle_controller
 		fake_recall = 0 //Used in rounds to prevent "ON NOES, IT MUST [INSERT ROUND] BECAUSE SHUTTLE CAN'T BE CALLED"
 		deny_shuttle = 0 //for admins not allowing it to be called.
 		departed = 0
-
+		sound_siren = 1 //if siren should go off
 	// call the shuttle
 	// if not called before, set the endtime to T+600 seconds
 	// otherwise if outgoing, switch to incoming
@@ -34,6 +34,13 @@ datum/shuttle_controller
 		else
 			settimeleft(SHUTTLEARRIVETIME*coeff)
 			online = 1
+		//turning on the red lights in hallways and siren
+		for(var/area/A in world)
+			if(istype(A, /area/hallway))
+				A.readyalert()
+		sound_siren = 1
+
+
 
 	proc/recall()
 		if(direction == 1)
@@ -45,6 +52,11 @@ datum/shuttle_controller
 			world << sound('shuttlerecalled.ogg')
 			setdirection(-1)
 			online = 1
+			//turning off the red lights in hallways and siren
+			for(var/area/A in world)
+				if(istype(A, /area/hallway))
+					A.readyreset()
+			sound_siren = 0
 
 
 	// returns the time (in seconds) before shuttle arrival
@@ -83,6 +95,11 @@ datum/shuttle_controller
 			var/timeleft = timeleft()
 			if(timeleft > 1e5)		// midnight rollover protection
 				timeleft = 0
+			if (sound_siren)	//playing siren every 90 seconds
+				sound_siren = 0
+				world << sound('siren.ogg')
+				spawn(900)
+					sound_siren = 1
 			switch(location)
 				if(0)
 					if(timeleft>timelimit)