Merge remote-tracking branch 'upstream/master'

code/ATMOSPHERICS/atmospherics.dm

@@ -39,7 +39,7 @@ Pipelines + Other Objects -> Pipe network
 		pipe_color = null
 	..()
 
-/obj/machinery/atmospherics/attackby(atom/A, mob/user as mob)
+/obj/machinery/atmospherics/attackby(atom/A, mob/user as mob, params)
 	if(istype(A, /obj/item/device/pipe_painter))
 		return
 	..()

code/ATMOSPHERICS/chiller.dm

@@ -9,8 +9,6 @@
 	set_temperature = 20		// in celcius, add T0C for kelvin
 	var/cooling_power = 40000
 
-	flags = FPRINT
-
 
 /obj/machinery/space_heater/air_conditioner/New()
 	..()
@@ -49,15 +47,15 @@
 		cell.emp_act(severity)
 	..(severity)
 
-/obj/machinery/space_heater/air_conditioner/attackby(obj/item/I, mob/user)
-	if(istype(I, /obj/item/weapon/cell))
+/obj/machinery/space_heater/air_conditioner/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/stock_parts/cell))
 		if(open)
 			if(cell)
 				user << "There is already a power cell inside."
 				return
 			else
 				// insert cell
-				var/obj/item/weapon/cell/C = usr.get_active_hand()
+				var/obj/item/weapon/stock_parts/cell/C = usr.get_active_hand()
 				if(istype(C))
 					user.drop_item()
 					cell = C
@@ -96,11 +94,11 @@
 		// AUTOFIXED BY fix_string_idiocy.py
 		// C:\Users\Rob\Documents\Projects\vgstation13\code\ATMOSPHERICS\chiller.dm:95: dat += "Power Level: [cell ? round(cell.percent(),1) : 0]%<BR><BR>"
 		dat += {"Power Level: [cell ? round(cell.percent(),1) : 0]%<BR><BR>
-			Set Temperature: 
-			<A href='?src=\ref[src];op=temp;val=-5'>-</A> 
+			Set Temperature:
+			<A href='?src=\ref[src];op=temp;val=-5'>-</A>
 			<A href='?src=\ref[src];op=temp;val=-1'>-</A>
-			[temp]&deg;C 
-			<A href='?src=\ref[src];op=temp;val=1'>+</A> 
+			[temp]&deg;C
+			<A href='?src=\ref[src];op=temp;val=1'>+</A>
 			<A href='?src=\ref[src];op=temp;val=5'>+</A><BR>"}
 		// END AUTOFIX
 		user.set_machine(src)
@@ -138,7 +136,7 @@
 
 			if("cellinstall")
 				if(open && !cell)
-					var/obj/item/weapon/cell/C = usr.get_active_hand()
+					var/obj/item/weapon/stock_parts/cell/C = usr.get_active_hand()
 					if(istype(C))
 						usr.drop_item()
 						cell = C

code/ATMOSPHERICS/components/binary_devices/circulator.dm

@@ -70,7 +70,7 @@
 
 	return 1
 
-/obj/machinery/atmospherics/binary/circulator/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/atmospherics/binary/circulator/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/wrench))
 		anchored = !anchored
 		user << "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor."

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -152,7 +152,7 @@
 	src.updateUsrDialog()
 	return
 
-/obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (on)

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -184,7 +184,7 @@ Thus, the two variables affect pump operation are set in New():
 	if(old_stat != stat)
 		update_icon()
 
-/obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (!(stat & NOPOWER) && on)

code/ATMOSPHERICS/components/binary_devices/volume_pump.dm

@@ -171,7 +171,7 @@ Thus, the two variables affect pump operation are set in New():
 	if(old_stat != stat)
 		update_icon()
 
-/obj/machinery/atmospherics/binary/volume_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/binary/volume_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (!(stat & NOPOWER) && on)

code/ATMOSPHERICS/components/omni_devices/omni_base.dm

@@ -70,7 +70,7 @@
 	if(old_stat != stat)
 		update_icon()
 
-/obj/machinery/atmospherics/omni/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/omni/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if(!istype(W, /obj/item/weapon/wrench))
 		return ..()
 

code/ATMOSPHERICS/components/portables_connector.dm

@@ -133,11 +133,11 @@
 	return null
 
 
-/obj/machinery/atmospherics/portables_connector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/portables_connector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (connected_device)
-		user << "\red You cannot unwrench this [src], dettach [connected_device] first."
+		user << "\red You cannot unwrench this [src], detach [connected_device] first."
 		return 1
 	if (locate(/obj/machinery/portable_atmospherics, src.loc))
 		return 1

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -156,7 +156,7 @@ Filter types:
 	set_frequency(frequency)
 	..()
 
-/obj/machinery/atmospherics/trinary/filter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/trinary/filter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	var/datum/gas_mixture/int_air = return_air()

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -114,7 +114,7 @@
 
 	return 1
 
-/obj/machinery/atmospherics/trinary/mixer/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/trinary/mixer/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	var/datum/gas_mixture/int_air = return_air()

code/ATMOSPHERICS/components/tvalve.dm

@@ -358,7 +358,7 @@
 			else
 				go_to_side()
 
-/obj/machinery/atmospherics/tvalve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/tvalve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (istype(src, /obj/machinery/atmospherics/tvalve/digital))

code/ATMOSPHERICS/components/unary/heat_exchanger.dm

@@ -65,7 +65,7 @@
 
 		return 1
 
-	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 		if (!istype(W, /obj/item/weapon/wrench))
 			return ..()
 		var/turf/T = src.loc

code/ATMOSPHERICS/components/unary/thermal_plate.dm

@@ -68,7 +68,7 @@
 		icon_state = "[prefix]off"
 		return
 
-	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 		if (!istype(W, /obj/item/weapon/wrench))
 			return ..()
 		var/turf/T = src.loc

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -307,7 +307,7 @@
 	update_icon()
 	return
 
-/obj/machinery/atmospherics/unary/vent_pump/attackby(obj/item/W, mob/user)
+/obj/machinery/atmospherics/unary/vent_pump/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if (WT.remove_fuel(0,user))
@@ -343,7 +343,7 @@
 	if(old_stat != stat)
 		update_icon()
 
-/obj/machinery/atmospherics/unary/vent_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/unary/vent_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (!(stat & NOPOWER) && on)

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -276,7 +276,7 @@
 	if(old_stat != stat)
 		update_icon()
 
-/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (!(stat & NOPOWER) && on)

code/ATMOSPHERICS/components/valve.dm

@@ -299,7 +299,7 @@
 			else
 				open()
 
-/obj/machinery/atmospherics/valve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/valve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (istype(src, /obj/machinery/atmospherics/valve/digital) && src:frequency)

code/ATMOSPHERICS/he_pipes.dm

@@ -54,11 +54,11 @@
 		if(target.initialize_directions_he & get_dir(target,src))
 			node2 = target
 			break
-			
+
 	if(!node1 && !node2)
 		del(src)
 		return
-		
+
 	update_icon()
 	return
 
@@ -105,10 +105,10 @@
 		if(target.initialize_directions_he & get_dir(target,src))
 			node2 = target
 			break
-			
+
 	if(!node1 && !node2)
-		del(src)
-		return			
+		qdel(src)
+		return
 
 	update_icon()
 	return

code/ATMOSPHERICS/pipes.dm

@@ -55,14 +55,15 @@
 
 	return parent.return_network(reference)
 
-/obj/machinery/atmospherics/pipe/Del()
+
+/obj/machinery/atmospherics/pipe/Destroy()
 	del(parent)
-	if(air_temporary)
+	if(air_temporary && loc)
 		loc.assume_air(air_temporary)
 
 	..()
 
-/obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
 	if (istype(src, /obj/machinery/atmospherics/pipe/tank))
 		return ..()
 	if (istype(src, /obj/machinery/atmospherics/pipe/vent))
@@ -70,7 +71,7 @@
 
 	if(istype(W,/obj/item/device/pipe_painter))
 		return 0
-		
+
 	if (istype(W, /obj/item/device/pipe_freezer))
 		if(!src.frozen) // If the pipe is not already frozen
 			user << "\red You begin to freeze the [src]"
@@ -88,7 +89,7 @@
 					"You hear dripping water.")
 
 		add_fingerprint(user)
-		return 1		
+		return 1
 
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
@@ -96,7 +97,7 @@
 	if (level==1 && isturf(T) && T.intact)
 		user << "\red You must remove the plating first."
 		return 1
-		
+
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
@@ -129,7 +130,7 @@
 
 /*
 /obj/machinery/atmospherics/pipe/add_underlay(var/obj/machinery/atmospherics/node, var/direction)
-	if(istype(src, /obj/machinery/atmospherics/pipe/tank))	//todo: move tanks to unary devices 
+	if(istype(src, /obj/machinery/atmospherics/pipe/tank))	//todo: move tanks to unary devices
 		return ..()
 
 	if(node)
@@ -182,7 +183,7 @@
 
 /obj/machinery/atmospherics/pipe/simple/New()
 	..()
-	
+
 	// Pipe colors and icon states are handled by an image cache - so color and icon should
 	//  be null. For mapping purposes color is defined in the object definitions.
 	icon = null
@@ -242,7 +243,7 @@
 	else if(dir==12)
 		dir = 4
 
-/obj/machinery/atmospherics/pipe/simple/Del()
+/obj/machinery/atmospherics/pipe/simple/Destroy()
 	if(node1)
 		node1.disconnect(src)
 	if(node2)
@@ -276,7 +277,7 @@
 			if (meter.target == src)
 				new /obj/item/pipe_meter(T)
 				del(meter)
-		del(src)
+		qdel(src)
 	else if(node1 && node2)
 		overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, pipe_icon + "intact" + icon_connect_type)
 	else
@@ -315,7 +316,7 @@
 				break
 
 	if(!node1 && !node2)
-		del(src)
+		qdel(src)
 		return
 
 	var/turf/T = get_turf(src)
@@ -359,7 +360,7 @@
 	layer = 2.39
 	icon_connect_type = "-supply"
 	color = PIPE_COLOR_BLUE
-	
+
 /obj/machinery/atmospherics/pipe/simple/visible/yellow
 	color = PIPE_COLOR_YELLOW
 
@@ -394,7 +395,7 @@
 	layer = 2.39
 	icon_connect_type = "-supply"
 	color = PIPE_COLOR_BLUE
-	
+
 /obj/machinery/atmospherics/pipe/simple/visible/universal
 	name="Universal pipe adapter"
 	desc = "An adapter for regular, supply and scrubbers pipes"
@@ -567,7 +568,7 @@
 	else
 		. = PROCESS_KILL
 
-/obj/machinery/atmospherics/pipe/manifold/Del()
+/obj/machinery/atmospherics/pipe/manifold/Destroy()
 	if(node1)
 		node1.disconnect(src)
 	if(node2)
@@ -620,19 +621,19 @@
 			if (meter.target == src)
 				new /obj/item/pipe_meter(T)
 				del(meter)
-		del(src)
+		qdel(src)
 	else
 		overlays.Cut()
 		overlays += icon_manager.get_atmos_icon("manifold", , pipe_color, "core" + icon_connect_type)
 		overlays += icon_manager.get_atmos_icon("manifold", , , "clamps" + icon_connect_type)
 		underlays.Cut()
-		
+
 		var/turf/T = get_turf(src)
 		var/list/directions = list(NORTH, SOUTH, EAST, WEST)
 		var/node1_direction = get_dir(src, node1)
 		var/node2_direction = get_dir(src, node2)
 		var/node3_direction = get_dir(src, node3)
-		
+
 		directions -= dir
 
 		directions -= add_underlay(T,node1,node1_direction,icon_connect_type)
@@ -692,7 +693,7 @@
 						break
 			if (node3)
 				break
-				
+
 	if(!node1 && !node2 && !node3)
 		del(src)
 		return
@@ -804,7 +805,7 @@
 	else
 		. = PROCESS_KILL
 
-/obj/machinery/atmospherics/pipe/manifold4w/Del()
+/obj/machinery/atmospherics/pipe/manifold4w/Destroy()
 	if(node1)
 		node1.disconnect(src)
 	if(node2)
@@ -866,13 +867,13 @@
 			if (meter.target == src)
 				new /obj/item/pipe_meter(T)
 				del(meter)
-		del(src)
+		qdel(src)
 	else
 		overlays.Cut()
 		overlays += icon_manager.get_atmos_icon("manifold", , pipe_color, "4way" + icon_connect_type)
 		overlays += icon_manager.get_atmos_icon("manifold", , , "clamps_4way" + icon_connect_type)
 		underlays.Cut()
-		
+
 		/*
 		var/list/directions = list(NORTH, SOUTH, EAST, WEST)
 
@@ -884,7 +885,7 @@
 		for(var/D in directions)
 			add_underlay(,D)
 		*/
-		
+
 		var/turf/T = get_turf(src)
 		var/list/directions = list(NORTH, SOUTH, EAST, WEST)
 		var/node1_direction = get_dir(src, node1)
@@ -948,7 +949,7 @@
 				src.connected_to = c
 				node4 = target
 				break
-				
+
 	if(!node1 && !node2 && !node3&& !node4)
 		del(src)
 		return
@@ -1059,7 +1060,7 @@
 		..()
 	else
 		. = PROCESS_KILL
-/obj/machinery/atmospherics/pipe/cap/Del()
+/obj/machinery/atmospherics/pipe/cap/Destroy()
 	if(node)
 		node.disconnect(src)
 
@@ -1176,7 +1177,7 @@
 	else
 		. = PROCESS_KILL
 
-/obj/machinery/atmospherics/pipe/tank/Del()
+/obj/machinery/atmospherics/pipe/tank/Destroy()
 	if(node1)
 		node1.disconnect(src)
 
@@ -1220,7 +1221,7 @@
 
 	return null
 
-/obj/machinery/atmospherics/pipe/tank/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/pipe/tank/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
 	if(istype(W, /obj/item/device/pipe_painter))
 		return
 
@@ -1263,7 +1264,7 @@
 	air_temporary.oxygen = (25*ONE_ATMOSPHERE*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
 	air_temporary.nitrogen = (25*ONE_ATMOSPHERE*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
 
-	..()	
+	..()
 	icon_state = "air"
 
 /obj/machinery/atmospherics/pipe/tank/oxygen
@@ -1376,7 +1377,7 @@
 	else
 		parent.mingle_with_turf(loc, volume)
 
-/obj/machinery/atmospherics/pipe/vent/Del()
+/obj/machinery/atmospherics/pipe/vent/Destroy()
 	if(node1)
 		node1.disconnect(src)
 

code/ZAS/Airflow.dm

@@ -8,11 +8,13 @@ mob/proc/airflow_stun()
 	if(stat == 2)
 		return 0
 	if(last_airflow_stun > world.time - vsc.airflow_stun_cooldown)	return 0
+
 	if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
-		src << "\blue You stay upright as the air rushes past you."
+		src << "<span class='notice'>You stay upright as the air rushes past you.</span>"
 		return 0
-	if(weakened <= 0) src << "\red The sudden rush of air knocks you over!"
-	weakened = max(weakened,5)
+	if(!lying)
+		src << "<span class='warning'>The sudden rush of air knocks you over!</span>"
+	Weaken(5)
 	last_airflow_stun = world.time
 
 mob/living/silicon/airflow_stun()
@@ -22,16 +24,9 @@ mob/living/carbon/metroid/airflow_stun()
 	return
 
 mob/living/carbon/human/airflow_stun()
-	if(last_airflow_stun > world.time - vsc.airflow_stun_cooldown)	return 0
-	if(buckled) return 0
 	if(shoes)
 		if(shoes.flags & NOSLIP) return 0
-	if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
-		src << "\blue You stay upright as the air rushes past you."
-		return 0
-	if(weakened <= 0) src << "\red The sudden rush of air knocks you over!"
-	weakened = max(weakened,rand(1,5))
-	last_airflow_stun = world.time
+	..()
 
 atom/movable/proc/check_airflow_movable(n)
 
@@ -84,10 +79,8 @@ obj/item/check_airflow_movable(n)
 		if(istype(src, /mob/living/carbon/human))
 			if(src:buckled)
 				return
-			if(src:shoes)
-				if(istype(src:shoes, /obj/item/clothing/shoes/magboots))
-					if(src:shoes.flags & NOSLIP)
-						return
+			if(src:shoes && src:shoes.flags & NOSLIP)
+				return
 		src << "\red You are sucked away by airflow!"
 	var/airflow_falloff = 9 - ul_FalloffAmount(airflow_dest) //It's a fast falloff calc.  Very useful.
 	if(airflow_falloff < 1)
@@ -148,10 +141,8 @@ obj/item/check_airflow_movable(n)
 		if(istype(src, /mob/living/carbon/human))
 			if(src:buckled)
 				return
-			if(src:shoes)
-				if(istype(src:shoes, /obj/item/clothing/shoes/magboots))
-					if(src:shoes.flags & NOSLIP)
-						return
+			if(src:shoes && src:shoes.flags & NOSLIP)
+				return
 		src << "\red You are pushed away by airflow!"
 		last_airflow = world.time
 	var/airflow_falloff = 9 - ul_FalloffAmount(airflow_dest) //It's a fast falloff calc.  Very useful.
@@ -207,7 +198,8 @@ mob/airflow_hit(atom/A)
 	for(var/mob/M in hearers(src))
 		M.show_message("\red <B>\The [src] slams into \a [A]!</B>",1,"\red You hear a loud slam!",2)
 	playsound(src.loc, "smash.ogg", 25, 1, -1)
-	weakened = max(weakened, (istype(A,/obj/item) ? A:w_class : rand(1,5))) //Heheheh
+	var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh
+	Weaken(weak_amt)
 	. = ..()
 
 obj/airflow_hit(atom/A)
@@ -239,10 +231,10 @@ mob/living/carbon/human/airflow_hit(atom/A)
 	apply_damage(b_loss/3, BRUTE, "groin", blocked, 0, "Airflow")
 
 	if(airflow_speed > 10)
-		paralysis += round(airflow_speed * vsc.airflow_stun)
-		stunned = max(stunned,paralysis + 3)
+		Paralyse(round(airflow_speed * vsc.airflow_stun))
+		Stun(paralysis + 3)
 	else
-		stunned += round(airflow_speed * vsc.airflow_stun/2)
+		Stun(round(airflow_speed * vsc.airflow_stun/2))
 	. = ..()
 
 zone/proc/movables()
@@ -253,7 +245,7 @@ zone/proc/movables()
 				continue
 			. += A
 
-//ULTRALIGHT - only file where this is still used, hence why it's in here			
+//ULTRALIGHT - only file where this is still used, hence why it's in here
 #define UL_I_FALLOFF_SQUARE 0
 #define UL_I_FALLOFF_ROUND 1
 #define ul_FalloffStyle UL_I_FALLOFF_ROUND // Sets the lighting falloff to be either squared or circular.

code/ZAS/Atom.dm

@@ -30,6 +30,16 @@ atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0)
 
 		return 1
 
+//Convenience function for atoms to update turfs they occupy
+/atom/movable/proc/update_nearby_tiles(need_rebuild)
+	if(!air_master)
+		return 0
+
+	for(var/turf/simulated/turf in locs)
+		air_master.mark_for_update(turf)
+
+	return 1
+
 //Basically another way of calling CanPass(null, other, 0, 0) and CanPass(null, other, 1.5, 1).
 //Returns:
 // 0 - Not blocked

code/ZAS/Fire.dm

@@ -66,11 +66,42 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh)
 
 	icon = 'icons/effects/fire.dmi'
 	icon_state = "1"
-	l_color = "#ED9200"
+	l_color = "#010000"
 	layer = TURF_LAYER
 
 	var/firelevel = 10000 //Calculated by gas_mixture.calculate_firelevel()
 
+/obj/fire/proc/GenColor(var/datum/gas_mixture/ac)
+	var/temperature = ac.temperature
+	//All temperatures are in Kelvin for the color assignment
+	if(temperature > 9000)
+		//rainbow, wtf?
+		l_color = pick("#0092ED", "#EDEDED", "#ED9200", "#ED00ED", "#0000ED", "#010000", "#00EDED", "#EDED00", "#ED0000")
+	else if(temperature >= 7150)
+		//dark blue
+		l_color = "#0000ED"
+	else if(temperature >= 5300)
+		//blue
+		l_color = "#0092ED"
+	else if(temperature >= 1800)
+		//cyan
+		l_color = "#00EDED"
+	else if(temperature >= 1500)
+		//white
+		l_color = "#EDEDED"
+	else if(temperature >= 1300)
+		//yellow
+		l_color = "#EDED00"
+	else if(temperature >= 1100)
+		//orange
+		l_color = "#ED9200"
+	else if(temperature >= 75)
+		//red
+		l_color = "#ED0000"
+	else
+		//black fire, go atmos!
+		l_color = "#010000"
+
 /obj/fire/process()
 	. = 1
 
@@ -114,10 +145,10 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh)
 		icon_state = "3"
 		SetLuminosity(7)
 	else if(firelevel > 2.5)
-		icon_state = "2"
+		icon_state = "3"
 		SetLuminosity(5)
 	else
-		icon_state = "1"
+		icon_state = "3"
 		SetLuminosity(3)
 
 	//im not sure how to implement a version that works for every creature so for now monkeys are firesafe
@@ -130,6 +161,9 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh)
 	// Burn the turf, too.
 	S.fire_act(air_contents, air_contents.temperature, air_contents.return_volume())
 
+	//Update color of the fire
+	src.GenColor(air_contents)
+
 	//spread
 	for(var/direction in cardinal)
 		var/turf/simulated/enemy_tile = get_step(S, direction)

code/__HELPERS/constants.dm

@@ -0,0 +1,2 @@
+var/global/const/TICKS_IN_DAY = 864000
+var/global/const/TICKS_IN_SECOND = 10

code/__HELPERS/experimental.dm

@@ -1,5 +1,5 @@
 /*
- * Experimental procs by ESwordTheCat.
+ * Experimental procs by ESwordTheCat!
  */
 
 /*
@@ -15,7 +15,7 @@
  * -1, parameter B is not a char
  * -2, parameter A is not a string
  */
-/proc/EgijkAeN(const/A, const/B)
+/proc/strpos(const/A, const/B)
 	if (istext(A) == 0 || length(A) < 1)
 		return -2
 
@@ -31,29 +31,24 @@
 		. = i
 		i = findtext(A, B, i + 1)
 
-/obj/machinery/proc/getArea()
-	var/area/A = loc.loc
-
-	if (A != myArea)
-		myArea = A
-
-	. = myArea
-
 /**
  * Object pooling.
  *
  * If this file is named experimental,
  * well treat this implementation as experimental experimental (redundancy intended).
  *
- * WARNING, only supports /mob and /obj.
+ * WARNING, only supports /atom/movable (/mob and /obj)
  */
 
 // Uncomment to show debug messages.
 //#define DEBUG_OBJECT_POOL
 
-#define MAINTAINING_OBJECT_POOL_COUNT 20
+#define MAINTAINING_OBJECT_POOL_COUNT 500
 
-var/list/masterPool = list()
+var/global/list/masterPool = new
+
+// Read-only or compile-time vars and special exceptions.
+var/list/exclude = list("inhand_states", "loc", "locs", "parent_type", "vars", "verbs", "type", "x", "y", "z")
 
 /*
  * @args
@@ -62,27 +57,35 @@ var/list/masterPool = list()
  *
  * Example call: getFromPool(/obj/item/weapon/shard, loc)
  */
-/proc/getFromPool(const/A, const/B)
-	if (isnull(masterPool[A]))
+/proc/getFromPool()
+	var/A = args[1]
+	var/list/B = list()
+	B += (args - A)
+	if(length(masterPool["[A]"]) <= 0)
 		#ifdef DEBUG_OBJECT_POOL
-		world << "DEBUG_OBJECT_POOL: new proc has been called ([A])."
+		world << text("DEBUG_OBJECT_POOL: new proc has been called ([]).", A)
 		#endif
+		//so the GC knows we're pooling this type.
+		if(isnull(masterPool["[A]"]))
+			masterPool["[A]"] = list(new A)
+		if(B && B.len)
+			return new A(arglist(B))
+		else
+			return new A()
 
-		return new A(B)
-
-	var/atom/movable/Object = masterPool[A][1]
-	masterPool[A] -= Object
-	var/objectLength = length(masterPool[A])
+	var/atom/movable/O = masterPool["[A]"][1]
+	masterPool["[A]"] -= O
 
 	#ifdef DEBUG_OBJECT_POOL
-	world << "DEBUG_OBJECT_POOL: getFromPool([A]) [objectLength] left."
+	world << text("DEBUG_OBJECT_POOL: getFromPool([]) [] left.", A, length(masterPool[A]))
 	#endif
-
-	if (!objectLength)
-		masterPool[A] = null
-
-	Object.loc = B
-	return Object
+	if(!O || !istype(O))
+		O = new A(arglist(B))
+	else
+		if(length(B))
+			O.loc = B[1]
+		O.New(arglist(B))
+	return O
 
 /*
  * @args
@@ -93,31 +96,26 @@ var/list/masterPool = list()
  *
  * Example call: returnToPool(src)
  */
-/proc/returnToPool(const/A)
-	if (!istype(A, /atom/movable))
-		return -1
+/proc/returnToPool(const/atom/movable/AM)
+	if(istype(AM.loc,/mob/living))
+		var/mob/living/L = AM.loc
+		L.unEquip(AM)
+	if(length(masterPool["[AM.type]"]) > MAINTAINING_OBJECT_POOL_COUNT)
+		#ifdef DEBUG_OBJECT_POOL
+		world << text("DEBUG_OBJECT_POOL: returnToPool([]) exceeds [] discarding...", AM.type, MAINTAINING_OBJECT_POOL_COUNT)
+		#endif
 
-	var/atom/movable/Object = A
-	Object.resetVariables()
+		qdel(AM, 1)
+		return
 
-	switch(length(masterPool[Object.type]))
-		if (MAINTAINING_OBJECT_POOL_COUNT to 1.#INF)
-			#ifdef DEBUG_OBJECT_POOL
-			world << "DEBUG_OBJECT_POOL: returnToPool([Object.type]) exceeds [num2text(MAINTAINING_OBJECT_POOL_COUNT)] discarding..."
-			#endif
+	if(isnull(masterPool["[AM.type]"]))
+		masterPool["[AM.type]"] = list()
 
-			return
-		if (0) // In a numeric context (like a mathematical operation), null evaluates to 0.
-			#ifdef DEBUG_OBJECT_POOL
-			world << "DEBUG_OBJECT_POOL: [Object.type] pool is empty, recreating pool."
-			#endif
-
-			masterPool[Object.type] = list()
-
-	masterPool[Object.type] += Object
+	AM.resetVariables()
+	masterPool["[AM.type]"] += AM
 
 	#ifdef DEBUG_OBJECT_POOL
-	world << "DEBUG_OBJECT_POOL: returnToPool([Object.type]) [length(masterPool[Object.type])] left."
+	world << text("DEBUG_OBJECT_POOL: returnToPool([]) [] left.", AM.type, length(masterPool["[AM.type]"]))
 	#endif
 
 #undef MAINTAINING_OBJECT_POOL_COUNT
@@ -127,20 +125,48 @@ var/list/masterPool = list()
 #endif
 
 /*
- * Override this if the object variables needed to reset.
+ * if you have a variable that needed to be preserve, override this and call ..
  *
- * Example: see, code\game\objects\items\stacks\sheets\glass.dm
- *				 @/obj/item/weapon/shard
- *				 @resetVariables()
+ * example
+ *
+ * /obj/item/resetVariables()
+ * 	..("var1", "var2", "var3")
+ *
+ * however, if the object has a child type an it has overridden resetVariables()
+ * this should be
+ *
+ * /obj/item/resetVariables()
+ * 	..("var1", "var2", "var3", args)
+ *
+ * /obj/item/weapon/resetVariables()
+ * 	..("var4")
  */
-/atom/movable
-	proc/resetVariables()
-		var/list/exclude = list("loc", "locs", "parent_type", "vars", "verbs", "type") // Read-only or compile-time vars and whatevs.
-		exclude += args // Explicit var exclusion
-		var/list/varsCopy = vars - exclude
-		var/key
+/atom/movable/proc/resetVariables()
+	loc = null
 
-		for (key in varsCopy)
-			vars[key] = initial(vars[key])
+	var/list/exclude = global.exclude + args // explicit var exclusion
 
-		vars["loc"] = null // Making sure the loc is null not a compile-time var value.
+	for(var/key in vars)
+		if(key in exclude)
+			continue
+
+		vars[key] = initial(vars[key])
+
+/proc/isInTypes(atom/Object, types)
+	var/prototype = Object.type
+	Object = null
+
+	for (var/type in params2list(types))
+		if (ispath(prototype, text2path(type)))
+			return 1
+
+	return 0
+
+
+/obj/machinery/proc/getArea()
+	var/area/A = loc.loc
+
+	if (A != myArea)
+		myArea = A
+
+	. = myArea

code/__HELPERS/game.dm

@@ -167,8 +167,6 @@
 // The old system would loop through lists for a total of 5000 per function call, in an empty server.
 // This new system will loop at around 1000 in an empty server.
 
-// SCREW THAT SHIT, we're not recursing.
-
 /proc/get_mobs_in_view(var/R, var/atom/source)
 	// Returns a list of mobs in range of R from source. Used in radio and say code.
 
@@ -180,48 +178,40 @@
 
 	var/list/range = hear(R, T)
 
-	for(var/mob/M in range)
-		hear += M
+	for(var/atom/A in range)
+		if(ismob(A))
+			var/mob/M = A
+			if(M.client)
+				hear += M
+			//world.log << "Start = [M] - [get_turf(M)] - ([M.x], [M.y], [M.z])"
+		else if(istype(A, /obj/item/device/radio))
+			hear += A
 
-	var/list/objects = list()
+		if(isobj(A) || ismob(A))
+			hear |= recursive_mob_check(A, hear, 3, 1, 0, 1)
 
-	for(var/obj/O in range)				//Get a list of objects in hearing range.  We'll check to see if any clients have their "eye" set to the object
-		objects += O
-
-	for(var/client/C in clients)
-		if(!istype(C) || !C.eye || istype(C.eye, /mob/aiEye))
-			continue   			//I have no idea when this client check would be needed, but if this runtimes people won't hear anything
-							//So kinda paranoid about runtime avoidance.
-		if(istype(C.eye, /obj/machinery/camera))
-			continue				//No microphones in cameras.
-
-		if(C.mob in hear)
-			continue
-
-		var/list/hear_and_objects = (hear|objects)      //Combined these lists here instead of doing the combine 3 more times.
-
-		if(C.eye in hear_and_objects)
-			hear += C.mob
-
-		else if(C.mob && C.mob.loc in hear_and_objects)
-			hear += C.mob
-		else if(C.mob && C.mob.loc.loc in hear_and_objects)
-			hear += C.mob
-		else if(C.mob && C.mob.loc.loc.loc in hear_and_objects)
-			hear += C.mob
 	return hear
 
 
 /proc/get_mobs_in_radio_ranges(var/list/obj/item/device/radio/radios)
 
-	//set background = 1
+	set background = 1
 
 	. = list()
 	// Returns a list of mobs who can hear any of the radios given in @radios
 	var/list/speaker_coverage = list()
-	for(var/i = 1; i <= radios.len; i++)
-		var/obj/item/device/radio/R = radios[i]
+	for(var/obj/item/device/radio/R in radios)
 		if(R)
+			//Cyborg checks. Receiving message uses a bit of cyborg's charge.
+			var/obj/item/device/radio/borg/BR = R
+			if(istype(BR) && BR.myborg)
+				var/mob/living/silicon/robot/borg = BR.myborg
+				var/datum/robot_component/CO = borg.get_component("radio")
+				if(!CO)
+					continue //No radio component (Shouldn't happen)
+				if(!borg.is_component_functioning("radio") || !borg.use_power(CO.energy_consumption))
+					continue //No power.
+
 			var/turf/speaker = get_turf(R)
 			if(speaker)
 				for(var/turf/T in hear(R.canhear_range,speaker))
@@ -239,6 +229,7 @@
 					. |= M		// Since we're already looping through mobs, why bother using |= ? This only slows things down.
 	return .
 
+
 #define SIGN(X) ((X<0)?-1:1)
 
 proc
@@ -313,7 +304,8 @@ proc/isInSight(var/atom/A, var/atom/B)
 			return M
 	return null
 
-/proc/get_candidates(be_special_flag=0, afk_bracket=3000, jobban=0, department_jobban=0, override_age=0)
+/proc/get_candidates(be_special_flag=0, afk_bracket=3000, override_age=0, override_jobban=0)
+	var/roletext = get_roletext(be_special_flag)
 	var/list/candidates = list()
 	// Keep looping until we find a non-afk candidate within the time bracket (we limit the bracket to 10 minutes (6000))
 	while(!candidates.len && afk_bracket < 6000)
@@ -321,7 +313,7 @@ proc/isInSight(var/atom/A, var/atom/B)
 			if(G.client != null)
 				if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
 					if(!G.client.is_afk(afk_bracket) && (G.client.prefs.be_special & be_special_flag))
-						if(!jobban && !department_jobban || !jobban_isbanned(G, jobban) && !jobban_isbanned(G,department_jobban))
+						if(!override_jobban || (!jobban_isbanned(G, roletext) && !jobban_isbanned(G,"Syndicate")))
 							if(override_age || player_old_enough_antag(G.client,be_special_flag))
 								candidates += G.client
 		afk_bracket += 600 // Add a minute to the bracket, for every attempt

code/__HELPERS/global_lists.dm

@@ -25,9 +25,16 @@ var/global/list/joblist = list()					//list of all jobstypes, minus borg and AI
 var/global/list/flag_list = list()					//list of flags during Nations gamemode
 var/global/list/airlocks = list()					//list of all airlocks
 
+
+var/global/list/alphabet_uppercase = list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z") //added for Xenoarchaeology, might be useful for other stuff
+
+var/global/list/aibots = list() // AI controlled bots
+var/global/list/table_recipes = list() //list of all table craft recipes
+
 //Languages/species/whitelist.
 var/global/list/all_species[0]
 var/global/list/all_languages[0]
+var/global/list/language_keys[0]					// Table of say codes for all languages
 var/global/list/all_nations[0]
 var/global/list/whitelisted_species = list()
 
@@ -44,7 +51,7 @@ var/global/list/facial_hair_styles_male_list = list()
 var/global/list/facial_hair_styles_female_list = list()
 var/global/list/skin_styles_female_list = list()		//unused
 	//Underwear
-var/global/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "Mankini", "None") 
+var/global/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "Mankini", "None")
 var/global/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "Thong", "None")
 var/global/list/underwear_list = underwear_m + underwear_f
 	//undershirt
@@ -114,6 +121,13 @@ var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Al
 		var/datum/language/L = new T
 		all_languages[L.name] = L
 
+	for (var/language_name in all_languages)
+		var/datum/language/L = all_languages[language_name]
+		if(!(L.flags & NONGLOBAL))
+			language_keys[":[lowertext(L.key)]"] = L
+			language_keys[".[lowertext(L.key)]"] = L
+			language_keys["#[lowertext(L.key)]"] = L
+
 	var/rkey = 0
 	paths = typesof(/datum/species)-/datum/species
 	for(var/T in paths)
@@ -124,6 +138,8 @@ var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Al
 
 		if(S.flags & IS_WHITELISTED)
 			whitelisted_species += S.name
+			
+	init_subtypes(/datum/table_recipe, table_recipes)
 
 	return 1
 

code/__HELPERS/lists.dm

@@ -207,6 +207,7 @@ proc/listclearnulls(list/list)
 
 //Mergsort: does the actual sorting and returns the results back to sortAtom
 /proc/mergeAtoms(var/list/atom/L, var/list/atom/R, var/order = 1)
+	if(!L || !R) return 0
 	var/Li=1
 	var/Ri=1
 	var/list/result = new()
@@ -393,7 +394,187 @@ proc/listclearnulls(list/list)
 	//world.log << "	output: [out.len]"
 	return reverselist(out)
 
-/proc/find_record(field, value, list/L)
-	for(var/datum/data/record/R in L)
-		if(R.fields[field] == value)
-			return R
+/proc/dd_sortedObjectList(var/list/L, var/cache=list())
+	if(L.len < 2)
+		return L
+	var/middle = L.len / 2 + 1 // Copy is first,second-1
+	return dd_mergeObjectList(dd_sortedObjectList(L.Copy(0,middle), cache), dd_sortedObjectList(L.Copy(middle), cache), cache) //second parameter null = to end of list
+
+/proc/dd_mergeObjectList(var/list/L, var/list/R, var/list/cache)
+	var/Li=1
+	var/Ri=1
+	var/list/result = new()
+	while(Li <= L.len && Ri <= R.len)
+		var/LLi = L[Li]
+		var/RRi = R[Ri]
+		var/LLiV = cache[LLi]
+		var/RRiV = cache[RRi]
+		if(!LLiV)
+			LLiV = LLi:dd_SortValue()
+			cache[LLi] = LLiV
+		if(!RRiV)
+			RRiV = RRi:dd_SortValue()
+			cache[RRi] = RRiV
+		if(LLiV < RRiV)
+			result += L[Li++]
+		else
+			result += R[Ri++]
+
+	if(Li <= L.len)
+		return (result + L.Copy(Li, 0))
+	return (result + R.Copy(Ri, 0))
+
+// Insert an object into a sorted list, preserving sortedness
+/proc/dd_insertObjectList(var/list/L, var/O)
+	var/min = 1
+	var/max = L.len
+	var/Oval = O:dd_SortValue()
+
+	while(1)
+		var/mid = min+round((max-min)/2)
+
+		if(mid == max)
+			L.Insert(mid, O)
+			return
+
+		var/Lmid = L[mid]
+		var/midval = Lmid:dd_SortValue()
+		if(Oval == midval)
+			L.Insert(mid, O)
+			return
+		else if(Oval < midval)
+			max = mid
+		else
+			min = mid+1
+
+/*
+proc/dd_sortedObjectList(list/incoming)
+	/*
+	   Use binary search to order by dd_SortValue().
+	   This works by going to the half-point of the list, seeing if the node in
+	   question is higher or lower cost, then going halfway up or down the list
+	   and checking again. This is a very fast way to sort an item into a list.
+	*/
+	var/list/sorted_list = new()
+	var/low_index
+	var/high_index
+	var/insert_index
+	var/midway_calc
+	var/current_index
+	var/current_item
+	var/current_item_value
+	var/current_sort_object_value
+	var/list/list_bottom
+
+	var/current_sort_object
+	for (current_sort_object in incoming)
+		low_index = 1
+		high_index = sorted_list.len
+		while (low_index <= high_index)
+			// Figure out the midpoint, rounding up for fractions.  (BYOND rounds down, so add 1 if necessary.)
+			midway_calc = (low_index + high_index) / 2
+			current_index = round(midway_calc)
+			if (midway_calc > current_index)
+				current_index++
+			current_item = sorted_list[current_index]
+
+			current_item_value = current_item:dd_SortValue()
+			current_sort_object_value = current_sort_object:dd_SortValue()
+			if (current_sort_object_value < current_item_value)
+				high_index = current_index - 1
+			else if (current_sort_object_value > current_item_value)
+				low_index = current_index + 1
+			else
+				// current_sort_object == current_item
+				low_index = current_index
+				break
+
+		// Insert before low_index.
+		insert_index = low_index
+
+		// Special case adding to end of list.
+		if (insert_index > sorted_list.len)
+			sorted_list += current_sort_object
+			continue
+
+		// Because BYOND lists don't support insert, have to do it by:
+		// 1) taking out bottom of list, 2) adding item, 3) putting back bottom of list.
+		list_bottom = sorted_list.Copy(insert_index)
+		sorted_list.Cut(insert_index)
+		sorted_list += current_sort_object
+		sorted_list += list_bottom
+	return sorted_list
+*/
+
+proc/dd_sortedtextlist(list/incoming, case_sensitive = 0)
+	// Returns a new list with the text values sorted.
+	// Use binary search to order by sortValue.
+	// This works by going to the half-point of the list, seeing if the node in question is higher or lower cost,
+	// then going halfway up or down the list and checking again.
+	// This is a very fast way to sort an item into a list.
+	var/list/sorted_text = new()
+	var/low_index
+	var/high_index
+	var/insert_index
+	var/midway_calc
+	var/current_index
+	var/current_item
+	var/list/list_bottom
+	var/sort_result
+
+	var/current_sort_text
+	for (current_sort_text in incoming)
+		low_index = 1
+		high_index = sorted_text.len
+		while (low_index <= high_index)
+			// Figure out the midpoint, rounding up for fractions.  (BYOND rounds down, so add 1 if necessary.)
+			midway_calc = (low_index + high_index) / 2
+			current_index = round(midway_calc)
+			if (midway_calc > current_index)
+				current_index++
+			current_item = sorted_text[current_index]
+
+			if (case_sensitive)
+				sort_result = sorttextEx(current_sort_text, current_item)
+			else
+				sort_result = sorttext(current_sort_text, current_item)
+
+			switch(sort_result)
+				if (1)
+					high_index = current_index - 1	// current_sort_text < current_item
+				if (-1)
+					low_index = current_index + 1	// current_sort_text > current_item
+				if (0)
+					low_index = current_index		// current_sort_text == current_item
+					break
+
+		// Insert before low_index.
+		insert_index = low_index
+
+		// Special case adding to end of list.
+		if (insert_index > sorted_text.len)
+			sorted_text += current_sort_text
+			continue
+
+		// Because BYOND lists don't support insert, have to do it by:
+		// 1) taking out bottom of list, 2) adding item, 3) putting back bottom of list.
+		list_bottom = sorted_text.Copy(insert_index)
+		sorted_text.Cut(insert_index)
+		sorted_text += current_sort_text
+		sorted_text += list_bottom
+	return sorted_text
+
+
+proc/dd_sortedTextList(list/incoming)
+	var/case_sensitive = 1
+	return dd_sortedtextlist(incoming, case_sensitive)
+
+
+datum/proc/dd_SortValue()
+	return "[src]"
+
+/obj/machinery/dd_SortValue()
+	return "[sanitize(name)]"
+
+/obj/machinery/camera/dd_SortValue()
+	return "[c_tag]"

code/__HELPERS/mobs.dm

@@ -49,15 +49,19 @@ proc/random_facial_hair_style(gender, species = "Human")
 
 		return f_style
 
-proc/random_name(gender, speciesName = "Human")
-	var/datum/species/S = all_species[speciesName]
-	if(S)
-		return S.makeName(gender)
-	else
-		if(gender==FEMALE)	
+proc/random_name(gender, species = "Human")
+
+	var/datum/species/current_species
+	if(species)
+		current_species = all_species[species]
+
+	if(!current_species || current_species.name == "Human")
+		if(gender==FEMALE)
 			return capitalize(pick(first_names_female)) + " " + capitalize(pick(last_names))
-		else				
-			return capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names))		
+		else
+			return capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names))
+	else
+		return current_species.get_random_name(gender)	
 
 proc/random_skin_tone()
 	switch(pick(60;"caucasian", 15;"afroamerican", 10;"african", 10;"latino", 5;"albino"))
@@ -128,6 +132,8 @@ Proc for attack log creation, because really why not
 
 proc/add_logs(mob/target, mob/user, what_done, var/object=null, var/addition=null)
 	var/list/ignore=list("shaked","CPRed","grabbed","punched")
+	if(!user)
+		return
 	if(ismob(user))
 		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has [what_done] [target.name][ismob(target) ? "([target.ckey])" : ""][object ? " with [object]" : " "][addition]</font>")
 	if(ismob(target))

code/__HELPERS/text.dm

@@ -34,12 +34,9 @@
 	return t
 
 //Removes a few problematic characters
-/proc/sanitize_simple(var/t,var/list/repl_chars = list("\n"="#","\t"="#","�"="�"))
+/proc/sanitize_simple(var/t,var/list/repl_chars = list("\n"="#","\t"="#"))
 	for(var/char in repl_chars)
-		var/index = findtext(t, char)
-		while(index)
-			t = copytext(t, 1, index) + repl_chars[char] + copytext(t, index+1)
-			index = findtext(t, char)
+		replacetext(t, char, repl_chars[char])
 	return t
 	
 /proc/readd_quotes(var/t)
@@ -82,7 +79,7 @@
 // Used to get a sanitized input.
 /proc/stripped_input(var/mob/user, var/message = "", var/title = "", var/default = "", var/max_length=MAX_MESSAGE_LEN)
 	var/name = input(user, message, title, default)
-	return strip_html_simple(name, max_length)
+	return strip_html_properly(name, max_length)
 
 //Filters out undesirable characters from names
 /proc/reject_bad_name(var/t_in, var/allow_numbers=0, var/max_length=MAX_NAME_LEN)
@@ -311,4 +308,35 @@ proc/checkhtml(var/t)
 	var/new_text = ""
 	for(var/i = length(text); i > 0; i--)
 		new_text += copytext(text, i, i+1)
-	return new_text
+	return new_text
+	
+//This proc strips html properly, but it's not lazy like the other procs.
+//This means that it doesn't just remove < and > and call it a day.
+//Also limit the size of the input, if specified.
+/proc/strip_html_properly(var/input, var/max_length = MAX_MESSAGE_LEN)
+	if(!input)
+		return
+	var/opentag = 1 //These store the position of < and > respectively.
+	var/closetag = 1
+	while(1)
+		opentag = findtext(input, "<")
+		closetag = findtext(input, ">")
+		if(closetag && opentag)
+			if(closetag < opentag)
+				input = copytext(input, (closetag + 1))
+			else
+				input = copytext(input, 1, opentag) + copytext(input, (closetag + 1))
+		else if(closetag || opentag)
+			if(opentag)
+				input = copytext(input, 1, opentag)
+			else
+				input = copytext(input, (closetag + 1))
+		else
+			break
+	if(max_length)
+		input = copytext(input,1,max_length)
+	return sanitize(input)
+
+/proc/trim_strip_html_properly(var/input, var/max_length = MAX_MESSAGE_LEN)
+    return trim(strip_html_properly(input, max_length))
+	

code/__HELPERS/type2type.dm

@@ -227,7 +227,7 @@ proc/tg_text2list(text, glue=",", assocglue=";")
 		. += copytext(text, last_found, found)
 		last_found = found + delim_len
 	while(found)
-	
+
 /proc/text2numlist(text, delimiter="\n")
 	var/list/num_list = list()
 	for(var/x in text2list(text, delimiter))
@@ -347,6 +347,7 @@ proc/tg_text2list(text, glue=",", assocglue=";")
 	if(rights & R_SOUNDS)		. += "[seperator]+SOUND"
 	if(rights & R_SPAWN)		. += "[seperator]+SPAWN"
 	if(rights & R_MOD)			. += "[seperator]+MODERATOR"
+	if(rights & R_MENTOR)		. += "[seperator]+MENTOR"
 	return .
 
 /proc/ui_style2icon(ui_style)

code/__HELPERS/unsorted.dm

@@ -411,13 +411,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 				//world << "<b>[newname] is the AI!</b>"
 				//world << sound('sound/AI/newAI.ogg')
 				// Set eyeobj name
-				if(A.eyeobj)
-					A.eyeobj.name = "[newname] (AI Eye)"
-
-				// Set ai pda name
-				if(A.aiPDA)
-					A.aiPDA.owner = newname
-					A.aiPDA.name = newname + " (" + A.aiPDA.ownjob + ")"
+				A.SetName(newname)
 
 
 		fully_replace_character_name(oldname,newname)
@@ -1391,6 +1385,7 @@ proc/is_hot(obj/item/W as obj)
 
 //Returns 1 if the given item is capable of popping things like balloons, inflatable barriers, or cutting police tape.
 /proc/can_puncture(obj/item/W as obj)		// For the record, WHAT THE HELL IS THIS METHOD OF DOING IT?
+	if(!istype(W)) return 0
 	if(!W) return 0
 	if(W.sharp) return 1
 	return ( \

code/_onclick/ai.dm

@@ -15,7 +15,6 @@
 		return
 
 	if(control_disabled || stat) return
-	next_move = world.time + 9
 
 	if(ismob(A))
 		ai_actual_track(A)
@@ -60,7 +59,6 @@
 
 	if(world.time <= next_move)
 		return
-	next_move = world.time + 9
 
 	if(aiCamera.in_camera_mode)
 		aiCamera.camera_mode_off()
@@ -161,8 +159,7 @@
 	Topic("breaker=1", list("breaker"="1"), 0) // 0 meaning no window (consistency! wait...)
 
 /obj/machinery/turretid/AICtrlClick() //turns off/on Turrets
-	src.enabled = !src.enabled
-	src.updateTurrets()
+	Topic(src, list("src"= "\ref[src]", "command"="enable", "value"="[!enabled]"), 1) // 1 meaning no window (consistency!)
 
 /atom/proc/AIAltClick(var/atom/A)
 	AltClick(A)
@@ -181,8 +178,7 @@
 	return
 
 /obj/machinery/turretid/AIAltClick() //toggles lethal on turrets
-	src.lethal = !src.lethal
-	src.updateTurrets()
+	Topic(src, list("src"= "\ref[src]", "command"="lethal", "value"="[!lethal]"), 1) // 1 meaning no window (consistency!)
 
 /atom/proc/AIMiddleClick()
 	return

code/_onclick/click.dm

@@ -65,7 +65,7 @@
 	if(stat || paralysis || stunned || weakened)
 		return
 
-	face_atom(A) // change direction to face what you clicked on
+	face_atom(A)
 
 	if(next_move > world.time) // in the year 2000...
 		return
@@ -77,6 +77,7 @@
 		return M.click_action(A,src)
 
 	if(restrained())
+		changeNext_move(CLICK_CD_HANDCUFFED) //Doing shit in cuffs shall be vey slow
 		RestrainedClickOn(A)
 		return
 
@@ -87,56 +88,45 @@
 	var/obj/item/W = get_active_hand()
 
 	if(W == A)
-		next_move = world.time + 6
-		if(W.flags&USEDELAY)
-			next_move += 5
 		W.attack_self(src)
 		if(hand)
 			update_inv_l_hand(0)
 		else
 			update_inv_r_hand(0)
-
 		return
 
-	// operate two levels deep here (item in backpack in src; NOT item in box in backpack in src)
-	if(A == loc || (A in loc) || (A in contents) || (A.loc in contents))
-
-		// faster access to objects already on you
-		if(A in contents)
-			next_move = world.time + 6 // on your person
-		else
-			next_move = world.time + 8 // in a box/bag or in your square
-
+	// operate two STORAGE levels deep here (item in backpack in src; NOT item in box in backpack in src)
+	var/sdepth = A.storage_depth(src)
+	if(A == loc || (A in loc) || (sdepth != -1 && sdepth <= 1))
 		// No adjacency needed
 		if(W)
-			if(W.flags&USEDELAY)
-				next_move += 5
-
 			var/resolved = A.attackby(W,src)
 			if(!resolved && A && W)
 				W.afterattack(A,src,1,params) // 1 indicates adjacency
 		else
-			UnarmedAttack(A)
+			if(ismob(A))
+				changeNext_move(CLICK_CD_MELEE)
+			UnarmedAttack(A, 1)
+
 		return
 
 	if(!isturf(loc)) // This is going to stop you from telekinesing from inside a closet, but I don't shed many tears for that
 		return
 
 	// Allows you to click on a box's contents, if that box is on the ground, but no deeper than that
-	if(isturf(A) || isturf(A.loc) || (A.loc && isturf(A.loc.loc)))
-		next_move = world.time + 10
-
+	sdepth = A.storage_depth_turf()
+	if(isturf(A) || isturf(A.loc) || (sdepth != -1 && sdepth <= 1))
 		if(A.Adjacent(src)) // see adjacent.dm
 			if(W)
-				if(W.flags&USEDELAY)
-					next_move += 5
-
-				// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
-				var/resolved = A.attackby(W,src)
+				// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example, params)
+				var/resolved = A.attackby(W,src,params)
 				if(!resolved && A && W)
 					W.afterattack(A,src,1,params) // 1: clicking something Adjacent
 			else
+				if(ismob(A))
+					changeNext_move(CLICK_CD_MELEE)
 				UnarmedAttack(A, 1)
+
 			return
 		else // non-adjacent click
 			if(W)
@@ -146,10 +136,12 @@
 
 	return
 
+/mob/proc/changeNext_move(num)
+	next_move = world.time + num
+
 // Default behavior: ignore double clicks, consider them normal clicks instead
 /mob/proc/DblClickOn(var/atom/A, var/params)
-	ClickOn(A,params)
-
+	return
 
 /*
 	Translates into attack_hand, etc.
@@ -162,6 +154,8 @@
 	in human click code to allow glove touches only at melee range.
 */
 /mob/proc/UnarmedAttack(var/atom/A, var/proximity_flag)
+	if(ismob(A))
+		changeNext_move(CLICK_CD_MELEE)
 	return
 
 /*
@@ -176,22 +170,12 @@
 	if(ishuman(src) && (istype(src:gloves, /obj/item/clothing/gloves/yellow/power)) && a_intent == "harm")
 		PowerGlove(A)
 	if(!mutations.len) return
-	if((M_LASER in mutations) && a_intent == "harm")
+	if((LASER in mutations) && a_intent == "harm")
 		LaserEyes(A) // moved into a proc below
 		return
-	else if(M_TK in mutations)
-		switch(get_dist(src,A))
-			if(0)
-				;
-			if(1 to 5) // not adjacent may mean blocked by window
-				next_move += 2
-			if(5 to 7)
-				next_move += 5
-			if(8 to tk_maxrange)
-				next_move += 10
-			else
-				return
-		A.attack_tk(src)
+	else
+		if(TK in mutations)
+			A.attack_tk(src)
 /*
 	Restrained ClickOn
 
@@ -209,6 +193,13 @@
 	A.point()
 	return
 
+/mob/living/carbon/MiddleClickOn(var/atom/A)
+	if(!src.stat && src.mind && src.mind.changeling && src.mind.changeling.chosen_sting && (istype(A, /mob/living/carbon)) && (A != src))
+		next_click = world.time + 5
+		mind.changeling.chosen_sting.try_to_sting(src, A)
+	else
+		A.point()
+
 // In case of use break glass
 /*
 /atom/proc/MiddleClick(var/mob/M as mob)
@@ -251,6 +242,13 @@
 	A.AltClick(src)
 	return
 
+/mob/living/carbon/AltClickOn(var/atom/A)
+	if(!src.stat && src.mind && src.mind.changeling && src.mind.changeling.chosen_sting && (istype(A, /mob/living/carbon)) && (A != src))
+		next_click = world.time + 5
+		mind.changeling.chosen_sting.try_to_sting(src, A)
+	else
+		..()
+
 /atom/proc/AltClick(var/mob/user)
 	var/turf/T = get_turf(src)
 	if(T && user.TurfAdjacent(T))
@@ -273,16 +271,16 @@
 	return
 
 /atom/proc/CtrlShiftClick(var/mob/user)
-	return	
+	return
 
 /mob/proc/AltShiftClickOn(var/atom/A)
 	A.AltShiftClick(src)
 	return
 
 /atom/proc/AltShiftClick(var/mob/user)
-	return	
-	
-	
+	return
+
+
 /*
 	Misc helpers
 
@@ -293,7 +291,7 @@
 	return
 
 /mob/living/LaserEyes(atom/A)
-	next_move = world.time + 6
+	changeNext_move(CLICK_CD_RANGE)
 	var/turf/T = get_turf(src)
 	var/turf/U = get_turf(A)
 
@@ -346,21 +344,9 @@
 		if(available >= 5000000)
 			L.damage = 205
 		if(L.damage >= 200)
-			apply_damage(15, BURN, (hand ? "l_hand" : "r_hand"))
-			//usr:Stun(15)
-			//usr:Weaken(15)
-			//if(usr:status_flags & CANSTUN) // stun is usually associated with stutter
-			//	usr:stuttering += 20
 			time = 200
-			src << "<span class='warning'>[G] overload from the massive current shocking you in the process!"
 		else if(L.damage >= 100)
-			apply_damage(5, BURN, (hand ? "l_hand" : "r_hand"))
-			//usr:Stun(10)
-			//usr:Weaken(10)
-			//if(usr:status_flags & CANSTUN) // stun is usually associated with stutter
-			//	usr:stuttering += 10
 			time = 150
-			src << "<span class='warning'>[G] overload from the massive current shocking you in the process!"
 		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 		s.set_up(5, 1, src)
 		s.start()

code/_onclick/cyborg.dm

@@ -72,21 +72,13 @@
 		return
 
 	if(W == A)
-		next_move = world.time + 8
-		if(W.flags&USEDELAY)
-			next_move += 5
-
 		W.attack_self(src)
 		return
 
 	// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
 	if(A == loc || (A in loc) || (A in contents))
 		// No adjacency checks
-		next_move = world.time + 8
-		if(W.flags&USEDELAY)
-			next_move += 5
-
-		var/resolved = A.attackby(W,src)
+		var/resolved = A.attackby(W,src,params, params)
 		if(!resolved && A && W)
 			W.afterattack(A,src,1,params)
 		return
@@ -97,16 +89,11 @@
 	// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc))
 	if(isturf(A) || isturf(A.loc))
 		if(A.Adjacent(src)) // see adjacent.dm
-			next_move = world.time + 10
-			if(W.flags&USEDELAY)
-				next_move += 5
-
-			var/resolved = A.attackby(W, src)
+			var/resolved = A.attackby(W, src, params, params)
 			if(!resolved && A && W)
 				W.afterattack(A, src, 1, params)
 			return
 		else
-			next_move = world.time + 10
 			W.afterattack(A, src, 0, params)
 			return
 	return

code/_onclick/hud/_defines.dm

@@ -114,6 +114,11 @@
 #define ui_borg_health "16:28,6:13" //borgs have the health display where humans have the pressure damage indicator.
 #define ui_alien_health "16:28,6:13" //aliens have the health display where humans have the pressure damage indicator.
 
+#define ui_construct_health "16:00,8:17" //same height as humans, hugging the right border
+#define ui_construct_purge "16:00,6:15"
+#define ui_construct_fire "15:16,8:13" //above health, slightly to the left
+#define ui_construct_pull "16:28,2:10" //above the zone_sel icon
+
 //Pop-up inventory
 #define ui_shoes "2:8,1:5"
 

code/_onclick/hud/hud.dm

@@ -190,6 +190,8 @@ datum/hud/New(mob/owner)
 		ai_hud()
 	else if(isrobot(mymob))
 		robot_hud()
+	else if(iscorgi(mymob))
+		corgi_hud()
 	else if(isobserver(mymob))
 		ghost_hud()
 	else if(isovermind(mymob))

code/_onclick/hud/human.dm

@@ -507,6 +507,7 @@
 
 /mob/living/carbon/human/update_action_buttons()
 	var/num = 1
+	var/list/to_update = list()
 	if(!hud_used) return
 	if(!client) return
 
@@ -519,37 +520,44 @@
 	for(var/obj/item/I in src)
 		if(istype(I,/obj/item/clothing/under))
 			var/obj/item/clothing/under/U = I
-			if(U.hastie)
-				I = U.hastie
+			if(U.accessories)
+				for(var/obj/item/clothing/accessory/AC in U.accessories)
+					if(AC.icon_action_button)
+						to_update += AC
+						continue
 		if(I.icon_action_button)
-			var/obj/screen/item_action/A = new(hud_used)
-			
-			//A.icon = 'icons/mob/screen1_action.dmi'
-			//A.icon_state = I.icon_action_button
-			A.icon = ui_style2icon(client.prefs.UI_style)
-			A.icon_state = "template"
-			var/image/img = image(I.icon, A, I.icon_state)
-			img.pixel_x = 0
-			img.pixel_y = 0
-			A.overlays += img
+			to_update += I
+			continue
+				
+	for(var/obj/item/I in to_update)
+		var/obj/screen/item_action/A = new(hud_used)
+		
+		//A.icon = 'icons/mob/screen1_action.dmi'
+		//A.icon_state = I.icon_action_button
+		A.icon = ui_style2icon(client.prefs.UI_style)
+		A.icon_state = "template"
+		var/image/img = image(I.icon, A, I.icon_state)
+		img.pixel_x = 0
+		img.pixel_y = 0
+		A.overlays += img
 
-			if(I.action_button_name)
-				A.name = I.action_button_name
-			else
-				A.name = "Use [I.name]"
-			A.owner = I
-			hud_used.item_action_list += A
-			switch(num)
-				if(1)
-					A.screen_loc = ui_action_slot1
-				if(2)
-					A.screen_loc = ui_action_slot2
-				if(3)
-					A.screen_loc = ui_action_slot3
-				if(4)
-					A.screen_loc = ui_action_slot4
-				if(5)
-					A.screen_loc = ui_action_slot5
-					break //5 slots available, so no more can be added.
-			num++
+		if(I.action_button_name)
+			A.name = I.action_button_name
+		else
+			A.name = "Use [I.name]"
+		A.owner = I
+		hud_used.item_action_list += A
+		switch(num)
+			if(1)
+				A.screen_loc = ui_action_slot1
+			if(2)
+				A.screen_loc = ui_action_slot2
+			if(3)
+				A.screen_loc = ui_action_slot3
+			if(4)
+				A.screen_loc = ui_action_slot4
+			if(5)
+				A.screen_loc = ui_action_slot5
+				break //5 slots available, so no more can be added.
+		num++
 	src.client.screen += src.hud_used.item_action_list

code/_onclick/hud/other_mobs.dm

@@ -5,6 +5,41 @@
 /datum/hud/proc/ghost_hud()
 	return
 
+/datum/hud/proc/corgi_hud(u)
+	mymob.fire = new /obj/screen()
+	mymob.fire.icon = 'icons/mob/screen1_corgi.dmi'
+	mymob.fire.icon_state = "fire0"
+	mymob.fire.name = "fire"
+	mymob.fire.screen_loc = ui_fire
+
+	mymob.healths = new /obj/screen()
+	mymob.healths.icon = 'icons/mob/screen1_corgi.dmi'
+	mymob.healths.icon_state = "health0"
+	mymob.healths.name = "health"
+	mymob.healths.screen_loc = ui_health
+
+	mymob.pullin = new /obj/screen()
+	mymob.pullin.icon = 'icons/mob/screen1_corgi.dmi'
+	mymob.pullin.icon_state = "pull0"
+	mymob.pullin.name = "pull"
+	mymob.pullin.screen_loc = ui_construct_pull
+
+	mymob.oxygen = new /obj/screen()
+	mymob.oxygen.icon = 'icons/mob/screen1_corgi.dmi'
+	mymob.oxygen.icon_state = "oxy0"
+	mymob.oxygen.name = "oxygen"
+	mymob.oxygen.screen_loc = ui_oxygen
+
+	mymob.toxin = new /obj/screen()
+	mymob.toxin.icon = 'icons/mob/screen1_corgi.dmi'
+	mymob.toxin.icon_state = "tox0"
+	mymob.toxin.name = "toxin"
+	mymob.toxin.screen_loc = ui_toxin
+
+	mymob.client.screen = null
+
+	mymob.client.screen += list(mymob.fire, mymob.healths, mymob.pullin, mymob.oxygen, mymob.toxin)
+
 /datum/hud/proc/brain_hud(ui_style = 'icons/mob/screen1_Midnight.dmi')
 	mymob.blind = new /obj/screen()
 	mymob.blind.icon = 'icons/mob/screen1_full.dmi'

code/_onclick/hud/screen_objects.dm

@@ -36,9 +36,6 @@
 		if(istype(master, /obj/item/weapon/storage))
 			var/obj/item/weapon/storage/S = master
 			S.close(usr)
-		else if(istype(master,/obj/item/clothing/suit/storage))
-			var/obj/item/clothing/suit/storage/S = master
-			S.close(usr)
 	return 1
 
 /obj/screen/power_action
@@ -55,7 +52,6 @@
 		return 1
 	if(usr.next_move >= world.time)
 		return
-	usr.next_move = world.time + 6
 
 	if(usr.stat || usr.restrained() || usr.stunned || usr.lying)
 		return 1
@@ -90,7 +86,7 @@
 /obj/screen/storage
 	name = "storage"
 
-/obj/screen/storage/Click()
+/obj/screen/storage/Click(location, control, params)
 	if(world.time <= usr.next_move)
 		return 1
 	if(usr.stat || usr.paralysis || usr.stunned || usr.weakened)
@@ -100,8 +96,7 @@
 	if(master)
 		var/obj/item/I = usr.get_active_hand()
 		if(I)
-			master.attackby(I, usr)
-			usr.next_move = world.time+2
+			master.attackby(I, usr, params, params)
 	return 1
 
 /obj/screen/gun
@@ -281,6 +276,9 @@
 						if(!istype(C.wear_mask, /obj/item/clothing/mask))
 							C << "<span class='notice'>You are not wearing a mask.</span>"
 							return 1
+						if(C.wear_mask.mask_adjusted)
+							C << "<span class='notice'>Put your mask on first.</span>"
+							return 1						
 						else
 							var/list/nicename = null
 							var/list/tankcheck = null
@@ -409,7 +407,7 @@
 		if("Toggle Sensor Augmentation")
 			if(isrobot(usr))
 				var/mob/living/silicon/robot/R = usr
-				R.control_hud()				
+				R.sensor_mode()				
 				
 		if("module1")
 			if(istype(usr, /mob/living/silicon/robot))
@@ -506,8 +504,7 @@
 		if("Crew Monitoring")
 			if(isAI(usr))
 				var/mob/living/silicon/ai/AI = usr
-				var/obj/machinery/computer/crew/C = locate(/obj/machinery/computer/crew)
-				C.attack_ai(AI)
+				AI.nano_crew_monitor()
 
 		if("Show Crew Manifest")
 			if(isAI(usr))
@@ -557,7 +554,7 @@
 		if("Set Sensor Augmentation")
 			if(isAI(usr))
 				var/mob/living/silicon/ai/AI = usr
-				AI.control_hud()
+				AI.sensor_mode()
 				
 		// Alien
 		if("night vision")
@@ -587,12 +584,10 @@
 			if(iscarbon(usr))
 				var/mob/living/carbon/C = usr
 				C.activate_hand("r")
-				usr.next_move = world.time+2
 		if("l_hand")
 			if(iscarbon(usr))
 				var/mob/living/carbon/C = usr
 				C.activate_hand("l")
-				usr.next_move = world.time+2
 		if("swap")
 			usr:swap_hand()
 		if("hand")
@@ -601,5 +596,4 @@
 			if(usr.attack_ui(slot_id))
 				usr.update_inv_l_hand(0)
 				usr.update_inv_r_hand(0)
-				usr.next_move = world.time+6
 	return 1

code/_onclick/item_attack.dm

@@ -4,13 +4,16 @@
 	return
 
 // No comment
-/atom/proc/attackby(obj/item/W, mob/user)
+/atom/proc/attackby(obj/item/W, mob/living/user, params)
 	return
-/atom/movable/attackby(obj/item/W, mob/user)
+/atom/movable/attackby(obj/item/W, mob/living/user, params)
+	user.changeNext_move(CLICK_CD_MELEE)
+	user.do_attack_animation(src)
 	if(!(W.flags&NOBLUDGEON))
 		visible_message("<span class='danger'>[src] has been hit by [user] with [W].</span>")
 
-/mob/living/attackby(obj/item/I, mob/user)
+/mob/living/attackby(obj/item/I, mob/user, params)
+	user.changeNext_move(CLICK_CD_MELEE)
 	if(istype(I) && ismob(user))
 		I.attack(src, user)
 
@@ -50,8 +53,6 @@
 	/////////////////////////
 
 	var/power = force
-	if(M_HULK in user.mutations)
-		power *= 2
 
 	if(!istype(M, /mob/living/carbon/human))
 		if(istype(M, /mob/living/carbon/slime))
@@ -128,6 +129,7 @@
 		var/showname = "."
 		if(user)
 			showname = " by [user]."
+			user.do_attack_animation(src)
 		if(!(user in viewers(M, null)))
 			showname = "."
 
@@ -159,7 +161,7 @@
 						if (istype(location, /turf/simulated))
 							location:add_blood_floor(M)
 			if("fire")
-				if (!(M_RESIST_COLD in M.mutations))
+				if (!(RESIST_COLD in M.mutations))
 					M.take_organ_damage(0, power)
 					M << "Aargh it burns!"
 		M.updatehealth()

code/_onclick/observer.dm

@@ -19,8 +19,8 @@
 	if(client.buildmode)
 		build_click(src, client.buildmode, params, A)
 		return
-	if(world.time <= next_move) return
-	next_move = world.time + 8
+	if(world.time <= next_move) 
+		return
 
 	var/list/modifiers = params2list(params)
 	if(modifiers["shift"])
@@ -57,17 +57,18 @@
 	A.examine()
 
 /atom/proc/attack_ghost(mob/user as mob)
-	src.examine()
+	return
 
 // ---------------------------------------
 // And here are some good things for free:
 // Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu
 
 /obj/machinery/teleport/hub/attack_ghost(mob/user as mob)
-	var/atom/l = loc
-	var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(l.x - 2, l.y, l.z))
-	if(com.locked)
-		user.loc = get_turf(com.locked)
+	var/obj/machinery/teleport/station/S = power_station
+	if(S)
+		var/obj/machinery/computer/teleporter/com = S.teleporter_console
+		if(com && com.target)
+			user.loc = get_turf(com.target)
 
 /obj/effect/portal/attack_ghost(mob/user as mob)
 	if(target)

code/_onclick/oldcode.dm

@@ -270,7 +270,7 @@
 				// ------- YOU HAVE AN ITEM IN YOUR HAND - HANDLE ATTACKBY AND AFTERATTACK -------
 				var/ignoreAA = 0 //Ignore afterattack(). Surgery uses this.
 				if (t5)
-					ignoreAA = src.attackby(W, usr)
+					ignoreAA = src.attackby(W, usr, params)
 				if (W && !ignoreAA)
 					W.afterattack(src, usr, (t5 ? 1 : 0), params)
 
@@ -326,7 +326,7 @@
 				// ------- YOU ARE NOT RESTRAINED -------
 				if ((W && !( istype(src, /obj/screen) )))
 					// ------- IT SHOULD NEVER GET TO HERE, DUE TO THE ISTYPE(SRC, /OBJ/SCREEN) FROM PREVIOUS IF-S - I TESTED IT WITH A DEBUG OUTPUT AND I COULDN'T GET THIST TO SHOW UP. -------
-					src.attackby(W, usr)
+					src.attackby(W, usr, params)
 					if (W)
 						W.afterattack(src, usr,, params)
 				else
@@ -347,8 +347,8 @@
 					src.hand_al(usr, usr.hand)
 		else
 			// ------- YOU ARE CLICKING ON AN OBJECT THAT'S INACCESSIBLE TO YOU AND IS NOT YOUR HUD -------
-			if((M_LASER in usr:mutations) && usr:a_intent == "harm" && world.time >= usr.next_move)
-				// ------- YOU HAVE THE M_LASER MUTATION, YOUR INTENT SET TO HURT AND IT'S BEEN MORE THAN A DECISECOND SINCE YOU LAS TATTACKED -------
+			if((LASER in usr:mutations) && usr:a_intent == "harm" && world.time >= usr.next_move)
+				// ------- YOU HAVE THE LASER MUTATION, YOUR INTENT SET TO HURT AND IT'S BEEN MORE THAN A DECISECOND SINCE YOU LAS TATTACKED -------
 
 				var/turf/T = get_turf(usr)
 				var/turf/U = get_turf(src)

code/_onclick/other_mobs.dm

@@ -17,32 +17,26 @@
 /atom/proc/attack_hand(mob/user as mob)
 	return
 
-/mob/living/carbon/human/RestrainedClickOn(var/atom/A)
+/*
+/mob/living/carbon/human/RestrainedClickOn(var/atom/A) -- Handled by carbons
 	return
+*/
 
-
+/mob/living/carbon/RestrainedClickOn(var/atom/A)
+	return 0
 
 // Commented out to prevent overwriting RangedAttack in click.dm ~ Bone White
 /*
 /mob/living/carbon/human/RangedAttack(var/atom/A)
 	if(!gloves && !mutations.len) return
 	var/obj/item/clothing/gloves/G = gloves
-	if((M_LASER in mutations) && a_intent == "harm")
+	if((LASER in mutations) && a_intent == "harm")
 		LaserEyes(A) // moved into a proc below
 
 	else if(istype(G) && G.Touch(A,0)) // for magic gloves
 		return
 
-	else if(M_TK in mutations)
-		switch(get_dist(src,A))
-			if(1 to 5) // not adjacent may mean blocked by window
-				next_move += 2
-			if(5 to 7)
-				next_move += 5
-			if(8 to 15)
-				next_move += 10
-			if(16 to 128)
-				return
+	else if(TK in mutations)
 		A.attack_tk(src)
 */
 
@@ -72,8 +66,10 @@
 	things considerably
 */
 /mob/living/carbon/monkey/RestrainedClickOn(var/atom/A)
+	if(..())
+		return
 	if(a_intent != "harm" || !ismob(A)) return
-	if(istype(wear_mask, /obj/item/clothing/mask/muzzle))
+	if(is_muzzled())
 		return
 	var/mob/living/carbon/ML = A
 	var/dam_zone = ran_zone(pick("chest", "l_hand", "r_hand", "l_leg", "r_leg"))

code/_onclick/telekinesis.dm

@@ -39,13 +39,13 @@ var/const/tk_maxrange = 15
 
 /obj/item/attack_tk(mob/user)
 	if(user.stat || !isturf(loc)) return
-	if((M_TK in user.mutations) && !user.get_active_hand()) // both should already be true to get here
+	if((TK in user.mutations) && !user.get_active_hand()) // both should already be true to get here
 		var/obj/item/tk_grab/O = new(src)
 		user.put_in_active_hand(O)
 		O.host = user
 		O.focus_object(src)
 	else
-		warning("Strange attack_tk(): TK([M_TK in user.mutations]) empty hand([!user.get_active_hand()])")
+		warning("Strange attack_tk(): TK([TK in user.mutations]) empty hand([!user.get_active_hand()])")
 	return
 
 
@@ -56,7 +56,7 @@ var/const/tk_maxrange = 15
 	TK Grab Item (the workhorse of old TK)
 
 	* If you have not grabbed something, do a normal tk attack
-	* If you have something, throw it at the target.  If it is already adjacent, do a normal attackby()
+	* If you have something, throw it at the target.  If it is already adjacent, do a normal attackby(, params)
 	* If you click what you are holding, or attack_self(), do an attack_self_tk() on it.
 	* Deletes itself if it is ever not in your hand, or if you should have no access to TK.
 */
@@ -65,7 +65,7 @@ var/const/tk_maxrange = 15
 	desc = "Magic"
 	icon = 'icons/obj/magic.dmi'//Needs sprites
 	icon_state = "2"
-	flags = NOBLUDGEON
+	flags = NOBLUDGEON | ABSTRACT
 	//item_state = null
 	w_class = 10.0
 	layer = 20
@@ -95,33 +95,24 @@ var/const/tk_maxrange = 15
 		if(focus)
 			focus.attack_self_tk(user)
 
-	afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, proximity)//TODO: go over this
+	afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, proximity, params)//TODO: go over this
 		if(!target || !user)	return
 		if(last_throw+3 > world.time)	return
 		if(!host || host != user)
 			del(src)
 			return
-		if(!(M_TK in host.mutations))
+		if(!(TK in host.mutations))
 			del(src)
 			return
 		if(isobj(target) && !isturf(target.loc))
 			return
 
 		var/d = get_dist(user, target)
-		if(focus) d = max(d,get_dist(user,focus)) // whichever is further
-		switch(d)
-			if(0)
-				;
-			if(1 to 5) // not adjacent may mean blocked by window
-				if(!proximity)
-					user.next_move += 2
-			if(5 to 7)
-				user.next_move += 5
-			if(8 to tk_maxrange)
-				user.next_move += 10
-			else
-				user << "\blue Your mind won't reach that far."
-				return
+		if(focus)
+			d = max(d,get_dist(user,focus)) // whichever is further
+		if(d > tk_maxrange)
+			user << "<span class='warning'>Your mind won't reach that far.</span>"
+			return
 
 		if(!focus)
 			focus_object(target, user)
@@ -134,7 +125,7 @@ var/const/tk_maxrange = 15
 
 		if(!istype(target, /turf) && istype(focus,/obj/item) && target.Adjacent(focus))
 			var/obj/item/I = focus
-			var/resolved = target.attackby(I, user, user:get_organ_target())
+			var/resolved = target.attackby(I, user, params)
 			if(!resolved && target && I)
 				I.afterattack(target,user,1) // for splashing with beakers
 
@@ -172,7 +163,7 @@ var/const/tk_maxrange = 15
 		O.icon_state = "nothing"
 		flick("empdisable",O)
 		spawn(5)
-			O.delete()
+			qdel(O)
 		return
 
 
@@ -198,7 +189,7 @@ var/const/tk_maxrange = 15
 //equip_to_slot_or_del(obj/item/W, slot, del_on_fail = 1)
 /*
 		if(istype(user, /mob/living/carbon))
-			if(user:mutations & M_TK && get_dist(source, user) <= 7)
+			if(user:mutations & TK && get_dist(source, user) <= 7)
 				if(user:get_active_hand())	return 0
 				var/X = source:x
 				var/Y = source:y

code/controllers/ProcessScheduler/.gitignore

@@ -0,0 +1,6 @@
+/bower_components
+/node_modules
+/ProcessScheduler.dmb
+/ProcessScheduler.int
+/ProcessScheduler.rsc
+/*.lk

code/controllers/ProcessScheduler/LICENSE-AGPL

@@ -0,0 +1,212 @@
+GNU AFFERO GENERAL PUBLIC LICENSE
+
+Version 3, 19 November 2007
+
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/> 
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
+
+Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public.
+
+The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version.
+
+An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS
+
+0. Definitions.
+"This License" refers to version 3 of the GNU Affero General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based on the Program.
+
+To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work.
+
+A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same work.
+
+2. Basic Permissions.
+All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+
+4. Conveying Verbatim Copies.
+You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
+
+a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices".
+c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
+d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
+
+a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
+b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
+c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
+d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
+e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
+
+The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+
+7. Additional Terms.
+"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+
+a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+
+8. Termination.
+You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+
+11. Patents.
+A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
+
+13. Remote Network Interaction; Use with the GNU General Public License.
+Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph.
+
+Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the work with which it is combined will remain governed by version 3 of the GNU General Public License.
+
+14. Revised Versions of this License.
+The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
+
+Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
+
+15. Disclaimer of Warranty.
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Also add information on how to contact you by electronic and paper mail.
+
+If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements.
+
+You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see <http://www.gnu.org/licenses/>.

code/controllers/ProcessScheduler/LICENSE-CC-BY-NC

@@ -0,0 +1 @@
+This work is licensed under the Creative Commons Attribution-NonCommercial 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.

code/controllers/ProcessScheduler/ProcessScheduler.dme

@@ -0,0 +1,32 @@
+// DM Environment file for ProcessScheduler.dme.
+// All manual changes should be made outside the BEGIN_ and END_ blocks.
+// New source code should be placed in .dm files: choose File/New --> Code File.
+
+// BEGIN_INTERNALS
+// END_INTERNALS
+
+// BEGIN_FILE_DIR
+#define FILE_DIR .
+// END_FILE_DIR
+
+// BEGIN_PREFERENCES
+// END_PREFERENCES
+
+// BEGIN_INCLUDE
+#include "core\_define.dm"
+#include "core\_stubs.dm"
+#include "core\process.dm"
+#include "core\processScheduler.dm"
+#include "core\updateQueue.dm"
+#include "core\updateQueueWorker.dm"
+#include "test\processSchedulerView.dm"
+#include "test\testDyingUpdateQueueProcess.dm"
+#include "test\testHarness.dm"
+#include "test\testHungProcess.dm"
+#include "test\testNiceProcess.dm"
+#include "test\testSlowProcess.dm"
+#include "test\testUpdateQueue.dm"
+#include "test\testUpdateQueueProcess.dm"
+#include "test\testZombieProcess.dm"
+// END_INCLUDE
+

code/controllers/ProcessScheduler/README.md

@@ -0,0 +1,86 @@
+ProcessScheduler
+================
+A Goonstation release, maintained by Volundr
+
+##SUMMARY
+
+This is a mostly self-contained, fairly well-documented implementation of the main loop process architecture in use in Goonstation.
+
+##LICENSE
+
+This work is released under the following licenses.
+
+[![Creative Commons License](https://licensebuttons.net/l/by-nc/4.0/80x15.png)](http://creativecommons.org/licenses/by-nc/4.0/)
+
+This work is licensed under the Creative Commons Attribution-NonCommercial 4.0 International License. The complete text of this license is included in the file LICENSE-CC-BY-NC.
+
+
+[![Affero GPL Version 3](http://www.gnu.org/graphics/agplv3-88x31.png)](http://www.gnu.org/licenses/agpl-3.0.html)
+
+This work is licensed under the Affero General Public License 3.0. The complete text of the license is included in the file LICENSE-AGPL.
+
+##INSTALLATION
+
+To integrate the process scheduler to your codebase, you will not need anything except the contents of the core/ folder. The rest of the project is simply for testing and to provide an example for the process scheduler code.
+
+### Test project setup
+To compile and run the test project, you will require:
+
+- node.js
+- BYOND
+
+Clone the repository to a path of your choosing, then change directory to it and execute:
+
+```
+npm install -g
+bower install -g
+``` 
+
+Then you can either compile with DM or open the DM environment in DreamMaker and compile/run from there.
+
+##USAGE
+
+###BASICS
+To use the process scheduler in your SS13 codebase, you'll need:
+
+- core/_defines.dm
+- core/_stubs.dm
+- core/process.dm
+- core/processScheduler.dm
+- core/processScheduler.js
+- core/updateQueue.dm
+- core/updateQueueWorker.dm
+
+To integrate, you can copy the contents of _defines.dm into your global defines file. Most ss13 codebases already have the code from _stubs.dm. 
+
+The processScheduler is intended as a replacement for the old master_controller from r4407 and other fork codebases. To implement it, you need only to add the source files to your DM environment, and add the following code into world.New, above where the old master_controller is initialized.
+
+```
+processScheduler = new
+processScheduler.setup()
+processScheduler.start()
+```
+
+The processScheduler will automatically find all subtypes of process, and begin processing them.
+
+The interface code in test/processSchedulerView.dm is simply an example frontend, and can easily be rebuilt to use other styles, and/or render simple html without using javascript for refreshing the panel and killing processes.
+
+###DETAILS
+
+To implement a process, you have two options:
+
+1. Implement a raw loop-style processor
+2. Implement an updateQueue processor
+
+There are clear examples of both of these paradigms in the code provided. Both styles are valid, but for processes that are just a loop calling an update proc on a bunch of objects, you should use the updateQueue.
+
+The updateQueue works by spawn(0)'ing your specified update proc, but it only puts one instance in the scheduler at a time. Examine the code for more details. The overall effect of this is that it doesn't block, and it lets update loops work concurrently. It enables a much smoother user experience.
+
+##Contributing
+
+I welcome pull requests and issue reports, and will try to merge/fix them as I have time.
+
+### Licensing for code submitted via PR:
+
+By submitting a pull request, you agree to release all original code submitted in the pull request under the [MIT License](http://opensource.org/licenses/MIT). You also agree that any code submitted is either your own work, or is public domain or under a equally or less restrictive license than the MIT license, or that you have the express written permission of the authors of the submitted code to submit the pull request.
+

code/controllers/ProcessScheduler/bower.json

@@ -0,0 +1,30 @@
+{
+  "name": "ProcessScheduler",
+  "main": "ProcessScheduler.js",
+  "version": "1.0.0",
+  "homepage": "https://github.com/goonstation/ProcessScheduler",
+  "authors": [
+    "Volundr <spoogemonster@gmail.com>"
+  ],
+  "description": "BYOND SS13 Process Scheduler",
+  "keywords": [
+    "byond",
+    "ss13",
+    "process",
+    "scheduler"
+  ],
+  "license": "CC-BY-NC",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "private": true,
+  "dependencies": {
+    "bootstrap2.3.2": "~2.3.2",
+	"jquery": "1.11.1",
+    "json2": "*"
+  }
+}

code/controllers/ProcessScheduler/core/_define.dm

@@ -0,0 +1,17 @@
+// Process status defines
+#define PROCESS_STATUS_IDLE 1
+#define PROCESS_STATUS_QUEUED 2
+#define PROCESS_STATUS_RUNNING 3
+#define PROCESS_STATUS_MAYBE_HUNG 4
+#define PROCESS_STATUS_PROBABLY_HUNG 5
+#define PROCESS_STATUS_HUNG 6
+
+// Process time thresholds
+#define PROCESS_DEFAULT_HANG_WARNING_TIME 	300 // 30 seconds
+#define PROCESS_DEFAULT_HANG_ALERT_TIME 	600 // 60 seconds
+#define PROCESS_DEFAULT_HANG_RESTART_TIME 	900 // 90 seconds
+#define PROCESS_DEFAULT_SCHEDULE_INTERVAL 	50  // 50 ticks
+#define PROCESS_DEFAULT_SLEEP_INTERVAL		2	// 2 ticks
+#define PROCESS_DEFAULT_CPU_THRESHOLD		90  // 90%
+
+//#define UPDATE_QUEUE_DEBUG

code/controllers/ProcessScheduler/core/_stubs.dm

@@ -0,0 +1,38 @@
+/**
+ * _stubs.dm
+ *
+ * This file contains constructs that the process scheduler expects to exist
+ * in a standard ss13 fork.
+ */
+/*
+/**
+ * message_admins
+ *
+ * sends a message to admins
+ */
+/proc/message_admins(msg)
+	world << msg
+*/
+/**
+ * logTheThing
+ *
+ * In goonstation, this proc writes a message to either the world log or diary.
+ *
+ * Blame Keelin.
+ */
+/proc/logTheThing(type, source, target, text, diaryType)
+	if(diaryType)
+		world << "Diary: \[[diaryType]:[type]] [text]"
+	else
+		world << "Log: \[[type]] [text]"
+
+/**
+ * var/disposed
+ *
+ * In goonstation, disposed is set to 1 after an object enters the delete queue
+ * or the object is placed in an object pool (effectively out-of-play so to speak)
+ */
+/datum/var/disposed
+// Garbage collection (controller).
+/datum/var/gcDestroyed
+/datum/var/timeDestroyed

code/controllers/ProcessScheduler/core/process.dm

@@ -0,0 +1,317 @@
+// Process
+
+/datum/controller/process
+	/**
+	 * State vars
+	 */
+	// Main controller ref
+	var/tmp/datum/controller/processScheduler/main
+
+	// 1 if process is not running or queued
+	var/tmp/idle = 1
+
+	// 1 if process is queued
+	var/tmp/queued = 0
+
+	// 1 if process is running
+	var/tmp/running = 0
+
+	// 1 if process is blocked up
+	var/tmp/hung = 0
+
+	// 1 if process was killed
+	var/tmp/killed = 0
+
+	// Status text var
+	var/tmp/status
+
+	// Previous status text var
+	var/tmp/previousStatus
+
+	// 1 if process is disabled
+	var/tmp/disabled = 0
+
+	/**
+	 * Config vars
+	 */
+	// Process name
+	var/name
+
+	// Process schedule interval
+	// This controls how often the process would run under ideal conditions.
+	// If the process scheduler sees that the process has finished, it will wait until
+	// this amount of time has elapsed from the start of the previous run to start the
+	// process running again.
+	var/tmp/schedule_interval = PROCESS_DEFAULT_SCHEDULE_INTERVAL // run every 50 ticks
+
+	// Process sleep interval
+	// This controls how often the process will yield (call sleep(0)) while it is running.
+	// Every concurrent process should sleep periodically while running in order to allow other
+	// processes to execute concurrently.
+	var/tmp/sleep_interval = PROCESS_DEFAULT_SLEEP_INTERVAL
+
+	// hang_warning_time - this is the time (in 1/10 seconds) after which the server will begin to show "maybe hung" in the context window
+	var/tmp/hang_warning_time = PROCESS_DEFAULT_HANG_WARNING_TIME
+
+	// hang_alert_time - After this much time(in 1/10 seconds), the server will send an admin debug message saying the process may be hung
+	var/tmp/hang_alert_time = PROCESS_DEFAULT_HANG_ALERT_TIME
+
+	// hang_restart_time - After this much time(in 1/10 seconds), the server will automatically kill and restart the process.
+	var/tmp/hang_restart_time = PROCESS_DEFAULT_HANG_RESTART_TIME
+
+	// cpu_threshold - if world.cpu >= cpu_threshold, scheck() will call sleep(1) to defer further work until the next tick. This keeps a process from driving a tick into overtime (causing perceptible lag)
+	var/tmp/cpu_threshold = PROCESS_DEFAULT_CPU_THRESHOLD
+
+	// How many times in the current run has the process deferred work till the next tick?
+	var/tmp/cpu_defer_count = 0
+
+	/**
+	 * recordkeeping vars
+	 */
+
+	// Records the time (server ticks) at which the process last finished sleeping
+	var/tmp/last_slept = 0
+
+	// Records the time (s-ticks) at which the process last began running
+	var/tmp/run_start = 0
+
+	// Records the number of times this process has been killed and restarted
+	var/tmp/times_killed
+
+	// Tick count
+	var/tmp/ticks = 0
+
+	var/tmp/last_task = ""
+
+	var/tmp/last_object
+
+datum/controller/process/New(var/datum/controller/processScheduler/scheduler)
+	..()
+	main = scheduler
+	previousStatus = "idle"
+	idle()
+	name = "process"
+	schedule_interval = 50
+	sleep_interval = 2
+	last_slept = 0
+	run_start = 0
+	ticks = 0
+	last_task = 0
+	last_object = null
+
+datum/controller/process/proc/started()
+	// Initialize last_slept so we can know when to sleep
+	last_slept = world.timeofday
+
+	// Initialize run_start so we can detect hung processes.
+	run_start = world.timeofday
+
+	// Initialize defer count
+	cpu_defer_count = 0
+
+	running()
+	main.processStarted(src)
+
+	onStart()
+
+datum/controller/process/proc/finished()
+	ticks++
+	idle()
+	main.processFinished(src)
+
+	onFinish()
+
+datum/controller/process/proc/doWork()
+
+datum/controller/process/proc/setup()
+
+datum/controller/process/proc/process()
+	started()
+	doWork()
+	finished()
+
+datum/controller/process/proc/running()
+	idle = 0
+	queued = 0
+	running = 1
+	hung = 0
+	setStatus(PROCESS_STATUS_RUNNING)
+
+datum/controller/process/proc/idle()
+	queued = 0
+	running = 0
+	idle = 1
+	hung = 0
+	setStatus(PROCESS_STATUS_IDLE)
+
+datum/controller/process/proc/queued()
+	idle = 0
+	running = 0
+	queued = 1
+	hung = 0
+	setStatus(PROCESS_STATUS_QUEUED)
+
+datum/controller/process/proc/hung()
+	hung = 1
+	setStatus(PROCESS_STATUS_HUNG)
+
+datum/controller/process/proc/handleHung()
+	var/datum/lastObj = last_object
+	var/lastObjType = "null"
+	if(istype(lastObj))
+		lastObjType = lastObj.type
+
+	// If world.timeofday has rolled over, then we need to adjust.
+	if (world.timeofday < run_start)
+		run_start -= 864000
+
+	var/msg = "[name] process hung at tick #[ticks]. Process was unresponsive for [(world.timeofday - run_start) / 10] seconds and was restarted. Last task: [last_task]. Last Object Type: [lastObjType]"
+	logTheThing("debug", null, null, msg)
+	logTheThing("diary", null, null, msg, "debug")
+	message_admins(msg)
+
+	main.restartProcess(src.name)
+
+datum/controller/process/proc/kill()
+	if (!killed)
+		var/msg = "[name] process was killed at tick #[ticks]."
+		logTheThing("debug", null, null, msg)
+		logTheThing("diary", null, null, msg, "debug")
+		//finished()
+
+		// Allow inheritors to clean up if needed
+		onKill()
+
+		killed = TRUE
+
+		// This should del
+		del(src)
+
+datum/controller/process/proc/scheck(var/tickId = 0)
+	if (killed)
+		// The kill proc is the only place where killed is set.
+		// The kill proc should have deleted this datum, and all sleeping procs that are
+		// owned by it.
+		CRASH("A killed process is still running somehow...")
+
+	// For each tick the process defers, it increments the cpu_defer_count so we don't
+	// defer indefinitely
+	if (world.cpu >= cpu_threshold + cpu_defer_count * 10)
+		sleep(1)
+		cpu_defer_count++
+		last_slept = world.timeofday
+	else
+		// If world.timeofday has rolled over, then we need to adjust.
+		if (world.timeofday < last_slept)
+			last_slept -= 864000
+
+		if (world.timeofday > last_slept + sleep_interval)
+			// If we haven't slept in sleep_interval ticks, sleep to allow other work to proceed.
+			sleep(0)
+			last_slept = world.timeofday
+
+datum/controller/process/proc/update()
+	// Clear delta
+	if(previousStatus != status)
+		setStatus(status)
+
+	var/elapsedTime = getElapsedTime()
+
+	if (elapsedTime > hang_restart_time)
+		hung()
+	else if (elapsedTime > hang_alert_time)
+		setStatus(PROCESS_STATUS_PROBABLY_HUNG)
+	else if (elapsedTime > hang_warning_time)
+		setStatus(PROCESS_STATUS_MAYBE_HUNG)
+
+datum/controller/process/proc/getElapsedTime()
+	if (world.timeofday < run_start)
+		return world.timeofday - (run_start - 864000)
+	return world.timeofday - run_start
+
+datum/controller/process/proc/tickDetail()
+	return
+
+datum/controller/process/proc/getContext()
+	return "<tr><td>[name]</td><td>[main.averageRunTime(src)]</td><td>[main.last_run_time[src]]</td><td>[main.highest_run_time[src]]</td><td>[ticks]</td></tr>\n"
+
+datum/controller/process/proc/getContextData()
+	return list(
+	"name" = name,
+	"averageRunTime" = main.averageRunTime(src),
+	"lastRunTime" = main.last_run_time[src],
+	"highestRunTime" = main.highest_run_time[src],
+	"ticks" = ticks,
+	"schedule" = schedule_interval,
+	"status" = getStatusText(),
+	"disabled" = disabled
+	)
+
+datum/controller/process/proc/getStatus()
+	return status
+
+datum/controller/process/proc/getStatusText(var/s = 0)
+	if(!s)
+		s = status
+	switch(s)
+		if(PROCESS_STATUS_IDLE)
+			return "idle"
+		if(PROCESS_STATUS_QUEUED)
+			return "queued"
+		if(PROCESS_STATUS_RUNNING)
+			return "running"
+		if(PROCESS_STATUS_MAYBE_HUNG)
+			return "maybe hung"
+		if(PROCESS_STATUS_PROBABLY_HUNG)
+			return "probably hung"
+		if(PROCESS_STATUS_HUNG)
+			return "HUNG"
+		else
+			return "UNKNOWN"
+
+datum/controller/process/proc/getPreviousStatus()
+	return previousStatus
+
+datum/controller/process/proc/getPreviousStatusText()
+	return getStatusText(previousStatus)
+
+datum/controller/process/proc/setStatus(var/newStatus)
+	previousStatus = status
+	status = newStatus
+
+datum/controller/process/proc/setLastTask(var/task, var/object)
+	last_task = task
+	last_object = object
+
+datum/controller/process/proc/_copyStateFrom(var/datum/controller/process/target)
+	main = target.main
+	name = target.name
+	schedule_interval = target.schedule_interval
+	sleep_interval = target.sleep_interval
+	last_slept = 0
+	run_start = 0
+	times_killed = target.times_killed
+	ticks = target.ticks
+	last_task = target.last_task
+	last_object = target.last_object
+	copyStateFrom(target)
+
+datum/controller/process/proc/copyStateFrom(var/datum/controller/process/target)
+
+datum/controller/process/proc/onKill()
+
+datum/controller/process/proc/onStart()
+
+datum/controller/process/proc/onFinish()
+
+datum/controller/process/proc/disable()
+	disabled = 1
+
+datum/controller/process/proc/enable()
+	disabled = 0
+
+/datum/controller/process/proc/getLastRunTime()
+	return main.getProcessLastRunTime(src)
+
+/datum/controller/process/proc/getTicks()
+	return ticks

code/controllers/ProcessScheduler/core/processScheduler.dm

@@ -0,0 +1,320 @@
+// Singleton instance of game_controller_new, setup in world.New()
+var/global/datum/controller/processScheduler/processScheduler
+
+/datum/controller/processScheduler
+	// Processes known by the scheduler
+	var/tmp/datum/controller/process/list/processes = new
+
+	// Processes that are currently running
+	var/tmp/datum/controller/process/list/running = new
+
+	// Processes that are idle
+	var/tmp/datum/controller/process/list/idle = new
+
+	// Processes that are queued to run
+	var/tmp/datum/controller/process/list/queued = new
+
+	// Process name -> process object map
+	var/tmp/datum/controller/process/list/nameToProcessMap = new
+
+	// Process last start times
+	var/tmp/datum/controller/process/list/last_start = new
+
+	// Process last run durations
+	var/tmp/datum/controller/process/list/last_run_time = new
+
+	// Per process list of the last 20 durations
+	var/tmp/datum/controller/process/list/last_twenty_run_times = new
+
+	// Process highest run time
+	var/tmp/datum/controller/process/list/highest_run_time = new
+
+	// Sleep 1 tick -- This may be too aggressive.
+	var/tmp/scheduler_sleep_interval = 1
+
+	// Controls whether the scheduler is running or not
+	var/tmp/isRunning = 0
+
+	// Setup for these processes will be deferred until all the other processes are set up.
+	var/tmp/list/deferredSetupList = new
+
+/**
+ * deferSetupFor
+ * @param path processPath
+ * If a process needs to be initialized after everything else, add it to
+ * the deferred setup list. On goonstation, only the ticker needs to have
+ * this treatment.
+ */
+/datum/controller/processScheduler/proc/deferSetupFor(var/processPath)
+	if (!(processPath in deferredSetupList))
+		deferredSetupList += processPath
+
+/datum/controller/processScheduler/proc/setup()
+	// There can be only one
+	if(processScheduler && (processScheduler != src))
+		del(src)
+		return 0
+
+	var/process
+	// Add all the processes we can find, except for the ticker
+	for (process in typesof(/datum/controller/process) - /datum/controller/process)
+		if (!(process in deferredSetupList))
+			addProcess(new process(src))
+
+	for (process in deferredSetupList)
+		addProcess(new process(src))
+
+/datum/controller/processScheduler/proc/start()
+	isRunning = 1
+	spawn(0)
+		process()
+
+/datum/controller/processScheduler/proc/process()
+	while(isRunning)
+		checkRunningProcesses()
+		queueProcesses()
+		runQueuedProcesses()
+		sleep(scheduler_sleep_interval)
+
+/datum/controller/processScheduler/proc/stop()
+	isRunning = 0
+
+/datum/controller/processScheduler/proc/checkRunningProcesses()
+	for(var/datum/controller/process/p in running)
+		p.update()
+
+		if (isnull(p)) // Process was killed
+			continue
+
+		var/status = p.getStatus()
+		var/previousStatus = p.getPreviousStatus()
+
+		// Check status changes
+		if(status != previousStatus)
+			//Status changed.
+
+			switch(status)
+				if(PROCESS_STATUS_MAYBE_HUNG)
+					message_admins("Process '[p.name]' is [p.getStatusText(status)].")
+				if(PROCESS_STATUS_PROBABLY_HUNG)
+					message_admins("Process '[p.name]' is [p.getStatusText(status)].")
+				if(PROCESS_STATUS_HUNG)
+					message_admins("Process '[p.name]' is [p.getStatusText(status)].")
+					p.handleHung()
+
+/datum/controller/processScheduler/proc/queueProcesses()
+	for(var/datum/controller/process/p in processes)
+		// Don't double-queue, don't queue running processes
+		if (p.disabled || p.running || p.queued || !p.idle)
+			continue
+
+		// If world.timeofday has rolled over, then we need to adjust.
+		if (world.timeofday < last_start[p])
+			last_start[p] -= 864000
+
+		// If the process should be running by now, go ahead and queue it
+		if (world.timeofday > last_start[p] + p.schedule_interval)
+			setQueuedProcessState(p)
+
+/datum/controller/processScheduler/proc/runQueuedProcesses()
+	for(var/datum/controller/process/p in queued)
+		runProcess(p)
+
+/datum/controller/processScheduler/proc/addProcess(var/datum/controller/process/process)
+	processes.Add(process)
+	process.idle()
+	idle.Add(process)
+
+	// init recordkeeping vars
+	last_start.Add(process)
+	last_start[process] = 0
+	last_run_time.Add(process)
+	last_run_time[process] = 0
+	last_twenty_run_times.Add(process)
+	last_twenty_run_times[process] = list()
+	highest_run_time.Add(process)
+	highest_run_time[process] = 0
+
+	// init starts and stops record starts
+	recordStart(process, 0)
+	recordEnd(process, 0)
+
+	// Set up process
+	process.setup()
+
+	// Save process in the name -> process map
+	nameToProcessMap[process.name] = process
+
+/datum/controller/processScheduler/proc/replaceProcess(var/datum/controller/process/oldProcess, var/datum/controller/process/newProcess)
+	processes.Remove(oldProcess)
+	processes.Add(newProcess)
+
+	newProcess.idle()
+	idle.Remove(oldProcess)
+	running.Remove(oldProcess)
+	queued.Remove(oldProcess)
+	idle.Add(newProcess)
+
+	last_start.Remove(oldProcess)
+	last_start.Add(newProcess)
+	last_start[newProcess] = 0
+
+	last_run_time.Add(newProcess)
+	last_run_time[newProcess] = last_run_time[oldProcess]
+	last_run_time.Remove(oldProcess)
+
+	last_twenty_run_times.Add(newProcess)
+	last_twenty_run_times[newProcess] = last_twenty_run_times[oldProcess]
+	last_twenty_run_times.Remove(oldProcess)
+
+	highest_run_time.Add(newProcess)
+	highest_run_time[newProcess] = highest_run_time[oldProcess]
+	highest_run_time.Remove(oldProcess)
+
+	recordStart(newProcess, 0)
+	recordEnd(newProcess, 0)
+
+	nameToProcessMap[newProcess.name] = newProcess
+
+
+/datum/controller/processScheduler/proc/runProcess(var/datum/controller/process/process)
+	spawn(0)
+		process.process()
+
+/datum/controller/processScheduler/proc/processStarted(var/datum/controller/process/process)
+	setRunningProcessState(process)
+	recordStart(process)
+
+/datum/controller/processScheduler/proc/processFinished(var/datum/controller/process/process)
+	setIdleProcessState(process)
+	recordEnd(process)
+
+/datum/controller/processScheduler/proc/setIdleProcessState(var/datum/controller/process/process)
+	if (process in running)
+		running -= process
+	if (process in queued)
+		queued -= process
+	if (!(process in idle))
+		idle += process
+
+	process.idle()
+
+/datum/controller/processScheduler/proc/setQueuedProcessState(var/datum/controller/process/process)
+	if (process in running)
+		running -= process
+	if (process in idle)
+		idle -= process
+	if (!(process in queued))
+		queued += process
+
+	// The other state transitions are handled internally by the process.
+	process.queued()
+
+/datum/controller/processScheduler/proc/setRunningProcessState(var/datum/controller/process/process)
+	if (process in queued)
+		queued -= process
+	if (process in idle)
+		idle -= process
+	if (!(process in running))
+		running += process
+
+	process.running()
+
+/datum/controller/processScheduler/proc/recordStart(var/datum/controller/process/process, var/time = null)
+	if (isnull(time))
+		time = world.timeofday
+
+	last_start[process] = time
+
+/datum/controller/processScheduler/proc/recordEnd(var/datum/controller/process/process, var/time = null)
+	if (isnull(time))
+		time = world.timeofday
+
+	// If world.timeofday has rolled over, then we need to adjust.
+	if (time < last_start[process])
+		last_start[process] -= 864000
+
+	var/lastRunTime = time - last_start[process]
+
+	if(lastRunTime < 0)
+		lastRunTime = 0
+
+	recordRunTime(process, lastRunTime)
+
+/**
+ * recordRunTime
+ * Records a run time for a process
+ */
+/datum/controller/processScheduler/proc/recordRunTime(var/datum/controller/process/process, time)
+	last_run_time[process] = time
+	if(time > highest_run_time[process])
+		highest_run_time[process] = time
+
+	var/list/lastTwenty = last_twenty_run_times[process]
+	if (lastTwenty.len == 20)
+		lastTwenty.Cut(1, 2)
+	lastTwenty.len++
+	lastTwenty[lastTwenty.len] = time
+
+/**
+ * averageRunTime
+ * returns the average run time (over the last 20) of the process
+ */
+/datum/controller/processScheduler/proc/averageRunTime(var/datum/controller/process/process)
+	var/lastTwenty = last_twenty_run_times[process]
+
+	var/t = 0
+	var/c = 0
+	for(var/time in lastTwenty)
+		t += time
+		c++
+
+	if(c > 0)
+		return t / c
+	return c
+
+/datum/controller/processScheduler/proc/getStatusData()
+	var/list/data = new
+
+	for (var/datum/controller/process/p in processes)
+		data.len++
+		data[data.len] = p.getContextData()
+
+	return data
+
+/datum/controller/processScheduler/proc/getProcessCount()
+	return processes.len
+
+/datum/controller/processScheduler/proc/hasProcess(var/processName as text)
+	if (nameToProcessMap[processName])
+		return 1
+
+/datum/controller/processScheduler/proc/killProcess(var/processName as text)
+	restartProcess(processName)
+
+/datum/controller/processScheduler/proc/restartProcess(var/processName as text)
+	if (hasProcess(processName))
+		var/datum/controller/process/oldInstance = nameToProcessMap[processName]
+		var/datum/controller/process/newInstance = new oldInstance.type(src)
+		newInstance._copyStateFrom(oldInstance)
+		replaceProcess(oldInstance, newInstance)
+		oldInstance.kill()
+
+/datum/controller/processScheduler/proc/enableProcess(var/processName as text)
+	if (hasProcess(processName))
+		var/datum/controller/process/process = nameToProcessMap[processName]
+		process.enable()
+
+/datum/controller/processScheduler/proc/disableProcess(var/processName as text)
+	if (hasProcess(processName))
+		var/datum/controller/process/process = nameToProcessMap[processName]
+		process.disable()
+
+/datum/controller/processScheduler/proc/getProcess(var/name)
+	return nameToProcessMap[name]
+
+/datum/controller/processScheduler/proc/getProcessLastRunTime(var/datum/controller/process/process)
+	return last_run_time[process]
+
+/datum/controller/processScheduler/proc/getIsRunning()
+	return isRunning

code/controllers/ProcessScheduler/core/updateQueue.dm

@@ -0,0 +1,127 @@
+/**
+ * updateQueue.dm
+ */
+
+#ifdef UPDATE_QUEUE_DEBUG
+#define uq_dbg(text) world << text
+#else
+#define uq_dbg(text)
+#endif
+/datum/updateQueue
+	var/tmp/list/objects
+	var/tmp/previousStart
+	var/tmp/procName
+	var/tmp/list/arguments
+	var/tmp/datum/updateQueueWorker/currentWorker
+	var/tmp/workerTimeout
+	var/tmp/adjustedWorkerTimeout
+	var/tmp/currentKillCount
+	var/tmp/totalKillCount
+	
+/datum/updateQueue/New(list/objects = list(), procName = "update", list/arguments = list(), workerTimeout = 2, inplace = 0)
+	..()
+	
+	uq_dbg("Update queue created.")
+	
+	// Init proc allows for recycling the worker.
+	init(objects = objects, procName = procName, arguments = arguments, workerTimeout = workerTimeout, inplace = inplace)
+
+/**
+ * init
+ * @param list objects objects to update
+ * @param text procName the proc to call on each item in the object list
+ * @param list arguments optional arguments to pass to the update proc
+ * @param number workerTimeout number of ticks to wait for an update to
+	                           finish before forking a new update worker
+ * @param bool inplace whether the updateQueue should make a copy of objects.
+                       the internal list will be modified, so it is usually
+					   a good idea to leave this alone. Default behavior is to
+					   copy.
+ */
+/datum/updateQueue/proc/init(list/objects = list(), procName = "update", list/arguments = list(), workerTimeout = 2, inplace = 0)
+	uq_dbg("Update queue initialization started.")
+	
+	if (!inplace)
+		// Make an internal copy of the list so we're not modifying the original.
+		initList(objects)
+	else
+		src.objects = objects
+		
+	// Init vars
+	src.procName = procName
+	src.arguments = arguments
+	src.workerTimeout = workerTimeout
+	
+	adjustedWorkerTimeout = workerTimeout
+	currentKillCount = 0
+	totalKillCount = 0
+		
+	uq_dbg("Update queue initialization finished. procName = '[procName]'")
+		
+/datum/updateQueue/proc/initList(list/toCopy)
+	/**
+	 * We will copy the list in reverse order, as our doWork proc 
+	 * will access them by popping an element off the end of the list.
+	 * This ends up being quite a lot faster than taking elements off
+	 * the head of the list.
+	 */
+	objects = new
+		
+	uq_dbg("Copying [toCopy.len] items for processing.")
+	
+	for(var/i=toCopy.len,i>0,)
+		objects.len++
+		objects[objects.len] = toCopy[i--]
+		
+/datum/updateQueue/proc/Run()
+	uq_dbg("Starting run...")
+
+	startWorker()
+	while (istype(currentWorker) && !currentWorker.finished)
+		sleep(2)
+		checkWorker()
+		
+	uq_dbg("UpdateQueue completed run.")
+		
+/datum/updateQueue/proc/checkWorker()
+	if(istype(currentWorker))
+		// If world.timeofday has rolled over, then we need to adjust.
+		if(world.timeofday < currentWorker.lastStart)
+			currentWorker.lastStart -= 864000
+			
+		if(world.timeofday - currentWorker.lastStart > adjustedWorkerTimeout) 
+			// This worker is a bit slow, let's spawn a new one and kill the old one.
+			uq_dbg("Current worker is lagging... starting a new one.")
+			killWorker()
+			startWorker()
+	else // No worker!
+		uq_dbg("update queue ended up without a worker... starting a new one...")
+		startWorker()
+		
+/datum/updateQueue/proc/startWorker()
+	// only run the worker if we have objects to work on
+	if(objects.len)
+		uq_dbg("Starting worker process.")
+		
+		// No need to create a fresh worker if we already have one...
+		if (istype(currentWorker))
+			currentWorker.init(objects, procName, arguments)
+		else
+			currentWorker = new(objects, procName, arguments)
+		currentWorker.start()
+	else
+		uq_dbg("Queue is empty. No worker was started.")
+		currentWorker = null
+		
+/datum/updateQueue/proc/killWorker()
+	// Kill the worker
+	currentWorker.kill()
+	currentWorker = null
+	// After we kill a worker, yield so that if the worker's been tying up the cpu, other stuff can immediately resume
+	sleep(-1)
+	currentKillCount++
+	totalKillCount++
+	if (currentKillCount >= 3)
+		uq_dbg("[currentKillCount] workers have been killed with a timeout of [adjustedWorkerTimeout]. Increasing worker timeout to compensate.")
+		adjustedWorkerTimeout++
+		currentKillCount = 0

code/controllers/ProcessScheduler/core/updateQueueWorker.dm

@@ -0,0 +1,83 @@
+datum/updateQueueWorker
+	var/tmp/list/objects
+	var/tmp/killed
+	var/tmp/finished
+	var/tmp/procName
+	var/tmp/list/arguments
+	var/tmp/lastStart
+	var/tmp/cpuThreshold
+
+datum/updateQueueWorker/New(var/list/objects, var/procName, var/list/arguments, var/cpuThreshold = 90)
+	..()
+	uq_dbg("updateQueueWorker created.")
+
+	init(objects, procName, arguments, cpuThreshold)
+
+datum/updateQueueWorker/proc/init(var/list/objects, var/procName, var/list/arguments, var/cpuThreshold = 90)
+	src.objects = objects
+	src.procName = procName
+	src.arguments = arguments
+	src.cpuThreshold = cpuThreshold
+
+	killed = 0
+	finished = 0
+
+datum/updateQueueWorker/proc/doWork()
+	// If there's nothing left to execute or we were killed, mark finished and return.
+	if (!objects || !objects.len) return finished()
+
+	lastStart = world.timeofday // Absolute number of ticks since the world started up
+
+	var/datum/object = objects[objects.len] // Pull out the object
+	objects.len-- // Remove the object from the list
+
+	if (istype(object) && !isturf(object) && !object.disposed && isnull(object.gcDestroyed)) // We only work with real objects
+		call(object, procName)(arglist(arguments))
+
+	// If there's nothing left to execute
+	// or we were killed while running the above code, mark finished and return.
+	if (!objects || !objects.len) return finished()
+
+	if (world.cpu > cpuThreshold)
+		// We don't want to force a tick into overtime!
+		// If the tick is about to go overtime, spawn the next update to go
+		// in the next tick.
+		uq_dbg("tick went into overtime with world.cpu = [world.cpu], deferred next update to next tick [1+(world.time / world.tick_lag)]")
+
+		spawn(1)
+			doWork()
+	else
+		spawn(0) // Execute anonymous function immediately as if we were in a while loop...
+			doWork()
+
+datum/updateQueueWorker/proc/finished()
+	uq_dbg("updateQueueWorker finished.")
+	/**
+	 * If the worker was killed while it was working on something, it
+	 * should delete itself when it finally finishes working on it.
+	 * Meanwhile, the updateQueue will have proceeded on with the rest of
+	 * the queue. This will also terminate the spawned function that was
+	 * created in the kill() proc.
+	 */
+	if(killed)
+		del(src)
+
+	finished = 1
+
+datum/updateQueueWorker/proc/kill()
+	uq_dbg("updateQueueWorker killed.")
+	killed = 1
+	objects = null
+
+	/**
+	 * If the worker is not done in 30 seconds after it's killed,
+	 * we'll forcibly delete it, causing the anonymous function it was
+	 * running to be terminated. Hasta la vista, baby.
+	 */
+	spawn(300)
+		del(src)
+
+datum/updateQueueWorker/proc/start()
+	uq_dbg("updateQueueWorker started.")
+	spawn(0)
+		doWork()

code/controllers/ProcessScheduler/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "ProcessScheduler",
+  "version": "1.0.0",
+  "description": "BYOND SS13 Process Scheduler",
+  "main": "processScheduler.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/goonstation/ProcessScheduler.git"
+  },
+  "keywords": [
+    "byond",
+    "ss13",
+    "process",
+    "scheduler"
+  ],
+  "author": "Volundr",
+  "license": "CC-BY-NC",
+  "bugs": {
+    "url": "https://github.com/goonstation/ProcessScheduler/issues"
+  },
+  "homepage": "https://github.com/goonstation/ProcessScheduler",
+  "dependencies": {
+    "bower": "*"
+  }
+}

code/controllers/ProcessScheduler/test/processScheduler.js

@@ -0,0 +1,56 @@
+(function ($) {
+    function setRef(theRef) {
+        ref = theRef;
+    }
+
+    function jax(action, data) {
+        if (typeof data === 'undefined')
+            data = {};
+        var params = [];
+        for (var k in data) {
+            if (data.hasOwnProperty(k)) {
+                params.push(encodeURIComponent(k) + '=' + encodeURIComponent(data[k]));
+            }
+        }
+        var newLoc = '?src=' + ref + ';action=' + action + ';' + params.join(';');
+        window.location = newLoc;
+    }
+
+    function requestRefresh(e) {
+      jax("refresh", null);
+    }
+    
+    function handleRefresh(processTable) {
+      $('#processTable').html(processTable);
+      initProcessTableButtons();
+    }
+    
+    function requestKill(e) {
+      var button = $(e.currentTarget);
+      jax("kill", {name: button.data("process-name")});
+    }
+    
+    function requestEnable(e) {
+      var button = $(e.currentTarget);
+      jax("enable", {name: button.data("process-name")});
+    }    
+    
+    function requestDisable(e) {
+      var button = $(e.currentTarget);
+      jax("disable", {name: button.data("process-name")});
+    }    
+    
+    function initProcessTableButtons() {
+      $(".kill-btn").on("click", requestKill);
+      $(".enable-btn").on("click", requestEnable);
+      $(".disable-btn").on("click", requestDisable);
+    }
+    
+    window.setRef = setRef;
+    window.handleRefresh = handleRefresh;
+    
+    $(function() {
+      initProcessTableButtons();
+      $('#btn-refresh').on("click", requestRefresh);
+    });
+}(jQuery));

code/controllers/ProcessScheduler/test/processSchedulerView.dm

@@ -0,0 +1,94 @@
+/datum/processSchedulerView
+
+/datum/processSchedulerView/Topic(href, href_list)
+	if (!href_list["action"])
+		return
+
+	switch (href_list["action"])
+		if ("kill")
+			var/toKill = href_list["name"]
+			processScheduler.killProcess(toKill)
+			refreshProcessTable()
+		if ("enable")
+			var/toEnable = href_list["name"]
+			processScheduler.enableProcess(toEnable)
+			refreshProcessTable()
+		if ("disable")
+			var/toDisable = href_list["name"]
+			processScheduler.disableProcess(toDisable)
+			refreshProcessTable()
+		if ("refresh")
+			refreshProcessTable()
+
+/datum/processSchedulerView/proc/refreshProcessTable()
+	windowCall("handleRefresh", getProcessTable())
+
+/datum/processSchedulerView/proc/windowCall(var/function, var/data = null)
+	usr << output(data, "processSchedulerContext.browser:[function]")
+
+/datum/processSchedulerView/proc/getProcessTable()
+	var/text = "<table class=\"table table-striped\"><thead><tr><td>Name</td><td>Avg(s)</td><td>Last(s)</td><td>Highest(s)</td><td>Tickcount</td><td>Tickrate</td><td>State</td><td>Action</td></tr></thead><tbody>"
+	// and the context of each
+	for (var/list/data in processScheduler.getStatusData())
+		text += "<tr>"
+		text += "<td>[data["name"]]</td>"
+		text += "<td>[num2text(data["averageRunTime"]/10,3)]</td>"
+		text += "<td>[num2text(data["lastRunTime"]/10,3)]</td>"
+		text += "<td>[num2text(data["highestRunTime"]/10,3)]</td>"
+		text += "<td>[num2text(data["ticks"],4)]</td>"
+		text += "<td>[data["schedule"]]</td>"
+		text += "<td>[data["status"]]</td>"
+		text += "<td><button class=\"btn kill-btn\" data-process-name=\"[data["name"]]\" id=\"kill-[data["name"]]\">Kill</button>"
+		if (data["disabled"])
+			text += "<button class=\"btn enable-btn\" data-process-name=\"[data["name"]]\" id=\"enable-[data["name"]]\">Enable</button>"
+		else
+			text += "<button class=\"btn disable-btn\" data-process-name=\"[data["name"]]\" id=\"disable-[data["name"]]\">Disable</button>"
+		text += "</td>"
+		text += "</tr>"
+
+	text += "</tbody></table>"
+	return text
+
+/**
+ * getContext
+ * Outputs an interface showing stats for all processes.
+ */
+/datum/processSchedulerView/proc/getContext()
+	bootstrap_browse()
+	usr << browse('processScheduler.js', "file=processScheduler.js;display=0")
+
+	var/text = {"<html><head>
+	<title>Process Scheduler Detail</title>
+	<script type="text/javascript">var ref = '\ref[src]';</script>
+	[bootstrap_includes()]
+	<script type="text/javascript" src="processScheduler.js"></script>
+	</head>
+	<body>
+	<h2>Process Scheduler</h2>
+	<div class="btn-group">
+	<button id="btn-refresh" class="btn">Refresh</button>
+	</div>
+
+	<h3>The process scheduler controls [processScheduler.getProcessCount()] loops.<h3>"}
+
+	text += "<div id=\"processTable\">"
+	text += getProcessTable()
+	text += "</div></body></html>"
+
+	usr << browse(text, "window=processSchedulerContext;size=800x600")
+
+/datum/processSchedulerView/proc/bootstrap_browse()
+	usr << browse('bower_components/jquery/dist/jquery.min.js', "file=jquery.min.js;display=0")
+	usr << browse('bower_components/bootstrap2.3.2/bootstrap/js/bootstrap.min.js', "file=bootstrap.min.js;display=0")
+	usr << browse('bower_components/bootstrap2.3.2/bootstrap/css/bootstrap.min.css', "file=bootstrap.min.css;display=0")
+	usr << browse('bower_components/bootstrap2.3.2/bootstrap/img/glyphicons-halflings-white.png', "file=glyphicons-halflings-white.png;display=0")
+	usr << browse('bower_components/bootstrap2.3.2/bootstrap/img/glyphicons-halflings.png', "file=glyphicons-halflings.png;display=0")
+	usr << browse('bower_components/json2/json2.js', "file=json2.js;display=0")
+
+/datum/processSchedulerView/proc/bootstrap_includes()
+	return {"
+	<link rel="stylesheet" href="bootstrap.min.css" />
+	<script type="text/javascript" src="json2.js"></script>
+	<script type="text/javascript" src="jquery.min.js"></script>
+	<script type="text/javascript" src="bootstrap.js"></script>
+	"}

code/controllers/ProcessScheduler/test/testDyingUpdateQueueProcess.dm

@@ -0,0 +1,27 @@
+/** 
+ * testDyingUpdateQueueProcess
+ * This process is an example of a process using an updateQueue.
+ * The datums updated by this process behave badly and block the update loop
+ * by sleeping. If you #define UPDATE_QUEUE_DEBUG, you will see the updateQueue
+ * killing off its worker processes and spawning new ones to work around slow 
+ * updates. This means that if you have a code path that sleeps for a long time
+ * in mob.Life once in a blue moon, the mob update loop will not hang.
+ */
+/datum/slowTestDatum/proc/wackyUpdateProcessName()
+	sleep(rand(0,20)) // Randomly REALLY slow :|
+	
+/datum/controller/process/testDyingUpdateQueueProcess
+	var/tmp/datum/updateQueue/updateQueueInstance
+	var/tmp/list/testDatums = list()
+	
+/datum/controller/process/testDyingUpdateQueueProcess/setup()
+	name = "Dying UpdateQueue Process"
+	schedule_interval = 30 // every 3 seconds
+	updateQueueInstance = new
+	for(var/i = 1, i < 30, i++)
+		testDatums.Add(new /datum/slowTestDatum)
+	
+/datum/controller/process/testDyingUpdateQueueProcess/doWork()
+	updateQueueInstance.init(testDatums, "wackyUpdateProcessName")
+	updateQueueInstance.Run()
+	

code/controllers/ProcessScheduler/test/testHarness.dm

@@ -0,0 +1,35 @@
+/*
+	These are simple defaults for your project.
+ */
+#define DEBUG
+
+var/global/datum/processSchedulerView/processSchedulerView
+
+world
+	loop_checks = 0
+	New()
+		..()
+		processScheduler = new
+		processSchedulerView = new
+
+mob
+	step_size = 8
+
+	New()
+		..()
+
+
+	verb
+		startProcessScheduler()
+			set name = "Start Process Scheduler"
+			processScheduler.setup()
+			processScheduler.start()
+
+		getProcessSchedulerContext()
+			set name = "Get Process Scheduler Status Panel"
+			processSchedulerView.getContext()
+
+		runUpdateQueueTests()
+			set name = "Run Update Queue Testsuite"
+			var/datum/updateQueueTests/t = new
+			t.runTests()

code/controllers/ProcessScheduler/test/testHungProcess.dm

@@ -0,0 +1,15 @@
+/**
+ * testHungProcess
+ * This process is an example of a simple update loop process that hangs.
+ */
+
+/datum/controller/process/testHungProcess/setup()
+	name = "Hung Process"
+	schedule_interval = 30 // every 3 seconds
+
+/datum/controller/process/testHungProcess/doWork()
+	sleep(1000) // FUCK
+	// scheck is also responsible for handling hung processes. If a process
+	// hangs, and later resumes, but has already been killed by the scheduler,
+	// scheck will force the process to bail out.
+	scheck()

code/controllers/ProcessScheduler/test/testNiceProcess.dm

@@ -0,0 +1,13 @@
+/** 
+ * testNiceProcess
+ * This process is an example of a simple update loop process that is
+ * relatively fast.
+ */
+
+/datum/controller/process/testNiceProcess/setup()
+	name = "Nice Process"
+	schedule_interval = 10 // every second
+	
+/datum/controller/process/testNiceProcess/doWork()
+	sleep(rand(1,5)) // Just to pretend we're doing something
+	

code/controllers/ProcessScheduler/test/testSlowProcess.dm

@@ -0,0 +1,28 @@
+/** 
+ * testSlowProcess
+ * This process is an example of a simple update loop process that is slow.
+ * The update loop here sleeps inside to provide an example, but if you had
+ * a computationally intensive loop process that is simply slow, you can use
+ * scheck() inside the loop to force it to yield periodically according to
+ * the sleep_interval var. By default, scheck will cause a loop to sleep every
+ * 2 ticks.
+ */
+ 
+/datum/controller/process/testSlowProcess/setup()
+	name = "Slow Process"
+	schedule_interval = 30 // every 3 seconds
+	
+/datum/controller/process/testSlowProcess/doWork()
+	// set background = 1 will cause loop constructs to sleep periodically,
+	// whenever the BYOND scheduler deems it productive to do so.
+	// This behavior is not always sufficient, nor is it always consistent.
+	// Rather than leaving it up to the BYOND scheduler, we can control it
+	// ourselves and leave nothing to the black box.
+	set background = 1
+	
+	for(var/i=1,i<30,i++)
+		// Just to pretend we're doing something here
+		sleep(rand(3, 5))
+	
+		// Forces this loop to yield(sleep) periodically.
+		scheck()

code/controllers/ProcessScheduler/test/testUpdateQueue.dm

@@ -0,0 +1,209 @@
+var/global/list/updateQueueTestCount = list()
+
+/datum/updateQueueTests
+	var/start
+	proc
+		runTests()
+			world << "<b>Running 9 tests...</b>"
+			testUpdateQueuePerformance()
+			sleep(1)
+			testInplace()
+			sleep(1)
+			testInplaceUpdateQueuePerformance()
+			sleep(1)
+			testUpdateQueueReinit()
+			sleep(1)
+			testCrashingQueue()
+			sleep(1)
+			testEmptyQueue()
+			sleep(1)
+			testManySlowItemsInQueue()
+			sleep(1)
+			testVariableWorkerTimeout()
+			sleep(1)
+			testReallySlowItemInQueue()
+			sleep(1)
+			world << "<b>Finished!</b>"
+		
+		beginTiming()
+			start = world.time
+			
+		endTiming(text)
+			var/time = (world.time - start) / world.tick_lag
+			world << {"<b><font color="blue">Performance - [text] - <font color="green">[time]</font> ticks</font></b>"}
+		
+		getCount()
+			return updateQueueTestCount[updateQueueTestCount.len]
+		
+		incrementTestCount()
+			updateQueueTestCount.len++
+			updateQueueTestCount[updateQueueTestCount.len] = 0
+		
+		assertCountEquals(count, text)
+			assertThat(getCount() == count, text)
+		
+		assertCountLessThan(count, text)
+			assertThat(getCount() < count, text)
+		
+		assertCountGreaterThan(count, text)
+			assertThat(getCount() > count, text)
+		
+		assertThat(condition, text)
+			if (condition)
+				world << {"<font color="green"><b>PASS</b></font>: [text]"}
+			else
+				world << {"<b><font color="red">FAIL</font>: [text]</b>"}
+			
+		testUpdateQueuePerformance()
+			incrementTestCount()
+			var/list/objs = new
+			for(var/i=1,i<=100000,i++)
+				objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
+			
+			var/datum/updateQueue/uq = new(objs)
+			
+			beginTiming()
+			uq.Run()
+			endTiming("updating 100000 simple objects")
+			
+			assertCountEquals(100000, "test that update queue updates all objects expected")
+			del(objs)
+			del(uq)
+
+		testUpdateQueueReinit()
+			incrementTestCount()
+			var/list/objs = new
+			for(var/i=1,i<=100,i++)
+				objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
+
+			var/datum/updateQueue/uq = new(objs)
+			uq.Run()
+			objs = new
+
+			for(var/i=1,i<=100,i++)
+				objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
+			uq.init(objs)
+			uq.Run()
+			assertCountEquals(200, "test that update queue reinitializes properly and updates all objects as expected.")
+			del(objs)
+			del(uq)
+
+		testInplace()
+			incrementTestCount()
+			var/list/objs = new
+			for(var/i=1,i<=100,i++)
+				objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
+			var/datum/updateQueue/uq = new(objects = objs, inplace = 1)
+			uq.Run()
+			assertThat(objs.len == 0, "test that update queue inplace option really works inplace")
+			assertCountEquals(100, "test that inplace update queue updates the right number of objects")
+			del(objs)
+			del(uq)
+					
+		testInplaceUpdateQueuePerformance()
+			incrementTestCount()
+			var/list/objs = new
+			for(var/i=1,i<=100000,i++)
+				objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
+			
+			var/datum/updateQueue/uq = new(objs)
+			
+			beginTiming()
+			uq.Run()
+			endTiming("updating 100000 simple objects in place")
+			del(objs)
+			del(uq)
+
+		testCrashingQueue()
+			incrementTestCount()
+			var/list/objs = new
+			for(var/i=1,i<=10,i++)
+				objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
+			objs.Add(new /datum/uqTestDatum/crasher(updateQueueTestCount.len))
+			for(var/i=1,i<=10,i++)
+				objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
+			
+			var/datum/updateQueue/uq = new(objs)
+			uq.Run()
+			assertCountEquals(20, "test that update queue handles crashed update procs OK")
+			del(objs)
+			del(uq)
+
+		testEmptyQueue()
+			incrementTestCount()
+			var/list/objs = new
+			var/datum/updateQueue/uq = new(objs)
+			uq.Run()
+			assertCountEquals(0, "test that update queue doesn't barf on empty lists")
+			del(objs)
+			del(uq)
+
+		testManySlowItemsInQueue()
+			incrementTestCount()
+			var/list/objs = new
+			for(var/i=1,i<=30,i++)
+				objs.Add(new /datum/uqTestDatum/slow(updateQueueTestCount.len))
+			var/datum/updateQueue/uq = new(objs)
+			uq.Run()
+			assertCountEquals(30, "test that update queue slows down execution if too many objects are slow to update")
+			del(objs)
+			del(uq)
+			
+		testVariableWorkerTimeout()			
+			incrementTestCount()
+			var/list/objs = new
+			for(var/i=1,i<=20,i++)
+				objs.Add(new /datum/uqTestDatum/slow(updateQueueTestCount.len))
+			var/datum/updateQueue/uq = new(objs, workerTimeout=6)
+			uq.Run()
+			assertCountEquals(20, "test that variable worker timeout works properly")			
+			del(objs)
+			del(uq)
+
+		testReallySlowItemInQueue()
+			incrementTestCount()
+			var/list/objs = new
+			for(var/i=1,i<=10,i++)
+				objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
+			objs.Add(new /datum/uqTestDatum/reallySlow(updateQueueTestCount.len))
+			for(var/i=1,i<=10,i++)
+				objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
+			var/datum/updateQueue/uq = new(objs)
+			uq.Run()
+			assertCountEquals(20, "test that update queue skips objects that are too slow to update")
+			del(objs)
+			del(uq)
+
+
+
+datum/uqTestDatum
+	var/testNum
+	New(testNum)
+		..()
+		src.testNum = testNum
+	proc/update()
+		updateQueueTestCount[testNum]++
+	proc/lag(cycles)
+		set background = 1
+		for(var/i=0,i<cycles,)
+			i++
+datum/uqTestDatum/fast
+
+datum/uqTestDatum/slow
+	update()
+		set background = 1
+		var/start = world.timeofday
+		while(world.timeofday - start < 5) // lag 4 deciseconds
+		..()
+		
+datum/uqTestDatum/reallySlow
+	update()
+		set background = 1
+		var/start = world.timeofday
+		while(world.timeofday - start < 300) // lag 30 seconds
+		..()
+
+datum/uqTestDatum/crasher
+	update()
+		CRASH("I crashed! (I am supposed to crash XD)")
+		..() // This should do nothing lol

code/controllers/ProcessScheduler/test/testUpdateQueueProcess.dm

@@ -0,0 +1,24 @@
+/** 
+ * testUpdateQueueProcess
+ * This process is an example of a process using an updateQueue.
+ * The datums updated by this process behave nicely and do not block.
+ */
+
+/datum/fastTestDatum/proc/wackyUpdateProcessName()
+	sleep(prob(10)) // Pretty quick, usually instant
+	
+/datum/controller/process/testUpdateQueueProcess
+	var/tmp/datum/updateQueue/updateQueueInstance
+	var/tmp/list/testDatums = list()
+	
+/datum/controller/process/testUpdateQueueProcess/setup()
+	name = "UpdateQueue Process"
+	schedule_interval = 20 // every 2 seconds
+	updateQueueInstance = new
+	for(var/i = 1, i < 30, i++)
+		testDatums.Add(new /datum/fastTestDatum)
+	
+/datum/controller/process/testUpdateQueueProcess/doWork()
+	updateQueueInstance.init(testDatums, "wackyUpdateProcessName")
+	updateQueueInstance.Run()
+	

code/controllers/ProcessScheduler/test/testZombieProcess.dm

@@ -0,0 +1,13 @@
+/**
+ * testBadZombieProcess
+ * This process is an example of a simple update loop process that hangs.
+ */
+
+/datum/controller/process/testZombieProcess/setup()
+	name = "Zombie Process"
+	schedule_interval = 30 // every 3 seconds
+
+/datum/controller/process/testZombieProcess/doWork()
+	for (var/i = 0, i < 1000, i++)
+		sleep(1)
+		scheck()

code/controllers/Processes/air.dm

@@ -0,0 +1,22 @@
+/datum/controller/process/air/setup()
+	name = "air"
+	schedule_interval = 20 // every 2 seconds
+
+	if(!air_master)
+		air_master = new
+		air_master.Setup()
+
+/datum/controller/process/air/doWork()
+	if(!air_processing_killed)
+		if(!air_master.Tick()) //Runtimed.
+			air_master.failed_ticks++
+
+			if(air_master.failed_ticks > 5)
+				world << "<SPAN CLASS='danger'>RUNTIMES IN ATMOS TICKER.  Killing air simulation!</SPAN>"
+				world.log << "### ZAS SHUTDOWN"
+
+				message_admins("ZASALERT: Shutting down! status: [air_master.tick_progress]")
+				log_admin("ZASALERT: Shutting down! status: [air_master.tick_progress]")
+
+				air_processing_killed = TRUE
+				air_master.failed_ticks = 0

code/controllers/Processes/bot.dm

@@ -0,0 +1,20 @@
+/datum/controller/process/bot
+	var/tmp/datum/updateQueue/updateQueueInstance
+
+/datum/controller/process/bot/setup()
+	name = "bot"
+	schedule_interval = 20 // every 2 seconds
+	updateQueueInstance = new
+
+/datum/controller/process/bot/started()
+	..()
+	if(!updateQueueInstance)
+		if(!aibots)
+			aibots = list()
+		else if(aibots.len)
+			updateQueueInstance = new
+
+/datum/controller/process/bot/doWork()
+	if(updateQueueInstance)
+		updateQueueInstance.init(aibots, "bot_process")
+		updateQueueInstance.Run()

code/controllers/Processes/disease.dm

@@ -0,0 +1,11 @@
+/datum/controller/process/disease
+	var/tmp/datum/updateQueue/updateQueueInstance
+
+/datum/controller/process/disease/setup()
+	name = "disease"
+	schedule_interval = 20 // every 2 seconds
+	updateQueueInstance = new
+
+/datum/controller/process/disease/doWork()
+	updateQueueInstance.init(active_diseases, "process")
+	updateQueueInstance.Run()

code/controllers/Processes/emergencyShuttle.dm

@@ -0,0 +1,9 @@
+/datum/controller/process/emergencyShuttle/setup()
+	name = "emergency shuttle"
+	schedule_interval = 20 // every 2 seconds
+
+	if(!emergency_shuttle)
+		emergency_shuttle = new
+
+/datum/controller/process/emergencyShuttle/doWork()
+	emergency_shuttle.process()

code/controllers/Processes/event.dm

@@ -0,0 +1,6 @@
+/datum/controller/process/event/setup()
+	name = "event"
+	schedule_interval = 20 // every 2 seconds
+
+/datum/controller/process/event/doWork()
+	event_manager.process()

code/controllers/Processes/garbage.dm

@@ -0,0 +1,10 @@
+/datum/controller/process/garbage/setup()
+	name = "garbage"
+	schedule_interval = 20 // every 2 seconds
+
+	if(!garbageCollector)
+		garbageCollector = new
+
+/datum/controller/process/garbage/doWork()
+	garbageCollector.process()
+	scheck()

code/controllers/Processes/inactivity.dm

@@ -0,0 +1,16 @@
+/*/datum/controller/process/inactivity/setup()
+	name = "inactivity"
+	schedule_interval = INACTIVITY_KICK
+
+/datum/controller/process/inactivity/doWork()
+	if(config.kick_inactive)
+		for(var/client/C in clients)
+			if(C.is_afk(INACTIVITY_KICK))
+				if(!istype(C.mob, /mob/dead))
+					log_access("AFK: [key_name(C)]")
+					C << "<SPAN CLASS='warning'>You have been inactive for more than 10 minutes and have been disconnected.</SPAN>"
+					del(C)
+
+			scheck()
+
+#undef INACTIVITY_KICK*/

code/controllers/Processes/lighting.dm

@@ -0,0 +1,26 @@
+/datum/controller/process/lighting/setup()
+	name = "lighting"
+	schedule_interval = 5 // every .5 second
+	lighting_controller.Initialize()
+
+/datum/controller/process/lighting/doWork()
+	lighting_controller.lights_workload_max = \
+		max(lighting_controller.lights_workload_max, lighting_controller.lights.len)
+
+	for(var/datum/light_source/L in lighting_controller.lights)
+		if(L && L.check())
+			lighting_controller.lights.Remove(L)
+
+		scheck()
+
+	lighting_controller.changed_turfs_workload_max = \
+		max(lighting_controller.changed_turfs_workload_max, lighting_controller.changed_turfs.len)
+
+	for(var/turf/T in lighting_controller.changed_turfs)
+		if(T && T.lighting_changed)
+			T.shift_to_subarea()
+
+		scheck()
+
+	if(lighting_controller.changed_turfs && lighting_controller.changed_turfs.len)
+		lighting_controller.changed_turfs.len = 0 // reset the changed list

code/controllers/Processes/machinery.dm

@@ -0,0 +1,34 @@
+/datum/controller/process/machinery/setup()
+	name = "machinery"
+	schedule_interval = 20 // every 2 seconds
+
+/datum/controller/process/machinery/doWork()
+	//#ifdef PROFILE_MACHINES
+	//machine_profiling.len = 0
+	//#endif
+
+	for(var/obj/machinery/M in machines)
+		if(M && !M.gcDestroyed)
+			#ifdef PROFILE_MACHINES
+			var/time_start = world.timeofday
+			#endif
+
+			if(M.process() == PROCESS_KILL)
+				//M.inMachineList = 0 We don't use this debugging function
+				machines.Remove(M)
+				continue
+
+			if(M && M.use_power)
+				M.auto_use_power()
+
+			#ifdef PROFILE_MACHINES
+			var/time_end = world.timeofday
+
+			if(!(M.type in machine_profiling))
+				machine_profiling[M.type] = 0
+
+			machine_profiling[M.type] += (time_end - time_start)
+			#endif
+
+		scheck()
+

code/controllers/Processes/mob.dm

@@ -0,0 +1,20 @@
+/datum/controller/process/mob
+	var/tmp/datum/updateQueue/updateQueueInstance
+
+/datum/controller/process/mob/setup()
+	name = "mob"
+	schedule_interval = 20 // every 2 seconds
+	updateQueueInstance = new
+
+/datum/controller/process/mob/started()
+	..()
+	if(!updateQueueInstance)
+		if(!mob_list)
+			mob_list = list()
+		else if(mob_list.len)
+			updateQueueInstance = new
+
+/datum/controller/process/mob/doWork()
+	if(updateQueueInstance)
+		updateQueueInstance.init(mob_list, "Life")
+		updateQueueInstance.Run()

code/controllers/Processes/nanoui.dm

@@ -0,0 +1,11 @@
+/datum/controller/process/nanoui
+	var/tmp/datum/updateQueue/updateQueueInstance
+
+/datum/controller/process/nanoui/setup()
+	name = "nanoui"
+	schedule_interval = 20 // every 2 seconds
+	updateQueueInstance = new
+
+/datum/controller/process/nanoui/doWork()
+	updateQueueInstance.init(nanomanager.processing_uis, "process")
+	updateQueueInstance.Run()

code/controllers/Processes/obj.dm

@@ -0,0 +1,21 @@
+var/global/list/object_profiling = list()
+/datum/controller/process/obj
+	var/tmp/datum/updateQueue/updateQueueInstance
+
+/datum/controller/process/obj/setup()
+	name = "obj"
+	schedule_interval = 20 // every 2 seconds
+	updateQueueInstance = new
+
+/datum/controller/process/obj/started()
+	..()
+	if(!updateQueueInstance)
+		if(!processing_objects)
+			processing_objects = list()
+		else if(processing_objects.len)
+			updateQueueInstance = new
+
+/datum/controller/process/obj/doWork()
+	if(updateQueueInstance)
+		updateQueueInstance.init(processing_objects, "process")
+		updateQueueInstance.Run()

code/controllers/Processes/pipenet.dm

@@ -0,0 +1,12 @@
+/datum/controller/process/pipenet/setup()
+	name = "pipenet"
+	schedule_interval = 20 // every 2 seconds
+
+/datum/controller/process/pipenet/doWork()
+	for(var/datum/pipe_network/pipeNetwork in pipe_networks)
+		if(istype(pipeNetwork) && !pipeNetwork.disposed)
+			pipeNetwork.process()
+			scheck()
+			continue
+
+		pipe_networks.Remove(pipeNetwork)

code/controllers/Processes/power_machinery.dm

@@ -0,0 +1,45 @@
+var/global/list/power_machinery_profiling = list()
+
+/datum/controller/process/power_machinery
+	var/tmp/datum/updateQueue/updateQueueInstance
+
+/datum/controller/process/power_machinery/setup()
+	name = "pow_machine"
+	schedule_interval = 20 // every 2 seconds
+
+/datum/controller/process/power_machinery/doWork()
+	for(var/i = 1 to power_machines.len)
+		if(i > power_machines.len)
+			break
+		var/obj/machinery/M = power_machines[i]
+		if(istype(M) && !M.gcDestroyed)
+			#ifdef PROFILE_MACHINES
+			var/time_start = world.timeofday
+			#endif
+
+			if(M.process() == PROCESS_KILL)
+				M.inMachineList = 0
+				power_machines.Remove(M)
+				continue
+
+			if(M && M.use_power)
+				M.auto_use_power()
+			if(istype(M))
+				#ifdef PROFILE_MACHINES
+				var/time_end = world.timeofday
+
+				if(!(M.type in power_machinery_profiling))
+					power_machinery_profiling[M.type] = 0
+
+				power_machinery_profiling[M.type] += (time_end - time_start)
+				#endif
+			else
+				if(!power_machines.Remove(M))
+					power_machines.Cut(i,i+1)
+		else
+			if(M)
+				M.inMachineList = 0
+			if(!power_machines.Remove(M))
+				power_machines.Cut(i,i+1)
+
+		scheck()

code/controllers/Processes/powernet.dm

@@ -0,0 +1,12 @@
+/datum/controller/process/powernet/setup()
+	name = "powernet"
+	schedule_interval = 20 // every 2 seconds
+
+/datum/controller/process/powernet/doWork()
+	for(var/datum/powernet/powerNetwork in powernets)
+		if(istype(powerNetwork) && !powerNetwork.disposed)
+			powerNetwork.reset()
+			scheck()
+			continue
+
+		powernets.Remove(powerNetwork)

code/controllers/Processes/shuttle.dm

@@ -0,0 +1,9 @@
+/datum/controller/process/Shuttle/setup()
+	name = "shuttle controller"
+	schedule_interval = 20 // every 2 seconds
+
+	if(!shuttle_controller)
+		shuttle_controller = new
+
+/datum/controller/process/Shuttle/doWork()
+	shuttle_controller.process()

code/controllers/Processes/sun.dm

@@ -0,0 +1,7 @@
+/datum/controller/process/sun/setup()
+	name = "sun"
+	schedule_interval = 20 // every second
+	sun = new
+
+/datum/controller/process/sun/doWork()
+	sun.calc_position()

code/controllers/Processes/supply.dm

@@ -0,0 +1,6 @@
+/datum/controller/process/supply/setup()
+	name = "supply controller"
+	schedule_interval = 300 // every 30 seconds
+
+/datum/controller/process/supply/doWork()
+	supply_controller.process()

code/controllers/Processes/ticker.dm

@@ -0,0 +1,35 @@
+var/global/datum/controller/process/ticker/tickerProcess
+
+/datum/controller/process/ticker
+	var/lastTickerTimeDuration
+	var/lastTickerTime
+
+/datum/controller/process/ticker/setup()
+	name = "ticker"
+	schedule_interval = 20 // every 2 seconds
+
+	lastTickerTime = world.timeofday
+
+	if(!ticker)
+		ticker = new
+
+	tickerProcess = src
+
+	spawn(0)
+		if(ticker)
+			ticker.pregame()
+
+/datum/controller/process/ticker/doWork()
+	var/currentTime = world.timeofday
+
+	if(currentTime < lastTickerTime) // check for midnight rollover
+		lastTickerTimeDuration = (currentTime - (lastTickerTime - TICKS_IN_DAY)) / TICKS_IN_SECOND
+	else
+		lastTickerTimeDuration = (currentTime - lastTickerTime) / TICKS_IN_SECOND
+
+	lastTickerTime = currentTime
+
+	ticker.process()
+
+/datum/controller/process/ticker/proc/getLastTickerTimeDuration()
+	return lastTickerTimeDuration

code/controllers/Processes/vote.dm

@@ -0,0 +1,6 @@
+/datum/controller/process/vote/setup()
+	name = "vote"
+	schedule_interval = 10 // every second
+
+/datum/controller/process/vote/doWork()
+	vote.process()

code/controllers/_DynamicAreaLighting_TG.dm

@@ -94,7 +94,7 @@ datum/light_source
 		if(owner.loc && owner.luminosity > 0)
 			readrgb(owner.l_color)
 			effect = list()
-			for(var/turf/T in view(owner.get_light_range(),owner))
+			for(var/turf/T in view(owner.get_light_range(),get_turf(owner)))
 				var/delta_lumen = lum(T)
 				if(delta_lumen > 0)
 					effect[T] = delta_lumen
@@ -160,14 +160,6 @@ atom/movable/New()
 		trueLuminosity = luminosity * luminosity
 		light = new(src)
 
-//Objects with opacity will trigger nearby lights to update at next lighting process.
-atom/movable/Destroy()
-	if(opacity)
-		if(isturf(loc))
-			if(loc:lighting_lumcount > 1)
-				UpdateAffectingLights()
-
-	..()
 
 //Sets our luminosity.
 //If we have no light it will create one.

code/controllers/communications.dm

@@ -40,7 +40,7 @@
 
   obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param)
     Handler from received signals. By default does nothing. Define your own for your object.
-    Avoid of sending signals directly from this proc, use spawn(-1). Do not use sleep() here please.
+    Avoid of sending signals directly from this proc, use spawn(-1). DO NOT use sleep() here or call procs that sleep please. If you must, use spawn()
       parameters:
         signal - see description below. Extract all needed data from the signal before doing sleep(), spawn() or return!
         receive_method - may be TRANSMISSION_WIRE or TRANSMISSION_RADIO.
@@ -61,33 +61,6 @@
 
 */
 
-/*	the radio controller is a confusing piece of shit and didnt work
-	so i made radios not use the radio controller.
-*/
-var/list/all_radios = list()
-
-/proc/add_radio(var/obj/item/radio, freq)
-	if(!freq || !radio)
-		return
-	if(!all_radios["[freq]"])
-		all_radios["[freq]"] = list(radio)
-		return freq
-
-	all_radios["[freq]"] |= radio
-	return freq
-
-/proc/remove_radio(var/obj/item/radio, freq)
-	if(!freq || !radio)
-		return
-	if(!all_radios["[freq]"])
-		return
-
-	all_radios["[freq]"] -= radio
-
-/proc/remove_radio_all(var/obj/item/radio)
-	for(var/freq in all_radios)
-		all_radios["[freq]"] -= radio
-
 /*
 Frequency range: 1200 to 1600
 Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency, even during mapmaking)
@@ -99,10 +72,10 @@ Radio:
 1355 - Medical
 1357 - Engineering
 1359 - Security
-1441 - death squad
+1341 - death squad
 1443 - Confession Intercom
 1347 - Cargo techs
-1349 - Service
+1349 - Service people
 
 Devices:
 1451 - tracking implant
@@ -112,7 +85,7 @@ On the map:
 1311 for prison shuttle console (in fact, it is not used)
 1435 for status displays
 1437 for atmospherics/fire alerts
-1439 for engine components
+1438 for engine components
 1439 for air pumps, air scrubbers, atmo control
 1441 for atmospherics - supply tanks
 1443 for atmospherics - distribution loop/mixed air tank
@@ -124,30 +97,14 @@ On the map:
 1455 for AI access
 */
 
-var/list/radiochannels = list(
-	"Common" = 1459,
-	"Science" = 1351,
-	"Command" = 1353,
-	"Medical" = 1355,
-	"Engineering" = 1357,
-	"Security" = 1359,
-	"Response Team" = 1443,
-	"Deathsquad" = 1441,
-	"Syndicate" = 1213,
-	"Supply" = 1347,
-	"Service" = 1349,
-	"AI Private" = 1447
-)
-//depenging helpers
-var/list/DEPT_FREQS = list(1351, 1355, 1357, 1359, 1213, 1443, 1441, 1347, 1349)
-
-// central command channels, i.e deathsquid & response teams
-var/list/CENT_FREQS = list(1441, 1443)
-
-var/const/COMM_FREQ = 1353 //command, colored gold in chat window
+var/const/COMM_FREQ = 1353
 var/const/SYND_FREQ = 1213
+var/const/ERT_FREQ = 1345
+var/const/DTH_FREQ = 1341
+var/const/AI_FREQ = 1447
 
 // department channels
+var/const/PUB_FREQ = 1459
 var/const/SEC_FREQ = 1359
 var/const/ENG_FREQ = 1357
 var/const/SCI_FREQ = 1351
@@ -155,25 +112,85 @@ var/const/MED_FREQ = 1355
 var/const/SUP_FREQ = 1347
 var/const/SRV_FREQ = 1349
 
-// other channels
-var/const/AIPRIV_FREQ = 1447
+var/list/radiochannels = list(
+	"Common"		= PUB_FREQ,
+	"Science"		= SCI_FREQ,
+	"Command"		= COMM_FREQ,
+	"Medical"		= MED_FREQ,
+	"Engineering"	= ENG_FREQ,
+	"Security" 		= SEC_FREQ,
+	"Response Team" = ERT_FREQ,
+	"Special Ops" 	= DTH_FREQ,
+	"Syndicate" 	= SYND_FREQ,
+	"Supply" 		= SUP_FREQ,
+	"Service" 		= SRV_FREQ,
+	"AI Private"	= AI_FREQ
+)
+
+// central command channels, i.e deathsquid & response teams
+var/list/CENT_FREQS = list(ERT_FREQ, DTH_FREQ)
+
+// Antag channels, i.e. Syndicate
+var/list/ANTAG_FREQS = list(SYND_FREQ)
+
+//depenging helpers
+var/list/DEPT_FREQS = list(SCI_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SUP_FREQ, SRV_FREQ, ERT_FREQ, SYND_FREQ, DTH_FREQ)
 
 #define TRANSMISSION_WIRE	0
 #define TRANSMISSION_RADIO	1
 
+/proc/frequency_span_class(var/frequency)
+	// Antags!
+	if (frequency in ANTAG_FREQS)
+		return "syndradio"
+	// centcomm channels (deathsquid and ert)
+	else if(frequency in CENT_FREQS)
+		return "centradio"
+	// command channel
+	else if(frequency == COMM_FREQ)
+		return "comradio"
+	// AI private channel
+	else if(frequency == AI_FREQ)
+		return "airadio"
+	// department radio formatting (poorly optimized, ugh)
+	else if(frequency == SEC_FREQ)
+		return "secradio"
+	else if (frequency == ENG_FREQ)
+		return "engradio"
+	else if(frequency == SCI_FREQ)
+		return "sciradio"
+	else if(frequency == MED_FREQ)
+		return "medradio"
+	else if(frequency == SUP_FREQ) // cargo
+		return "supradio"
+	else if(frequency == SRV_FREQ) // service
+		return "srvradio"
+	// If all else fails and it's a dept_freq, color me purple!
+	else if(frequency in DEPT_FREQS)
+		return "deptradio"
+
+	return "radio"
+
 /* filters */
-var/const/RADIO_TO_AIRALARM = "1"
-var/const/RADIO_FROM_AIRALARM = "2"
-var/const/RADIO_CHAT = "3"
-var/const/RADIO_ATMOSIA = "4"
-var/const/RADIO_NAVBEACONS = "5"
-var/const/RADIO_AIRLOCK = "6"
-var/const/RADIO_SECBOT = "7"
-var/const/RADIO_MULEBOT = "8"
-var/const/RADIO_MAGNETS = "9"
+//When devices register with the radio controller, they might register under a certain filter.
+//Other devices can then choose to send signals to only those devices that belong to a particular filter.
+//This is done for performance, so we don't send signals to lots of machines unnecessarily.
+
+//This filter is special because devices belonging to default also recieve signals sent to any other filter.
+var/const/RADIO_DEFAULT = "radio_default"
+
+var/const/RADIO_TO_AIRALARM = "radio_airalarm" //air alarms
+var/const/RADIO_FROM_AIRALARM = "radio_airalarm_rcvr" //devices interested in recieving signals from air alarms
+var/const/RADIO_CHAT = "radio_telecoms"
+var/const/RADIO_ATMOSIA = "radio_atmos"
+var/const/RADIO_NAVBEACONS = "radio_navbeacon"
+var/const/RADIO_AIRLOCK = "radio_airlock"
+var/const/RADIO_SECBOT = "radio_secbot"
+var/const/RADIO_MULEBOT = "radio_mulebot"
 var/const/RADIO_CLEANBOT = "10"
 var/const/RADIO_FLOORBOT = "11"
 var/const/RADIO_MEDBOT = "12"
+var/const/RADIO_MAGNETS = "radio_magnet"
 
 var/global/datum/controller/radio/radio_controller
 
@@ -181,164 +198,138 @@ var/global/datum/controller/radio/radio_controller
 	radio_controller = new /datum/controller/radio()
 	return 1
 
-datum/controller/radio
+//callback used by objects to react to incoming radio signals
+/obj/proc/receive_signal(datum/signal/signal, receive_method, receive_param)
+	return null
+
+//The global radio controller
+/datum/controller/radio
 	var/list/datum/radio_frequency/frequencies = list()
 
-	proc/add_object(obj/device as obj, var/new_frequency as num, var/filter = null as text|null)	
-		var/f_text = num2text(new_frequency)
-		var/datum/radio_frequency/frequency = frequencies[f_text]
+/datum/controller/radio/proc/add_object(obj/device as obj, var/new_frequency as num, var/filter = null as text|null)
+	var/f_text = num2text(new_frequency)
+	var/datum/radio_frequency/frequency = frequencies[f_text]
 
-		if(!frequency)
-			frequency = new
-			frequency.frequency = new_frequency
-			frequencies[f_text] = frequency
+	if(!frequency)
+		frequency = new
+		frequency.frequency = new_frequency
+		frequencies[f_text] = frequency
 
-		frequency.add_listener(device, filter)
-		return frequency
+	frequency.add_listener(device, filter)
+	return frequency
 
-	proc/remove_object(obj/device, old_frequency)
-		var/f_text = num2text(old_frequency)
-		var/datum/radio_frequency/frequency = frequencies[f_text]
+/datum/controller/radio/proc/remove_object(obj/device, old_frequency)
+	var/f_text = num2text(old_frequency)
+	var/datum/radio_frequency/frequency = frequencies[f_text]
 
-		if(frequency)
-			frequency.remove_listener(device)
+	if(frequency)
+		frequency.remove_listener(device)
 
-			if(frequency.devices.len == 0)
-				del(frequency)
-				frequencies -= f_text
+		if(frequency.devices.len == 0)
+			del(frequency)
+			frequencies -= f_text
 
-		return 1
+	return 1
 
-	proc/return_frequency(var/new_frequency as num)
-		var/f_text = num2text(new_frequency)
-		var/datum/radio_frequency/frequency = frequencies[f_text]
+/datum/controller/radio/proc/return_frequency(var/new_frequency as num)
+	var/f_text = num2text(new_frequency)
+	var/datum/radio_frequency/frequency = frequencies[f_text]
 
-		if(!frequency)
-			frequency = new
-			frequency.frequency = new_frequency
-			frequencies[f_text] = frequency
+	if(!frequency)
+		frequency = new
+		frequency.frequency = new_frequency
+		frequencies[f_text] = frequency
 
-		return frequency
+	return frequency
 
-datum/radio_frequency
+/datum/radio_frequency
 	var/frequency as num
 	var/list/list/obj/devices = list()
 
-	proc
-		post_signal(obj/source as obj|null, datum/signal/signal, var/filter = null as text|null, var/range = null as num|null)
-			//log_admin("DEBUG \[[world.timeofday]\]: post_signal {source=\"[source]\", [signal.debug_print()], filter=[filter]}")
-//			var/N_f=0
-//			var/N_nf=0
-//			var/Nt=0
-			var/turf/start_point
-			if(range)
-				start_point = get_turf(source)
-				if(!start_point)
-					del(signal)
-					return 0
-			if (filter) //here goes some copypasta. It is for optimisation. -rastaf0
-				for(var/obj/device in devices[filter])
-					if(device == source)
-						continue
-					if(range)
-						var/turf/end_point = get_turf(device)
-						if(!end_point)
-							continue
-						//if(max(abs(start_point.x-end_point.x), abs(start_point.y-end_point.y)) <= range)
-						if(start_point.z!=end_point.z || get_dist(start_point, end_point) > range)
-							continue
-					device.receive_signal(signal, TRANSMISSION_RADIO, frequency)
-				for(var/obj/device in devices["_default"])
-					if(device == source)
-						continue
-					if(range)
-						var/turf/end_point = get_turf(device)
-						if(!end_point)
-							continue
-						//if(max(abs(start_point.x-end_point.x), abs(start_point.y-end_point.y)) <= range)
-						if(start_point.z!=end_point.z || get_dist(start_point, end_point) > range)
-							continue
-					device.receive_signal(signal, TRANSMISSION_RADIO, frequency)
-//					N_f++
-			else
-				for (var/next_filter in devices)
-//					var/list/obj/DDD = devices[next_filter]
-//					Nt+=DDD.len
-					for(var/obj/device in devices[next_filter])
-						if(device == source)
-							continue
-						if(range)
-							var/turf/end_point = get_turf(device)
-							if(!end_point)
-								continue
-							//if(max(abs(start_point.x-end_point.x), abs(start_point.y-end_point.y)) <= range)
-							if(start_point.z!=end_point.z || get_dist(start_point, end_point) > range)
-								continue
-						device.receive_signal(signal, TRANSMISSION_RADIO, frequency)
-//						N_nf++
+/datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, var/filter = null as text|null, var/range = null as num|null)
+	var/turf/start_point
+	if(range)
+		start_point = get_turf(source)
+		if(!start_point)
+			del(signal)
+			return 0
+	if (filter)
+		send_to_filter(source, signal, filter, start_point, range)
+		send_to_filter(source, signal, RADIO_DEFAULT, start_point, range)
+	else
+		//Broadcast the signal to everyone!
+		for (var/next_filter in devices)
+			send_to_filter(source, signal, next_filter, start_point, range)
 
-//			log_admin("DEBUG: post_signal(source=[source] ([source.x], [source.y], [source.z]),filter=[filter]) frequency=[frequency], N_f=[N_f], N_nf=[N_nf]")
+//Sends a signal to all machines belonging to a given filter. Should be called by post_signal()
+/datum/radio_frequency/proc/send_to_filter(obj/source, datum/signal/signal, var/filter, var/turf/start_point = null, var/range = null)
+	if (range && !start_point)
+		return
 
+	for(var/obj/device in devices[filter])
+		if(device == source)
+			continue
+		if(range)
+			var/turf/end_point = get_turf(device)
+			if(!end_point)
+				continue
+			if(start_point.z!=end_point.z || get_dist(start_point, end_point) > range)
+				continue
 
-//			del(signal)
+		device.receive_signal(signal, TRANSMISSION_RADIO, frequency)
 
-		add_listener(obj/device as obj, var/filter as text|null)
-			if (!filter)
-				filter = "_default"
-			//log_admin("add_listener(device=[device],filter=[filter]) frequency=[frequency]")
-			var/list/obj/devices_line = devices[filter]
-			if (!devices_line)
-				devices_line = new
-				devices[filter] = devices_line
-			devices_line+=device
+/datum/radio_frequency/proc/add_listener(obj/device as obj, var/filter as text|null)
+	if (!filter)
+		filter = RADIO_DEFAULT
+	//log_admin("add_listener(device=[device],filter=[filter]) frequency=[frequency]")
+	var/list/obj/devices_line = devices[filter]
+	if (!devices_line)
+		devices_line = new
+		devices[filter] = devices_line
+	devices_line+=device
 //			var/list/obj/devices_line___ = devices[filter_str]
 //			var/l = devices_line___.len
-			//log_admin("DEBUG: devices_line.len=[devices_line.len]")
-			//log_admin("DEBUG: devices(filter_str).len=[l]")
+	//log_admin("DEBUG: devices_line.len=[devices_line.len]")
+	//log_admin("DEBUG: devices(filter_str).len=[l]")
 
-		remove_listener(obj/device)
-			for (var/devices_filter in devices)
-				var/list/devices_line = devices[devices_filter]
-				devices_line-=device
-				while (null in devices_line)
-					devices_line -= null
-				if (devices_line.len==0)
-					devices -= devices_filter
-					del(devices_line)
+/datum/radio_frequency/proc/remove_listener(obj/device)
+	for (var/devices_filter in devices)
+		var/list/devices_line = devices[devices_filter]
+		devices_line-=device
+		while (null in devices_line)
+			devices_line -= null
+		if (devices_line.len==0)
+			devices -= devices_filter
+			del(devices_line)
 
-
-obj/proc
-	receive_signal(datum/signal/signal, receive_method, receive_param)
-		return null
-
-datum/signal
+/datum/signal
 	var/obj/source
 
-	var/transmission_method = 0
+	var/transmission_method = 0 //unused at the moment
 	//0 = wire
 	//1 = radio transmission
 	//2 = subspace transmission
 
-	var/data = list()
+	var/list/data = list()
 	var/encryption
 
 	var/frequency = 0
 
-	proc/copy_from(datum/signal/model)
-		source = model.source
-		transmission_method = model.transmission_method
-		data = model.data
-		encryption = model.encryption
-		frequency = model.frequency
+/datum/signal/proc/copy_from(datum/signal/model)
+	source = model.source
+	transmission_method = model.transmission_method
+	data = model.data
+	encryption = model.encryption
+	frequency = model.frequency
 
-	proc/debug_print()
-		if (source)
-			. = "signal = {source = '[source]' ([source:x],[source:y],[source:z])\n"
-		else
-			. = "signal = {source = '[source]' ()\n"
-		for (var/i in data)
-			. += "data\[\"[i]\"\] = \"[data[i]]\"\n"
-			if(islist(data[i]))
-				var/list/L = data[i]
-				for(var/t in L)
-					. += "data\[\"[i]\"\] list has: [t]"
+/datum/signal/proc/debug_print()
+	if (source)
+		. = "signal = {source = '[source]' ([source:x],[source:y],[source:z])\n"
+	else
+		. = "signal = {source = '[source]' ()\n"
+	for (var/i in data)
+		. += "data\[\"[i]\"\] = \"[data[i]]\"\n"
+		if(islist(data[i]))
+			var/list/L = data[i]
+			for(var/t in L)
+				. += "data\[\"[i]\"\] list has: [t]"

code/controllers/configuration.dm

@@ -134,7 +134,12 @@
 	var/python_path = "" //Path to the python executable.  Defaults to "python" on windows and "/usr/bin/env python2" on unix
 
 	var/default_laws = 0 //Controls what laws the AI spawns with.
-	
+
+	var/list/station_levels = list(1)				// Defines which Z-levels the station exists on.
+	var/list/admin_levels= list(2)					// Defines which Z-levels which are for admin functionality, for example including such areas as Central Command and the Syndicate Shuttle
+	var/list/contact_levels = list(1, 5)			// Defines which Z-levels which, for example, a Code Red announcement may affect
+	var/list/player_levels = list(1, 3, 4, 5, 6, 7)	// Defines all Z-levels a character can typically reach
+
 	var/const/minutes_to_ticks = 60 * 10
 	// Event settings
 	var/expected_round_length = 60 * 2 * minutes_to_ticks // 2 hours
@@ -163,7 +168,7 @@
 				src.probabilities[M.config_tag] = M.probability
 				if (M.votable)
 					src.votable_modes += M.config_tag
-		del(M)
+		qdel(M)
 	src.votable_modes += "secret"
 
 /datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
@@ -204,9 +209,9 @@
 
 				if ("use_age_restriction_for_jobs")
 					config.use_age_restriction_for_jobs = 1
-					
+
 				if ("use_age_restriction_for_antags")
-					config.use_age_restriction_for_antags = 1					
+					config.use_age_restriction_for_antags = 1
 
 				if ("jobs_have_minimal_access")
 					config.jobs_have_minimal_access = 1
@@ -457,7 +462,19 @@
 
 				if("max_maint_drones")
 					config.max_maint_drones = text2num(value)
-					
+
+				if("station_levels")
+					config.station_levels = text2numlist(value, ";")
+
+				if("admin_levels")
+					config.admin_levels = text2numlist(value, ";")
+
+				if("contact_levels")
+					config.contact_levels = text2numlist(value, ";")
+
+				if("player_levels")
+					config.player_levels = text2numlist(value, ";")
+
 				if("expected_round_length")
 					config.expected_round_length = MinutesToTicks(text2num(value))
 

code/controllers/emergency_shuttle_controller.dm

@@ -18,7 +18,10 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 
 	var/deny_shuttle = 0	//allows admins to prevent the shuttle from being called
 	var/departed = 0		//if the shuttle has left the station at least once
-
+	
+	var/datum/announcement/priority/emergency_shuttle_docked = new(0, new_sound = sound('sound/AI/shuttledock.ogg'))
+	var/datum/announcement/priority/emergency_shuttle_called = new(0, new_sound = sound('sound/AI/shuttlecalled.ogg'))
+	var/datum/announcement/priority/emergency_shuttle_recalled = new(0, new_sound = sound('sound/AI/shuttlerecalled.ogg'))
 
 /datum/emergency_shuttle_controller/proc/process()
 	if (wait_for_launch)
@@ -29,7 +32,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 
 			if (!shuttle.location)	//leaving from the station
 				if(is_stranded())
-					captain_announce("Hostile environment detected. Departure has been postponed indefinitely pending conflict resolution.")
+					priority_announcement.Announce("Hostile environment detected. Departure has been postponed indefinitely pending conflict resolution.")
 					wait_for_launch = 0
 					return			
 				//launch the pods!
@@ -49,10 +52,9 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 			set_launch_countdown(SHUTTLE_LEAVETIME)	//get ready to return
 
 			if (evac)
-				captain_announce("The Emergency Shuttle has docked with the station. You have approximately [round(estimate_launch_time()/60,1)] minutes to board the Emergency Shuttle.")
-				world << sound('sound/AI/shuttledock.ogg')
+				emergency_shuttle_docked.Announce("The Emergency Shuttle has docked with the station. You have approximately [round(estimate_launch_time()/60,1)] minutes to board the Emergency Shuttle.")
 			else
-				captain_announce("The scheduled Crew Transfer Shuttle has docked with the station. It will depart in approximately [round(emergency_shuttle.estimate_launch_time()/60,1)] minutes.")
+				priority_announcement.Announce("The scheduled Crew Transfer Shuttle has docked with the station. It will depart in approximately [round(emergency_shuttle.estimate_launch_time()/60,1)] minutes.")
 
 		//arm the escape pods
 		if (evac)
@@ -81,8 +83,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 	shuttle.move_time = SHUTTLE_TRANSIT_DURATION
 
 	evac = 1
-	captain_announce("An emergency evacuation shuttle has been called. It will arrive in approximately [round(estimate_arrival_time()/60)] minutes.")
-	world << sound('sound/AI/shuttlecalled.ogg')
+	emergency_shuttle_called.Announce("An emergency evacuation shuttle has been called. It will arrive in approximately [round(estimate_arrival_time()/60)] minutes.")
 	for(var/area/A in world)
 		if(istype(A, /area/hallway))
 			A.readyalert()
@@ -101,7 +102,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 	//reset the shuttle transit time if we need to
 	shuttle.move_time = SHUTTLE_TRANSIT_DURATION
 
-	captain_announce("A crew transfer has been scheduled. The shuttle has been called. It will arrive in approximately [round(estimate_arrival_time()/60)] minutes.")
+	priority_announcement.Announce("A crew transfer has been scheduled. The shuttle has been called. It will arrive in approximately [round(estimate_arrival_time()/60)] minutes.")
 
 //recalls the shuttle
 /datum/emergency_shuttle_controller/proc/recall()
@@ -111,15 +112,14 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 	shuttle.cancel_launch(src)
 
 	if (evac)
-		captain_announce("The emergency shuttle has been recalled.")
-		world << sound('sound/AI/shuttlerecalled.ogg')
+		emergency_shuttle_recalled.Announce("The emergency shuttle has been recalled.")
 
 		for(var/area/A in world)
 			if(istype(A, /area/hallway))
 				A.readyreset()
 		evac = 0
 	else
-		captain_announce("The scheduled crew transfer has been cancelled.")
+		priority_announcement.Announce("The scheduled crew transfer has been cancelled.")
 
 /datum/emergency_shuttle_controller/proc/can_call()
 	if (deny_shuttle)

code/controllers/failsafe.dm

@@ -1,68 +1,78 @@
-var/datum/controller/failsafe/Failsafe
+var/global/datum/controller/failsafe/failsafe
 
-/datum/controller/failsafe // This thing pretty much just keeps poking the master controller
-	var/processing = 0
-	var/processing_interval = 100	//poke the MC every 10 seconds
+/datum/controller/failsafe // This thing pretty much just keeps poking the controllers.
+	processing_interval = 100 // Poke the controllers every 10 seconds.
 
-	var/MC_iteration = 0
-	var/MC_defcon = 0			//alert level. For every poke that fails this is raised by 1. When it reaches 5 the MC is replaced with a new one. (effectively killing any master_controller.process() and starting a new one)
+	/*
+	 * Controller alert level.
+	 * For every poke that fails this is raised by 1.
+	 * When it reaches 5 the MC is replaced with a new one
+	 * (effectively killing any controller process() and starting a new one).
+	 */
 
-	var/lighting_iteration = 0
-	var/lighting_defcon = 0		//alert level for lighting controller.
+	// master
+	var/masterControllerIteration = 0
+	var/masterControllerAlertLevel = 0
+
+	// lighting
+	var/lightingControllerIteration = 0
+	var/lightingControllerAlertLevel = 0
 
 /datum/controller/failsafe/New()
-	//There can be only one failsafe. Out with the old in with the new (that way we can restart the Failsafe by spawning a new one)
-	if(Failsafe != src)
-		if(istype(Failsafe))
-			del(Failsafe)
-	Failsafe = src
-	Failsafe.process()
+	. = ..()
 
+	// There can be only one failsafe. Out with the old in with the new (that way we can restart the Failsafe by spawning a new one).
+	if (failsafe != src)
+		if (istype(failsafe))
+			recover()
+			qdel(failsafe)
+
+		failsafe = src
+
+	failsafe.process()
 
 /datum/controller/failsafe/proc/process()
 	processing = 1
+
 	spawn(0)
-		//set background = 1
-		while(1)	//more efficient than recursivly calling ourself over and over. background = 1 ensures we do not trigger an infinite loop
-			if(!master_controller)		new /datum/controller/game_controller()	//replace the missing master_controller! This should never happen.
-			if(!lighting_controller)	new /datum/controller/lighting()		//replace the missing lighting_controller
+		set background = BACKGROUND_ENABLED
+
+		while(1) // More efficient than recursivly calling ourself over and over. background = 1 ensures we do not trigger an infinite loop.
+			iteration++
 
 			if(processing)
-				if(master_controller.processing)	//only poke if these overrides aren't in effect
-					if(MC_iteration == controller_iteration)	//master_controller hasn't finished processing in the defined interval
-						switch(MC_defcon)
+				if(master_controller.processing) // Only poke if these overrides aren't in effect
+					if(masterControllerIteration == master_controller.iteration) // Master controller hasn't finished processing in the defined interval.
+						switch(masterControllerAlertLevel)
 							if(0 to 3)
-								MC_defcon++
+								masterControllerAlertLevel++
 							if(4)
-								admins << "<font color='red' size='2'><b>Warning. The Master Controller has not fired in the last [MC_defcon*processing_interval] ticks. Automatic restart in [processing_interval] ticks.</b></font>"
-								MC_defcon = 5
+								admins << "<font color='red' size='2'><b>Warning. The master Controller has not fired in the last [masterControllerAlertLevel * processing_interval] ticks. Automatic restart in [processing_interval] ticks.</b></font>"
+								masterControllerAlertLevel = 5
 							if(5)
-								admins << "<font color='red' size='2'><b>Warning. The Master Controller has still not fired within the last [MC_defcon*processing_interval] ticks. Killing and restarting...</b></font>"
-								new /datum/controller/game_controller()	//replace the old master_controller (hence killing the old one's process)
-								master_controller.process()				//Start it rolling again
-								MC_defcon = 0
+								admins << "<font color='red' size='2'><b>Warning. The master Controller has still not fired within the last [masterControllerAlertLevel * processing_interval] ticks. Killing and restarting...</b></font>"
+								new /datum/controller/game_controller() // Replace the old master controller (hence killing the old one's process).
+								master_controller.process() // Start it rolling again.
+								masterControllerAlertLevel = 0
 					else
-						MC_defcon = 0
-						MC_iteration = controller_iteration
+						masterControllerAlertLevel = 0
+						masterControllerIteration = master_controller.iteration
 
 				if(lighting_controller.processing)
-					if(lighting_iteration == lighting_controller.iteration)	//master_controller hasn't finished processing in the defined interval
-						switch(lighting_defcon)
+					if(lightingControllerIteration == lighting_controller.iteration) // Lighting controller hasn't finished processing in the defined interval.
+						switch(lightingControllerAlertLevel)
 							if(0 to 3)
-								lighting_defcon++
+								lightingControllerAlertLevel++
 							if(4)
-								admins << "<font color='red' size='2'><b>Warning. The Lighting Controller has not fired in the last [lighting_defcon*processing_interval] ticks. Automatic restart in [processing_interval] ticks.</b></font>"
-								lighting_defcon = 5
+								admins << "<font color='red' size='2'><b>Warning. The lighting_controller controller has not fired in the last [lightingControllerAlertLevel * processing_interval] ticks. Automatic restart in [processing_interval] ticks.</b></font>"
+								lightingControllerAlertLevel = 5
 							if(5)
-								admins << "<font color='red' size='2'><b>Warning. The Lighting Controller has still not fired within the last [lighting_defcon*processing_interval] ticks. Killing and restarting...</b></font>"
-								new /datum/controller/lighting()	//replace the old lighting_controller (hence killing the old one's process)
-								lighting_controller.process()		//Start it rolling again
-								lighting_defcon = 0
+								admins << "<font color='red' size='2'><b>Warning. The lighting_controller controller has still not fired within the last [lightingControllerAlertLevel * processing_interval] ticks. Killing and restarting...</b></font>"
+								new /datum/controller/lighting() // Replace the old lighting_controller (hence killing the old one's process).
+								lighting_controller.process() // Start it rolling again.
+								lightingControllerAlertLevel = 0
 					else
-						lighting_defcon = 0
-						lighting_iteration = lighting_controller.iteration
-			else
-				MC_defcon = 0
-				lighting_defcon = 0
+						lightingControllerAlertLevel = 0
+						lightingControllerIteration = lighting_controller.iteration
 
-			sleep(processing_interval)
+			sleep(processing_interval)

code/controllers/garbage.dm

@@ -1,124 +1,186 @@
+#define GC_COLLECTIONS_PER_TICK 300 // Was 100.
+#define GC_COLLECTION_TIMEOUT (30 SECONDS)
+#define GC_FORCE_DEL_PER_TICK 60
+//#define GC_DEBUG
 
-#define GC_COLLECTIONS_PER_TICK 250 // Was 100
-#define GC_COLLECTION_TIMEOUT 100 // 10s
-var/global/datum/controller/garbage_collector/garbage
-var/global/list/uncollectable_vars=list(
-	"alpha",
-	"bestF",
-	"bounds",
-	"bound_height",
-	"bound_width",
-	"ckey",
-	"color",
-	"contents",
-	"gender",
-	"group",
-	"key",
-	//"loc",
-	"locs",
-	"luminosity",
-	"parent",
-	"parent_type",
-	"step_size",
-	"glide_size",
-	"gc_destroyed",
-	"step_x",
-	"step_y",
-	"step_z",
-	"tag",
-	"thermal_conductivity",
-	"type",
-	"vars",
-	"verbs",
-	"x",
-	"y",
-	"z",
-)
-/datum/controller/garbage_collector
-	var/list/queue=list()
-	var/list/destroyed=list()
-	var/waiting=0
-	var/del_everything=1
-	var/turf/trashbin=null
+var/list/gc_hard_del_types = new
+var/datum/garbage_collector/garbageCollector
 
-	New()
-		trashbin=locate(0,0,CENTCOMM_Z)
+/client/proc/gc_dump_hdl()
+	set name = "(GC) Hard Del List"
+	set desc = "List types that are hard del()'d by the GC."
+	set category = "Debug"
 
-	proc/AddTrash(var/atom/movable/A)
-		if(!A)
-			return
-		if(del_everything)
-			del(A)
-			return
-		A.loc=trashbin
-		queue.Add(A)
-		waiting++
+	for(var/A in gc_hard_del_types)
+		usr << "[A] = [gc_hard_del_types[A]]"
 
-	proc/Pop()
-		var/atom/movable/A = queue[1]
-		if(!A)
-			if(isnull(A))
-				var/loopcheck = 0
-				while(queue.Remove(null))
-					loopcheck++
-					if(loopcheck > 50)
-						break
-			return
-		if(del_everything)
-			del(A)
-			return
-		if(!istype(A,/atom/movable))
-			testing("GC given a [A.type].")
-			del(A)
-			return
-		for(var/vname in A.vars)
-			if(!issaved(A.vars[vname]))
-				continue
-			if(vname in uncollectable_vars)
-				continue
-			//testing("Unsetting [vname] in [A.type]!")
-			A.vars[vname]=null
-		A.loc=null
-		destroyed.Add("\ref[A]")
-		queue.Remove(A)
+/datum/garbage_collector
+	var/list/queue = new
+	var/del_everything = 0
 
-	proc/process()
-		for(var/i=0;i<min(waiting,GC_COLLECTIONS_PER_TICK);i++)
-			if(waiting)
-				Pop()
-				waiting--
-		for(var/i=0;i<min(destroyed.len,GC_COLLECTIONS_PER_TICK);i++)
-			if(destroyed.len)
-				var/refID=destroyed[1]
-				var/atom/A = locate(refID)
-				if(A && A.gc_destroyed && A.gc_destroyed >= world.time - GC_COLLECTION_TIMEOUT)
-					// Something's still referring to the qdel'd object.  Kill it.
-					del(A)
-				destroyed.Remove(refID)
+	// To let them know how hardworking am I :^).
+	var/dels_count = 0
+	var/hard_dels = 0
+	var/soft_dels = 0
 
-/**
-* NEVER USE THIS FOR ANYTHING OTHER THAN /atom/movable
-* OTHER TYPES CANNOT BE QDEL'D BECAUSE THEIR LOC IS LOCKED OR THEY DON'T HAVE ONE.
-*/
-/proc/qdel(var/atom/movable/A)
-	if(!A) return
-	if(!istype(A))
-		warning("qdel() passed object of type [A.type]. qdel() can only handle /atom/movable types.")
-		del(A)
+/datum/garbage_collector/proc/addTrash(const/atom/movable/AM)
+	if(!istype(AM))
 		return
-	if(!garbage)
-		del(A)
+
+	if(del_everything)
+		del(AM)
+		hard_dels++
+		dels_count++
 		return
-	// Let our friend know they're about to get fucked up.
-	A.Destroy()
-	garbage.AddTrash(A)
+
+	queue["\ref[AM]"] = world.timeofday
+
+/datum/garbage_collector/proc/process()
+	var/remainingCollectionPerTick = GC_COLLECTIONS_PER_TICK
+	var/remainingForceDelPerTick = GC_FORCE_DEL_PER_TICK
+	var/collectionTimeScope = world.timeofday - GC_COLLECTION_TIMEOUT
+	if(narsie_cometh) return //don't even fucking bother, its over.
+	while(queue.len && --remainingCollectionPerTick >= 0)
+		var/refID = queue[1]
+		var/destroyedAtTime = queue[refID]
+
+		if(destroyedAtTime > collectionTimeScope)
+			break
+
+		var/atom/movable/AM = locate(refID)
+		if(AM) // Something's still referring to the qdel'd object. del it.
+			if(isnull(AM.gcDestroyed))
+				queue -= refID
+				continue
+			if(remainingForceDelPerTick <= 0)
+				break
+
+			#ifdef GC_DEBUG
+			WARNING("gc process force delete [AM.type]")
+			#endif
+
+			AM.hard_deleted = 1
+			if(!AM.type in gc_hard_del_types)
+				gc_hard_del_types += AM.type
+			del AM
+
+			hard_dels++
+			remainingForceDelPerTick--
+
+#ifdef GC_DEBUG
+#undef GC_DEBUG
+#endif
+
+#undef GC_FORCE_DEL_PER_TICK
+#undef GC_COLLECTION_TIMEOUT
+#undef GC_COLLECTIONS_PER_TICK
+
+/datum/garbage_collector/proc/dequeue(id)
+	if (queue)
+		queue -= id
+
+	dels_count++
+
+/*
+ * NEVER USE THIS FOR ANYTHING OTHER THAN /atom/movable
+ * OTHER TYPES CANNOT BE QDEL'D BECAUSE THEIR LOC IS LOCKED OR THEY DON'T HAVE ONE.
+ */
+/proc/qdel(const/atom/movable/AM, ignore_pooling = 0)
+	if(isnull(AM))
+		return
+
+	if(isnull(garbageCollector))
+		del(AM)
+		return
+
+	if(!istype(AM))
+		WARNING("qdel() passed object of type [AM.type]. qdel() can only handle /atom/movable types.")
+		if(!AM.type in gc_hard_del_types)
+			gc_hard_del_types += AM.type
+		del(AM)
+		garbageCollector.hard_dels++
+		garbageCollector.dels_count++
+		return
+
+	//We are object pooling this.
+	if(("[AM.type]" in masterPool) && !ignore_pooling)
+		returnToPool(AM)
+		return
+
+	if(isnull(AM.gcDestroyed))
+		// Let our friend know they're about to get fucked up.
+		AM.Destroy()
+
+		garbageCollector.addTrash(AM)
+
+/datum/controller
+	var/processing = 0
+	var/iteration = 0
+	var/processing_interval = 0
+
+/datum/controller/proc/recover() // If we are replacing an existing controller (due to a crash) we attempt to preserve as much as we can.
+
+/*
+ * Like Del(), but for qdel.
+ * Called BEFORE qdel moves shit.
+ */
+/datum/proc/Destroy()
+	del(src)
 
 /client/proc/qdel_toggle()
 	set name = "Toggle qdel Behavior"
 	set desc = "Toggle qdel usage between normal and force del()."
 	set category = "Debug"
 
-	garbage.del_everything = !garbage.del_everything
-	world << "<b>GC: qdel turned [garbage.del_everything?"off":"on"].</b>"
-	log_admin("[key_name(usr)] turned qdel [garbage.del_everything?"off":"on"].")
-	message_admins("\blue [key_name(usr)] turned qdel [garbage.del_everything?"off":"on"].", 1)
+	garbageCollector.del_everything = !garbageCollector.del_everything
+	world << "<b>GC: qdel turned [garbageCollector.del_everything ? "off" : "on"].</b>"
+	log_admin("[key_name(usr)] turned qdel [garbageCollector.del_everything ? "off" : "on"].")
+	message_admins("\blue [key_name(usr)] turned qdel [garbageCollector.del_everything ? "off" : "on"].", 1)
+
+/*/client/var/running_find_references
+
+/atom/verb/find_references()
+	set category = "Debug"
+	set name = "Find References"
+	set background = 1
+	set src in world
+
+	if(!usr || !usr.client)
+		return
+
+	if(usr.client.running_find_references)
+		testing("CANCELLED search for references to a [usr.client.running_find_references].")
+		usr.client.running_find_references = null
+		return
+
+	if(alert("Running this will create a lot of lag until it finishes.  You can cancel it by running it again.  Would you like to begin the search?", "Find References", "Yes", "No") == "No")
+		return
+	qdel(src)
+	// Remove this object from the list of things to be auto-deleted.
+	if(garbageCollector)
+		garbageCollector.queue -= "\ref[src]"
+
+	usr.client.running_find_references = type
+	testing("Beginning search for references to a [type].")
+	var/list/things = list()
+	for(var/client/thing)
+		things += thing
+	for(var/datum/thing)
+		things += thing
+	for(var/atom/thing)
+		things += thing
+	for(var/event/thing)
+		things += thing
+	testing("Collected list of things in search for references to a [type]. ([things.len] Thing\s)")
+	for(var/datum/thing in things)
+		if(!usr.client.running_find_references) return
+		for(var/varname in thing.vars)
+			var/variable = thing.vars[varname]
+			if(variable == src)
+				testing("Found [src.type] \ref[src] in [thing.type]'s [varname] var.")
+			else if(islist(variable))
+				if(src in variable)
+					testing("Found [src.type] \ref[src] in [thing.type]'s [varname] list var.")
+	testing("Completed search for references to a [type].")
+	usr.client.running_find_references = null
+*/

code/controllers/lighting_controller.dm

@@ -1,10 +1,8 @@
 var/datum/controller/lighting/lighting_controller = new ()
 
 datum/controller/lighting
-	var/processing = 0
-	var/processing_interval = 5	//setting this too low will probably kill the server. Don't be silly with it!
+	processing_interval = 5	//setting this too low will probably kill the server. Don't be silly with it!
 	var/process_cost = 0
-	var/iteration = 0
 
 	var/lighting_states = 7
 
@@ -21,7 +19,7 @@ datum/controller/lighting/New()
 	if(lighting_controller != src)
 		if(istype(lighting_controller,/datum/controller/lighting))
 			Recover()	//if we are replacing an existing lighting_controller (due to a crash) we attempt to preserve as much as we can
-			del(lighting_controller)
+			qdel(lighting_controller)
 		lighting_controller = src
 
 

code/controllers/master_controller.dm

@@ -5,14 +5,12 @@
 var/global/datum/controller/game_controller/master_controller //Set in world.New()
 
 var/global/controller_iteration = 0
-var/global/last_tick_timeofday = world.timeofday
 var/global/last_tick_duration = 0
 
 var/global/air_processing_killed = 0
 var/global/pipe_processing_killed = 0
 
 datum/controller/game_controller
-	var/processing = 0
 	var/breather_ticks = 2		//a somewhat crude attempt to iron over the 'bumps' caused by high-cpu use by letting the MC have a breather for this many ticks after every loop
 	var/minimum_ticks = 20		//The minimum length of time between MC ticks
 
@@ -29,7 +27,7 @@ datum/controller/game_controller
 	var/events_cost		= 0
 	var/puddles_cost
 	var/ticker_cost		= 0
-	var/gc_cost         = 0
+	var/garbageCollectorCost = 0
 	var/total_cost		= 0
 
 	var/last_thing_processed
@@ -37,13 +35,14 @@ datum/controller/game_controller
 	var/list/shuttle_list	                    // For debugging and VV
 	var/datum/ore_distribution/asteroid_ore_map // For debugging and VV.
 
+	var/global/datum/garbage_collector/garbageCollector
 
 datum/controller/game_controller/New()
 	//There can be only one master_controller. Out with the old and in with the new.
 	if(master_controller != src)
 		if(istype(master_controller))
 			Recover()
-			del(master_controller)
+			qdel(master_controller)
 		master_controller = src
 
 	if(!job_master)
@@ -54,8 +53,8 @@ datum/controller/game_controller/New()
 
 	if(!syndicate_code_phrase)		syndicate_code_phrase	= generate_code_phrase()
 	if(!syndicate_code_response)	syndicate_code_response	= generate_code_phrase()
-	if(!emergency_shuttle)			emergency_shuttle = new /datum/emergency_shuttle_controller()
-	if(!shuttle_controller)			shuttle_controller = new /datum/shuttle_controller()
+	//if(!emergency_shuttle)			emergency_shuttle = new /datum/emergency_shuttle_controller()	MOVED TO SCHEDULER
+	//if(!shuttle_controller)			shuttle_controller = new /datum/shuttle_controller()
 
 datum/controller/game_controller/proc/setup()
 	world.tick_lag = config.Ticklag
@@ -63,15 +62,15 @@ datum/controller/game_controller/proc/setup()
 	spawn(20)
 		createRandomZlevel()
 
+	/* MOVED TO SCHEDULER
 	if(!air_master)
 		air_master = new /datum/controller/air_system()
 		air_master.Setup()
 
 	if(!ticker)
 		ticker = new /datum/controller/gameticker()
+	*/
 
-	if(!garbage)
-		garbage = new /datum/controller/garbage_collector()
 
 	color_windows_init()
 	setup_objects()
@@ -82,15 +81,17 @@ datum/controller/game_controller/proc/setup()
 
 	for(var/i=0, i<max_secret_rooms, i++)
 		make_mining_asteroid_secret()
-		
+
 	populate_spawn_points()
 
+/* MOVED TO SCHEDULER
+
 	spawn(0)
 		if(ticker)
 			ticker.pregame()
 
 	lighting_controller.Initialize()
-
+*/
 
 datum/controller/game_controller/proc/setup_objects()
 	world << "\red \b Initializing objects"
@@ -130,11 +131,8 @@ datum/controller/game_controller/proc/process()
 	spawn(0)
 		//set background = 1
 		while(1)	//far more efficient than recursively calling ourself
-			if(!Failsafe)	new /datum/controller/failsafe()
+			if(!failsafe)	new /datum/controller/failsafe()
 
-			var/currenttime = world.timeofday
-			last_tick_duration = (currenttime - last_tick_timeofday) / 10
-			last_tick_timeofday = currenttime
 
 			if(processing)
 				var/timer
@@ -245,12 +243,12 @@ datum/controller/game_controller/proc/process()
 
 				// GC
 				timer = world.timeofday
-				last_thing_processed = garbage.type
-				garbage.process()
-				gc_cost = (world.timeofday - timer) / 10
+				last_thing_processed = garbageCollector.type
+				garbageCollector.process()
+				garbageCollectorCost = (world.timeofday - timer) / 10
 
 				//TIMING
-				total_cost = air_cost + sun_cost + mobs_cost + diseases_cost + machines_cost + aibots_cost + objects_cost + networks_cost + powernets_cost + nano_cost + events_cost + puddles_cost + ticker_cost + gc_cost
+				total_cost = air_cost + sun_cost + mobs_cost + diseases_cost + machines_cost + aibots_cost + objects_cost + networks_cost + powernets_cost + nano_cost + events_cost + puddles_cost + ticker_cost + garbageCollectorCost
 
 				var/end_time = world.timeofday
 				if(end_time < start_time)	//why not just use world.time instead?

code/controllers/verbs.dm

@@ -49,7 +49,7 @@
 	return
 
 
-/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Air","Jobs","Sun","Radio","Supply","Shuttles","Emergency Shuttle","Configuration","pAI", "Cameras","Garbage", "Crafting", "Transfer Controller","Event"))
+/client/proc/debug_controller(controller in list("Master","failsafe","Ticker","Lighting","Air","Jobs","Sun","Radio","Supply","Shuttles","Emergency Shuttle","Configuration","pAI", "Cameras","Garbage", "Transfer Controller","Event","Scheduler"))
 	set category = "Debug"
 	set name = "Debug Controller"
 	set desc = "Debug the various periodic loop controllers for the game (be careful!)"
@@ -59,18 +59,15 @@
 		if("Master")
 			debug_variables(master_controller)
 			feedback_add_details("admin_verb","DMC")
-		if("Failsafe")
-			debug_variables(Failsafe)
-			feedback_add_details("admin_verb","DFailsafe")
+		if ("failsafe")
+			debug_variables(failsafe)
+			feedback_add_details("admin_verb", "dfailsafe")
 		if("Ticker")
 			debug_variables(ticker)
 			feedback_add_details("admin_verb","DTicker")
 		if("Lighting")
 			debug_variables(lighting_controller)
 			feedback_add_details("admin_verb","DLighting")
-		if("Garbage")
-			debug_variables(garbage)
-			feedback_add_details("admin_verb","DGarbage")
 		if("Air")
 			debug_variables(air_master)
 			feedback_add_details("admin_verb","DAir")
@@ -101,12 +98,15 @@
 		if("Cameras")
 			debug_variables(cameranet)
 			feedback_add_details("admin_verb","DCameras")
-		if("Crafting")
-			debug_variables(crafting_master)
-			feedback_add_details("admin_verb","DCrafting")
 		if("Event")
 			debug_variables(event_manager)
-			feedback_add_details("admin_verb","DEvent")			
-			
+			feedback_add_details("admin_verb","DEvent")
+		if("Garbage")
+			debug_variables(garbageCollector)
+			feedback_add_details("admin_verb","DGarbage")
+		if("Scheduler")
+			debug_variables(processScheduler)
+			feedback_add_details("admin_verb","DprocessScheduler")
+
 	message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
 	return

code/controllers/voting.dm

@@ -17,7 +17,7 @@ datum/controller/vote
 	New()
 		if(vote != src)
 			if(istype(vote))
-				del(vote)
+				qdel(vote)
 			vote = src
 
 	proc/process()	//called by master_controller

code/datums/ai_laws.dm

@@ -179,6 +179,11 @@ datum/ai_laws/tyrant //This probably shouldn't be a default lawset.
 
 /datum/ai_laws/proc/clear_ion_laws()
 	src.ion = list()
+	
+/datum/ai_laws/proc/clear_zeroth_law(var/law_borg = null)
+	src.zeroth = null
+	if(law_borg)
+		src.zeroth_borg = null
 
 /datum/ai_laws/proc/show_laws(var/who)
 

code/datums/cargoprofile.dm

@@ -103,7 +103,7 @@
 	id = "boxes"
 	blacklist = null
 	whitelist = list(/obj/item/weapon/storage, /obj/item/weapon/moneybag, /obj/item/weapon/evidencebag,
-					/obj/item/weapon/tray, /obj/item/pizzabox, /obj/item/weapon/clipboard,
+					/obj/item/weapon/storage/bag/tray, /obj/item/pizzabox, /obj/item/weapon/clipboard,
 					/obj/item/smallDelivery, /obj/structure/bigDelivery)
 
 /datum/cargoprofile/cargo
@@ -238,7 +238,7 @@
 					/obj/item/clothing/mask/facehugger) // NOT CLOTHING AT ALLLLL
 	whitelist = list(/obj/item/clothing,/obj/item/weapon/storage/belt,/obj/item/weapon/storage/backpack,
 					/obj/item/device/radio/headset,/obj/item/device/pda,/obj/item/weapon/card/id,/obj/item/weapon/tank,
-					/obj/item/weapon/handcuffs, /obj/item/weapon/legcuffs)
+					/obj/item/weapon/restraints/handcuffs, /obj/item/weapon/restraints/legcuffs)
 
 /datum/cargoprofile/trash
 	name = "Trash"
@@ -264,13 +264,13 @@
 	name = "Devices & Tools"
 	id = "tools"
 	blacklist = null
-	whitelist = list(/obj/item/device,/obj/item/weapon/card,/obj/item/weapon/cartridge,/obj/item/weapon/cautery,/obj/item/weapon/cell,/obj/item/weapon/circuitboard,
+	whitelist = list(/obj/item/device,/obj/item/weapon/card,/obj/item/weapon/cartridge,/obj/item/weapon/cautery,/obj/item/weapon/stock_parts/cell,/obj/item/weapon/circuitboard,
 					/obj/item/weapon/aiModule,/obj/item/weapon/airalarm_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/circular_saw,
 					/obj/item/weapon/cloaking_device,/obj/item/weapon/crowbar,/obj/item/weapon/disk,/obj/item/weapon/firealarm_electronics,/obj/item/weapon/hand_tele,
 					/obj/item/weapon/hand_labeler,/obj/item/weapon/hemostat,/obj/item/weapon/mop,/obj/item/weapon/locator,/obj/item/weapon/minihoe,
-					/obj/item/weapon/packageWrap,/obj/item/weapon/pen,/obj/item/weapon/pickaxe,/obj/item/weapon/pinpointer,
+					/obj/item/stack/packageWrap,/obj/item/weapon/pen,/obj/item/weapon/pickaxe,/obj/item/weapon/pinpointer,
 					/obj/item/weapon/rcd,/obj/item/weapon/rcd_ammo,/obj/item/weapon/retractor,/obj/item/weapon/rsf,/obj/item/weapon/rsp,/obj/item/weapon/scalpel,
-					/obj/item/weapon/screwdriver,/obj/item/weapon/shovel,/obj/item/weapon/soap,/obj/item/weapon/stamp,/obj/item/weapon/tray,/obj/item/weapon/weldingtool,
+					/obj/item/weapon/screwdriver,/obj/item/weapon/shovel,/obj/item/weapon/soap,/obj/item/weapon/stamp,/obj/item/weapon/storage/bag/tray,/obj/item/weapon/weldingtool,
 					/obj/item/weapon/wirecutters,/obj/item/weapon/wrench,/obj/item/weapon/extinguisher)
 
 /datum/cargoprofile/finished

code/datums/crafting/crafting.dm

@@ -1,312 +0,0 @@
-var/global/datum/crafting_controller/crafting_master
-
-/datum/crafting_recipe
-	var/name = ""
-	var/reqs[] = list()
-	var/result_path
-	var/tools[] = list()
-	var/time = 0
-	var/parts[] = list()
-	var/chem_catalists[] = list()
-	var/can_be_deconstructed = 0
-
-/datum/crafting_recipe/New()
-	crafting_master.all_crafting_recipes[name] = src
-
-/datum/crafting_recipe/table/New()
-	..()
-	crafting_master.add_recipe_to_family("table", src)
-
-
-/datum/crafting_controller
-	var/list/families = list()
-	var/list/all_crafting_points = list()
-	var/list/all_crafting_recipes = list()
-
-/hook/startup/proc/setupCraftingMaster()
-	crafting_master = new /datum/crafting_controller()
-	return 1
-
-/datum/crafting_controller/New()
-	crafting_master = src
-	add_family("table")
-	add_family("forge")
-	for(var/A in typesof(/datum/crafting_recipe))
-		if(A == /datum/crafting_recipe)
-			continue
-		var/datum/crafting_recipe/CR = new A()
-		all_crafting_recipes[CR.name] = CR
-
-/datum/crafting_controller/proc/add_global_recipe(datum/crafting_recipe/CR)
-	all_crafting_recipes[CR.name] = CR
-
-/datum/crafting_controller/proc/remove_global_recipe(datum/crafting_recipe/CR)
-	all_crafting_recipes[CR.name] = null
-	all_crafting_recipes.Remove(CR.name)
-
-/datum/crafting_controller/proc/add_family(name, list/members, list/recipes)
-	var/datum/crafting_family/family = new(name, members, recipes)
-	families[name] = family
-
-/datum/crafting_controller/proc/get_family_by_name(name)
-	return families[name]
-
-/datum/crafting_controller/proc/add_member_to_family(family_name, member)
-	var/datum/crafting_family/family = families[family_name]
-	family.add_member(member)
-
-/datum/crafting_controller/proc/add_recipe_to_family(family_name, datum/crafting_recipe/recipe)
-	var/datum/crafting_family/family = families[family_name]
-	family.add_recipe(recipe)
-
-/datum/crafting_controller/proc/remove_recipe_from_family(family_name, datum/crafting_recipe/recipe)
-	var/datum/crafting_family/family = families[family_name]
-	family.remove_recipe(recipe)
-
-/datum/crafting_controller/proc/remove_member(family_name, member)
-	var/datum/crafting_family/family = families[family_name]
-	family.remove_member(member)
-
-/datum/crafting_controller/proc/remove_family(family_name)
-	var/datum/crafting_family/family = families[family_name]
-	del(family)
-
-/datum/crafting_family
-	var/name
-	var/list/recipes
-	var/list/members
-
-/datum/crafting_family/New(new_name, list/new_members = list(), list/new_recipes = list())
-	name = new_name
-	recipes = new_recipes
-	members = new_members
-
-/datum/crafting_family/proc/add_member(datum/crafting_holder/member)
-	members |= member
-	member.family = src
-
-/datum/crafting_family/proc/remove_member(datum/crafting_holder/member)
-	members -= member
-	member.family = null
-
-/datum/crafting_family/proc/add_recipe(datum/crafting_recipe/recipe)
-	recipes[recipe.name] = recipe
-
-/datum/crafting_family/proc/remove_recipe(datum/crafting_recipe/recipe)
-	recipes[recipe.name] = null
-	recipes.Remove(recipe.name)
-
-
-/datum/crafting_holder
-	var/name
-	var/atom/holder
-	var/recipes
-	var/busy
-	var/datum/crafting_family/family
-
-/datum/crafting_holder/New(atom/location, family_name)
-	location.craft_holder = src
-	holder = location
-	spawn(50)
-		if(crafting_master)
-			crafting_master.all_crafting_points |= src
-			if(family_name)
-				family = crafting_master.get_family_by_name(family_name)
-			if(family)
-				recipes = family.recipes
-
-/datum/crafting_holder/proc/add_recipe(recipe)
-	recipes |= recipe
-
-/datum/crafting_holder/proc/remove_recipe(recipe)
-	recipes -= recipe
-
-/datum/crafting_holder/proc/deconstruct(mob/user, datum/crafting_recipe/R)
-	if(!R.can_be_deconstructed)
-		return
-	var/list/result = list()
-	var/list/holder_contents = check_holder()
-	var/atom/movable/target = locate(R.result_path) in holder_contents
-	if(!target)
-		return
-	if(check_tools(user, R, holder_contents))
-		for(var/A in R.reqs)
-			var/amount = R.reqs[A]
-			if(ispath(A, /datum/reagent))
-				for(var/obj/item/weapon/reagent_containers/RC in holder_contents)
-					var/diff = RC.reagents.total_volume - RC.reagents.maximum_volume
-					if(diff)
-						diff = min(diff, amount)
-						var/datum/reagent/C = new A()
-						C.volume = diff
-						RC.reagents.reagent_list.Add(C)
-						RC.reagents.total_volume += diff
-						result.Add(C)
-						amount -= diff
-						if(!amount)
-							break
-			else
-				while(amount)
-					result.Add(new A(holder.loc))
-					amount--
-	qdel(target)
-	return result
-
-/datum/crafting_holder/proc/check_contents(datum/crafting_recipe/R, list/holder_contents)
-	main_loop:
-		for(var/A in R.reqs)
-			for(var/B in holder_contents)
-				if(ispath(B, A))
-					if(holder_contents[B] >= R.reqs[A])
-						continue main_loop
-			return 0
-	for(var/A in R.chem_catalists)
-		if(holder_contents[A] < R.chem_catalists[A])
-			return 0
-	return 1
-
-/datum/crafting_holder/proc/check_holder()
-	var/list/holder_contents = list()
-	for(var/obj/I in holder.loc)
-		if(istype(I, /obj/item/stack))
-			var/obj/item/stack/S = I
-			holder_contents[I.type] += S.amount
-		else
-			if(istype(I, /obj/item/weapon/reagent_containers))
-				for(var/datum/reagent/R in I.reagents.reagent_list)
-					holder_contents[R.type] += R.volume
-
-			holder_contents[I.type] += 1
-
-	return holder_contents
-
-/datum/crafting_holder/proc/check_tools(mob/user, datum/crafting_recipe/R, list/holder_contents)
-	if(!R.tools.len)
-		return 1
-	var/list/possible_tools = list()
-	for(var/obj/item/I in user.contents)
-		if(istype(I, /obj/item/weapon/storage))
-			for(var/obj/item/SI in I.contents)
-				possible_tools += SI.type
-		else
-			possible_tools += I.type
-	possible_tools += holder_contents
-	var/i = R.tools.len
-	var/I
-	for(var/A in R.tools)
-		I = possible_tools.Find(A)
-		if(I)
-			possible_tools.Cut(I, I+1)
-			i--
-		else
-			break
-	return !i
-
-/datum/crafting_holder/proc/construct_item(mob/user, datum/crafting_recipe/R)
-	var/list/holder_contents = check_holder()
-	if(check_contents(R, holder_contents) && check_tools(user, R, holder_contents))
-		if(do_after(user, R.time))
-			if(!check_contents(R, holder_contents) || !check_tools(user, R, holder_contents))
-				return 0
-			var/list/parts = del_reqs(R, holder_contents)
-			var/atom/movable/I = new R.result_path
-			for(var/A in parts)
-				if(istype(A, /obj/item))
-					var/atom/movable/B = A
-					B.loc = I
-				else
-					if(!I.reagents)
-						I.reagents = new /datum/reagents()
-					I.reagents.reagent_list.Add(A)
-			I.CheckParts()
-			I.loc = holder.loc
-			return 1
-	return 0
-
-/datum/crafting_holder/proc/del_reqs(datum/crafting_recipe/R, list/holder_contents)
-	var/list/Deletion = list()
-	var/amt
-	for(var/A in R.reqs)
-		amt = R.reqs[A]
-		if(ispath(A, /obj/item/stack))
-			var/obj/item/stack/S
-			stack_loop:
-				for(var/B in holder_contents)
-					if(ispath(B, A))
-						while(amt > 0)
-							S = locate(B) in holder.loc
-							if(S.amount >= amt)
-								S.use(amt)
-								break stack_loop
-							else
-								amt -= S.amount
-								qdel(S)
-		else if(ispath(A, /obj/item))
-			var/obj/item/I
-			item_loop:
-				for(var/B in holder_contents)
-					if(ispath(B, A))
-						while(amt > 0)
-							I = locate(B) in holder.loc
-							Deletion.Add(I)
-							amt--
-						break item_loop
-		else
-			var/datum/reagent/RG = new A
-			reagent_loop:
-				for(var/B in holder_contents)
-					if(ispath(B, /obj/item/weapon/reagent_containers))
-						var/obj/item/RC = locate(B) in holder.loc
-						if(RC.reagents.has_reagent(RG.id, amt))
-							RC.reagents.remove_reagent(RG.id, amt)
-							RG.volume = amt
-							Deletion.Add(RG)
-							break reagent_loop
-						else if(RC.reagents.has_reagent(RG.id))
-							Deletion.Add(RG)
-							RG.volume += RC.reagents.get_reagent_amount(RG.id)
-							amt -= RC.reagents.get_reagent_amount(RG.id)
-							RC.reagents.del_reagent(RG.id)
-
-	for(var/A in R.parts)
-		for(var/B in Deletion)
-			if(!istype(B, A))
-				Deletion.Remove(B)
-				qdel(B)
-	return Deletion
-
-/datum/crafting_holder/proc/interact(mob/user)
-	var/list/holder_contents = check_holder()
-	if(!holder_contents.len)
-		return
-	var/dat = "<h3>Construction menu</h3>"
-	dat += "<div class='statusDisplay'>"
-	if(busy)
-		dat += "Construction inprogress...</div>"
-	else
-		for(var/A in recipes)
-			var/datum/crafting_recipe/R = recipes[A]
-			if(check_contents(R, holder_contents))
-				dat += "<A href='?src=\ref[src];make=\ref[R]'>[R.name]</A><BR>"
-		dat += "</div>"
-
-	var/datum/browser/popup = new(user, "craft", "Craft", 300, 300)
-	popup.set_content(dat)
-	popup.open()
-	return
-
-/datum/crafting_holder/Topic(href, href_list)
-	if(usr.stat || !holder.Adjacent(usr) || usr.lying)
-		return
-	if(href_list["make"])
-		if(busy)
-			return
-		busy = 1
-		interact(usr)
-		var/datum/crafting_recipe/TR = locate(href_list["make"])
-		if(construct_item(usr, TR))
-			usr << "<span class='notice'>[TR.name] constructed.</span>"
-		else
-			usr << "<span class ='warning'>Construction failed.</span>"
-		busy = 0
-		interact(usr)

code/datums/crafting/recipes.dm

@@ -1,137 +0,0 @@
-//Basic crafting components -- Using cheap easily found items to create components that can be used to make more complex objects
-
-/datum/crafting_recipe/table/igniter
-	name = "Igniter"
-	result_path = /obj/item/device/assembly/igniter
-	reqs = list(/obj/item/weapon/lighter = 1,
-	/obj/item/stack/cable_coil = 1)
-	time = 20
-
-/datum/crafting_recipe/table/voice
-	name = "Voice analyzer"
-	result_path = /obj/item/device/assembly/voice
-	reqs = list(/obj/item/device/taperecorder = 1,
-	/obj/item/stack/cable_coil = 1)
-	time = 20
-
-/datum/crafting_recipe/table/infra
-	name = "Infrared Emitter"
-	result_path = /obj/item/device/assembly/infra
-	reqs = list(/obj/item/device/laser_pointer = 1,
-	/obj/item/stack/cable_coil = 1)
-	time = 20
-
-//Medium crafting
-
-/datum/crafting_recipe/table/IED
-	name = "IED"
-	result_path = /obj/item/weapon/grenade/iedcasing
-	reqs = list(/obj/item/stack/cable_coil = 1,
-	/obj/item/device/assembly/igniter = 1,
-	/obj/item/weapon/reagent_containers/food/drinks/cans = 1,
-	/datum/reagent/fuel = 10)
-	time = 80
-
-/datum/crafting_recipe/table/stunprod
-	name = "Stunprod"
-	result_path = /obj/item/weapon/melee/baton/cattleprod
-	reqs = list(/obj/item/weapon/handcuffs/cable = 1,
-	/obj/item/stack/rods = 1,
-	/obj/item/weapon/wirecutters = 1,
-	/obj/item/weapon/cell = 1)
-	time = 80
-	parts = list(/obj/item/weapon/cell = 1)
-
-/datum/crafting_recipe/table/flamethrower
-	name = "Flamethrower"
-	result_path = /obj/item/weapon/flamethrower
-	reqs = list(/obj/item/weapon/weldingtool = 1,
-	/obj/item/device/assembly/igniter = 1,
-	/obj/item/stack/rods = 2)
-	tools = list(/obj/item/weapon/screwdriver)
-	time = 20
-
-/datum/crafting_recipe/table/meteorshot
-	name = "Meteorshot Shell"
-	result_path = /obj/item/ammo_casing/shotgun/meteorshot
-	reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
-				/obj/item/weapon/rcd_ammo = 1,
-				/obj/item/weapon/stock_parts/manipulator = 2)
-	tools = list(/obj/item/weapon/screwdriver)
-	time = 5
-
-/datum/crafting_recipe/table/pulseslug
-	name = "Pulse Slug Shell"
-	result_path = /obj/item/ammo_casing/shotgun/pulseslug
-	reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
-				/obj/item/weapon/stock_parts/capacitor/adv = 2,
-				/obj/item/weapon/stock_parts/micro_laser/ultra = 1)
-	tools = list(/obj/item/weapon/screwdriver)
-	time = 5
-
-/datum/crafting_recipe/table/dragonsbreath
-	name = "Dragonsbreath Shell"
-	result_path = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
-	reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
-				/datum/reagent/phosphorus = 5,)
-	tools = list(/obj/item/weapon/screwdriver)
-	time = 5
-
-//Advanced crafting
-
-/datum/crafting_recipe/table/ed209
-	name = "ED209"
-	result_path = /obj/machinery/bot/ed209
-	reqs = list(/obj/item/robot_parts/robot_suit = 1,
-	/obj/item/clothing/head/helmet = 1,
-	/obj/item/clothing/suit/armor/vest = 1,
-	/obj/item/robot_parts/l_leg = 1,
-	/obj/item/robot_parts/r_leg = 1,
-	/obj/item/stack/sheet/metal = 5,
-	/obj/item/stack/cable_coil = 5,
-	/obj/item/weapon/gun/energy/advtaser = 1,
-	/obj/item/weapon/cell = 1,
-	/obj/item/device/assembly/prox_sensor = 1,
-	/obj/item/robot_parts/r_arm = 1)
-	tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver)
-	time = 120
-
-/datum/crafting_recipe/table/secbot
-	name = "Secbot"
-	result_path = /obj/machinery/bot/secbot
-	reqs = list(/obj/item/device/assembly/signaler = 1,
-	/obj/item/clothing/head/helmet = 1,
-	/obj/item/weapon/melee/baton = 1,
-	/obj/item/device/assembly/prox_sensor = 1,
-	/obj/item/robot_parts/r_arm = 1)
-	tools = list(/obj/item/weapon/weldingtool)
-	time = 120
-
-/datum/crafting_recipe/table/cleanbot
-	name = "Cleanbot"
-	result_path = /obj/machinery/bot/cleanbot
-	reqs = list(/obj/item/weapon/reagent_containers/glass/bucket = 1,
-	/obj/item/device/assembly/prox_sensor = 1,
-	/obj/item/robot_parts/r_arm = 1)
-	time = 80
-
-/datum/crafting_recipe/table/floorbot
-	name = "Floorbot"
-	result_path = /obj/machinery/bot/floorbot
-	reqs = list(/obj/item/weapon/storage/toolbox/mechanical = 1,
-	/obj/item/stack/tile/plasteel = 1,
-	/obj/item/device/assembly/prox_sensor = 1,
-	/obj/item/robot_parts/r_arm = 1)
-	time = 80
-
-/datum/crafting_recipe/table/medbot
-	name = "Medbot"
-	result_path = /obj/machinery/bot/medbot
-	reqs = list(/obj/item/device/healthanalyzer = 1,
-	/obj/item/weapon/storage/firstaid = 1,
-	/obj/item/device/assembly/prox_sensor = 1,
-	/obj/item/robot_parts/r_arm = 1)
-	time = 80
-
-
-/////////////////////////////////////////////////////////