Merge pull request #188 from caelaislinn/master

Antiqua changes + first official contribution :3

code/defines/obj.dm

@@ -133,6 +133,15 @@
 	opacity = 0
 	density = 0
 
+/obj/effect/sign/movingparts
+	desc = "A warning sign which reads 'CAUTION: MOVING PARTS, machinery liable to stop and start at random'"
+	name = "CAUTION"
+	icon = 'decals.dmi'
+	icon_state = "securearea"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
 /obj/effect/sign/biohazard
 	desc = "A warning sign which reads 'BIOHAZARD'"
 	name = "BIOHAZARD"

code/game/gamemodes/events.dm

@@ -290,7 +290,7 @@
 		command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
 		world << sound('commandreport.ogg')
 
-/proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights
+/proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 10) //leave lightsoutAmount as 0 to break ALL lights
 	if(isEvent)
 		command_alert("An Electrical storm has been detected in your area, please repair potential electronic overloads.","Electrical Storm Alert")
 

code/modules/recycling/conveyor.dm

@@ -396,3 +396,23 @@
 		if(S.id == src.id)
 			S.position = position
 			S.update()
+
+
+/obj/machinery/conveyor/turntable
+	icon = 'recycling.dmi'
+	icon_state = "conveyor0"
+	name = "conveyor turntable"
+	desc = "A conveyor belt turntable."
+	/*
+	anchored = 1
+	var/operating = 0	// 1 if running forward, -1 if backwards, 0 if off
+	var/operable = 1	// true if can operate (no broken segments in this belt run)
+	var/basedir			// this is the default (forward) direction, set by the map dir
+						// note dir var can vary when the direction changes
+
+	var/list/affecting	// the list of all items that will be moved this ptick
+	var/id = ""			// the control ID	- must match controller ID
+	// following two only used if a diverter is present
+	var/divert = 0 		// if non-zero, direction to divert items
+	var/divdir = 0		// if diverting, will be conveyer dir needed to divert (otherwise dense)
+	*/