Merge branch 'master' into surgery

Conflicts:
	code/WorkInProgress/surgery.dm
	code/modules/mob/living/carbon/carbon_defines.dm

code/ATMOSPHERICS/atmospherics.dm

@@ -12,7 +12,6 @@ Pipelines + Other Objects -> Pipe network
 
 obj/machinery/atmospherics
 	anchored = 1
-	use_power = 0
 	idle_power_usage = 0
 	active_power_usage = 0
 	power_channel = ENVIRON

code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm

@@ -1,6 +1,7 @@
 obj/machinery/atmospherics/binary
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH
+	use_power = 1
 
 	var/datum/gas_mixture/air1
 	var/datum/gas_mixture/air2

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -15,7 +15,9 @@ obj/machinery/atmospherics/binary/passive_gate
 	var/datum/radio_frequency/radio_connection
 
 	update_icon()
-		if(node1&&node2)
+		if(stat & NOPOWER)
+			icon_state = "intact_off"
+		else if(node1 && node2)
 			icon_state = "intact_[on?("on"):("off")]"
 		else
 			if(node1)
@@ -24,8 +26,6 @@ obj/machinery/atmospherics/binary/passive_gate
 				icon_state = "exposed_2_off"
 			else
 				icon_state = "exposed_3_off"
-			on = 0
-
 		return
 
 	process()

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -37,7 +37,9 @@ obj/machinery/atmospherics/binary/pump
 		icon_state = "intact_on"
 
 	update_icon()
-		if(node1&&node2)
+		if(stat & NOPOWER)
+			icon_state = "intact_off"
+		else if(node1 && node2)
 			icon_state = "intact_[on?("on"):("off")]"
 		else
 			if(node1)

code/ATMOSPHERICS/components/binary_devices/volume_pump.dm

@@ -31,7 +31,9 @@ obj/machinery/atmospherics/binary/volume_pump
 		icon_state = "intact_on"
 
 	update_icon()
-		if(node1&&node2)
+		if(stat & NOPOWER)
+			icon_state = "intact_off"
+		else if(node1 && node2)
 			icon_state = "intact_[on?("on"):("off")]"
 		else
 			if(node1)

code/ATMOSPHERICS/components/portables_connector.dm

@@ -15,7 +15,7 @@
 	var/datum/pipe_network/network
 
 	var/on = 0
-
+	use_power = 0
 	level = 0
 
 

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -39,16 +39,21 @@ Filter types:
 		..()
 
 	update_icon()
-		if(node2 && node3 && node1)
+		if(stat & NOPOWER)
+			icon_state = "intact_off"
+		else if(node2 && node3 && node1)
 			icon_state = "intact_[on?("on"):("off")]"
 		else
-			icon_state = "hintact_off"
+			icon_state = "intact_off"
 			on = 0
 
 		return
 
-	New()
+	power_change()
+		var/old_stat = stat
 		..()
+		if(old_stat != stat)
+			update_icon()
 
 	process()
 		..()

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -16,7 +16,9 @@ obj/machinery/atmospherics/trinary/mixer
 	//node 3 is the outlet, nodes 1 & 2 are intakes
 
 	update_icon()
-		if(node2 && node3 && node1)
+		if(stat & NOPOWER)
+			icon_state = "intact_off"
+		else if(node2 && node3 && node1)
 			icon_state = "intact_[on?("on"):("off")]"
 		else
 			icon_state = "intact_off"
@@ -24,6 +26,12 @@ obj/machinery/atmospherics/trinary/mixer
 
 		return
 
+	power_change()
+		var/old_stat = stat
+		..()
+		if(old_stat != stat)
+			update_icon()
+
 	New()
 		..()
 		air3.volume = 300

code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm

@@ -1,6 +1,7 @@
 obj/machinery/atmospherics/trinary
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH|WEST
+	use_power = 1
 
 	var/datum/gas_mixture/air1
 	var/datum/gas_mixture/air2

code/ATMOSPHERICS/components/unary/cold_sink.dm

@@ -2,6 +2,7 @@
 	icon = 'icons/obj/atmospherics/cold_sink.dmi'
 	icon_state = "intact_off"
 	density = 1
+	use_power = 1
 
 	name = "Cold Sink"
 	desc = "Cools gas when connected to pipe network"

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -4,6 +4,7 @@
 	icon = 'icons/obj/atmospherics/cold_sink.dmi'
 	icon_state = "intact_off"
 	density = 1
+	use_power = 1
 
 	name = "Heat Reservoir"
 	desc = "Heats gas when connected to pipe network"

code/ATMOSPHERICS/components/unary/outlet_injector.dm

@@ -1,6 +1,7 @@
 /obj/machinery/atmospherics/unary/outlet_injector
 	icon = 'icons/obj/atmospherics/outlet_injector.dmi'
 	icon_state = "off"
+	use_power = 1
 
 	name = "Air Injector"
 	desc = "Has a valve and pump attached to it"
@@ -18,7 +19,7 @@
 
 	update_icon()
 		if(node)
-			if(on)
+			if(on && !(stat & NOPOWER))
 				icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]on"
 			else
 				icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
@@ -28,11 +29,18 @@
 
 		return
 
+	power_change()
+		var/old_stat = stat
+		..()
+		if(old_stat != stat)
+			update_icon()
+
+
 	process()
 		..()
 		injecting = 0
 
-		if(!on)
+		if(!on || stat & NOPOWER)
 			return 0
 
 		if(air_contents.temperature > 0)

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -4,15 +4,15 @@
 
 	name = "Air Vent"
 	desc = "Has a valve and pump attached to it"
+	use_power = 1
 
+	var/area/initial_loc
 	level = 1
 	var/area_uid
-	var/id_tag
-	power_channel = ENVIRON
+	var/id_tag = null
 
 	var/on = 0
 	var/pump_direction = 1 //0 = siphoning, 1 = releasing
-	var/pump_speed = 1 //Used to adjust speed for siphons
 
 	var/external_pressure_bound = ONE_ATMOSPHERE
 	var/internal_pressure_bound = 0
@@ -43,27 +43,25 @@
 			icon_state = "in"
 
 	New()
-		var/area/A = get_area(loc)
-		if (A.master)
-			A = A.master
-		area_uid = A.uid
+		initial_loc = get_area(loc)
+		if (initial_loc.master)
+			initial_loc = initial_loc.master
+		area_uid = initial_loc.uid
 		if (!id_tag)
 			assign_uid()
 			id_tag = num2text(uid)
 		if(ticker && ticker.current_state == 3)//if the game is running
-			initialize()
-			broadcast_status()
+			src.initialize()
+			src.broadcast_status()
 		..()
 
 	high_volume
 		name = "Large Air Vent"
 		power_channel = EQUIP
-
 		New()
 			..()
 			air_contents.volume = 1000
 
-
 	update_icon()
 		if(welded)
 			icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]weld"
@@ -80,12 +78,11 @@
 
 	process()
 		..()
-//		broadcast_status()
 		if(stat & (NOPOWER|BROKEN))
 			return
 		if (!node)
 			on = 0
-
+		//broadcast_status() // from now air alarm/control computer should request update purposely --rastaf0
 		if(!on)
 			return 0
 
@@ -105,7 +102,7 @@
 
 			if(pressure_delta > 0)
 				if(air_contents.temperature > 0)
-					var/transfer_moles = pressure_delta*environment.volume*environment.group_multiplier*pump_speed/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
+					var/transfer_moles = pressure_delta*environment.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
 
 					var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
 
@@ -123,7 +120,7 @@
 
 			if(pressure_delta > 0)
 				if(environment.temperature > 0)
-					var/transfer_moles = pressure_delta*air_contents.volume*air_contents.group_multiplier*pump_speed/(environment.temperature * R_IDEAL_GAS_EQUATION)
+					var/transfer_moles = pressure_delta*air_contents.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
 
 					var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
 					if (isnull(removed)) //in space
@@ -136,42 +133,45 @@
 
 		return 1
 
-
-
-
 	//Radio remote control
 
-	proc/set_frequency(new_frequency)
-		radio_controller.remove_object(src, frequency)
-		frequency = new_frequency
-		if(frequency)
-			radio_connection = radio_controller.add_object(src, frequency,radio_filter_in)
+	proc
+		set_frequency(new_frequency)
+			radio_controller.remove_object(src, frequency)
+			frequency = new_frequency
+			if(frequency)
+				radio_connection = radio_controller.add_object(src, frequency,radio_filter_in)
 
-	proc/broadcast_status()
-		if(!radio_connection)
-			return 0
+		broadcast_status()
+			if(!radio_connection)
+				return 0
 
-		var/datum/signal/signal = new
-		signal.transmission_method = 1 //radio signal
-		signal.source = src
+			var/datum/signal/signal = new
+			signal.transmission_method = 1 //radio signal
+			signal.source = src
 
-		signal.data = list(
-			"area" = src.area_uid,
-			"tag" = src.id_tag,
-			"device" = "AVP",
-			"power" = on,
-			"direction" = pump_direction?("release"):("siphon"),
-			"checks" = pressure_checks,
-			"internal" = internal_pressure_bound,
-			"external" = external_pressure_bound,
-			"timestamp" = world.time,
-			"sigtype" = "status",
-			"setting" = pump_speed
-		)
+			signal.data = list(
+				"area" = src.area_uid,
+				"tag" = src.id_tag,
+				"device" = "AVP",
+				"power" = on,
+				"direction" = pump_direction?("release"):("siphon"),
+				"checks" = pressure_checks,
+				"internal" = internal_pressure_bound,
+				"external" = external_pressure_bound,
+				"timestamp" = world.time,
+				"sigtype" = "status"
+			)
 
-		radio_connection.post_signal(src, signal, radio_filter_out)
+			if(!initial_loc.air_vent_names[id_tag])
+				var/new_name = "[initial_loc.name] Vent Pump #[initial_loc.air_vent_names.len+1]"
+				initial_loc.air_vent_names[id_tag] = new_name
+				src.name = new_name
+			initial_loc.air_vent_info[id_tag] = signal.data
 
-		return 1
+			radio_connection.post_signal(src, signal, radio_filter_out)
+
+			return 1
 
 
 	initialize()
@@ -183,7 +183,6 @@
 		if(frequency)
 			set_frequency(frequency)
 
-
 	receive_signal(datum/signal/signal)
 		if(stat & (NOPOWER|BROKEN))
 			return
@@ -191,49 +190,67 @@
 		if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
 			return 0
 
-		if("purge" in signal.data)
+		if(signal.data["purge"] != null)
 			pressure_checks &= ~1
 			pump_direction = 0
 
-		if("stabalize" in signal.data)
+		if(signal.data["stabalize"] != null)
 			pressure_checks |= 1
 			pump_direction = 1
 
-		if("power" in signal.data)
+		if(signal.data["power"] != null)
 			on = text2num(signal.data["power"])
 
-		if("power_toggle" in signal.data)
+		if(signal.data["power_toggle"] != null)
 			on = !on
 
-		if("checks" in signal.data)
+		if(signal.data["checks"] != null)
 			pressure_checks = text2num(signal.data["checks"])
 
-		if("checks_toggle" in signal.data)
+		if(signal.data["checks_toggle"] != null)
 			pressure_checks = (pressure_checks?0:3)
 
-		if("direction" in signal)
+		if(signal.data["direction"] != null)
 			pump_direction = text2num(signal.data["direction"])
 
-		if("set_internal_pressure" in signal.data)
-			internal_pressure_bound = between(0, text2num(signal.data["set_internal_pressure"]), ONE_ATMOSPHERE*50)
+		if(signal.data["set_internal_pressure"] != null)
+			internal_pressure_bound = between(
+				0,
+				text2num(signal.data["set_internal_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
 
-		if("set_external_pressure" in signal.data)
-			external_pressure_bound = between(0, text2num(signal.data["set_external_pressure"]), ONE_ATMOSPHERE*50)
+		if(signal.data["set_external_pressure"] != null)
+			external_pressure_bound = between(
+				0,
+				text2num(signal.data["set_external_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
 
-		if("adjust_internal_pressure" in signal.data)
-			internal_pressure_bound = between(0, internal_pressure_bound +  text2num(signal.data["adjust_internal_pressure"]), ONE_ATMOSPHERE*50)
+		if(signal.data["adjust_internal_pressure"] != null)
+			internal_pressure_bound = between(
+				0,
+				internal_pressure_bound + text2num(signal.data["adjust_internal_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
 
-		if("adjust_external_pressure" in signal.data)
-			external_pressure_bound = between(0, external_pressure_bound +  text2num(signal.data["adjust_external_pressure"]), ONE_ATMOSPHERE*50)
+		if(signal.data["adjust_external_pressure"] != null)
+			external_pressure_bound = between(
+				0,
+				external_pressure_bound + text2num(signal.data["adjust_external_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
 
-		if("init" in signal.data)
+		if(signal.data["init"] != null)
 			name = signal.data["init"]
 			return
 
-		if("setting" in signal.data)
-			pump_speed = text2num(signal.data["setting"])
+		if(signal.data["status"] != null)
+			spawn(2)
+				broadcast_status()
+			return //do not update_icon
 
-			//log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal["command"]]\"\n[signal.debug_print()]")
+			//log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
 		spawn(2)
 			broadcast_status()
 		update_icon()
@@ -274,7 +291,6 @@
 			else
 				user << "\blue You need more welding fuel to complete this task."
 				return 1
-
 	examine()
 		set src in oview(1)
 		..()
@@ -312,4 +328,11 @@
 				"\blue You have unfastened \the [src].", \
 				"You hear ratchet.")
 			new /obj/item/pipe(loc, make_from=src)
-			del(src)
+			del(src)
+
+/obj/machinery/atmospherics/unary/vent_pump/Del()
+	if(initial_loc)
+		initial_loc.air_vent_info -= id_tag
+		initial_loc.air_vent_names -= id_tag
+	..()
+	return

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -4,39 +4,38 @@
 
 	name = "Air Scrubber"
 	desc = "Has a valve and pump attached to it"
+	use_power = 1
 
 	level = 1
 
+	var/area/initial_loc
 	var/id_tag = null
+	var/frequency = 1439
+	var/datum/radio_frequency/radio_connection
 
 	var/on = 0
 	var/scrubbing = 1 //0 = siphoning, 1 = scrubbing
 	var/scrub_CO2 = 1
 	var/scrub_Toxins = 0
 	var/scrub_N2O = 0
-	var/scrub_rate = 1
 
 	var/volume_rate = 120
 	var/panic = 0 //is this scrubber panicked?
 
 	var/area_uid
-
-	var/frequency = 1439
-	var/datum/radio_frequency/radio_connection
 	var/radio_filter_out
 	var/radio_filter_in
-
 	New()
-		var/area/A = get_area(loc)
-		if (A.master)
-			A = A.master
-		area_uid = A.uid
+		initial_loc = get_area(loc)
+		if (initial_loc.master)
+			initial_loc = initial_loc.master
+		area_uid = initial_loc.uid
 		if (!id_tag)
 			assign_uid()
 			id_tag = num2text(uid)
 		if(ticker && ticker.current_state == 3)//if the game is running
-			initialize()
-			broadcast_status()
+			src.initialize()
+			src.broadcast_status()
 		..()
 
 	update_icon()
@@ -75,6 +74,11 @@
 				"filter_n2o" = scrub_N2O,
 				"sigtype" = "status"
 			)
+			if(!initial_loc.air_scrub_names[id_tag])
+				var/new_name = "[initial_loc.name] Air Scrubber #[initial_loc.air_scrub_names.len+1]"
+				initial_loc.air_scrub_names[id_tag] = new_name
+				src.name = new_name
+			initial_loc.air_scrub_info[id_tag] = signal.data
 			radio_connection.post_signal(src, signal, radio_filter_out)
 
 			return 1
@@ -88,20 +92,20 @@
 
 	process()
 		..()
-//		broadcast_status()
 		if(stat & (NOPOWER|BROKEN))
 			return
 		if (!node)
 			on = 0
-
+		//broadcast_status()
 		if(!on)
 			return 0
 
+
 		var/datum/gas_mixture/environment = loc.return_air()
 
 		if(scrubbing)
 			if((environment.toxins>0) || (environment.carbon_dioxide>0) || (environment.trace_gases.len>0))
-				var/transfer_moles = min(1, volume_rate*scrub_rate/environment.volume)*environment.total_moles
+				var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles()
 
 				//Take a gas sample
 				var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
@@ -120,14 +124,15 @@
 
 				if(removed.trace_gases.len>0)
 					for(var/datum/gas/trace_gas in removed.trace_gases)
-						if(istype(trace_gas, /datum/gas/sleeping_agent) && scrub_N2O)
+						if(istype(trace_gas, /datum/gas/oxygen_agent_b))
+							removed.trace_gases -= trace_gas
+							filtered_out.trace_gases += trace_gas
+						else if(istype(trace_gas, /datum/gas/sleeping_agent) && scrub_N2O)
 							removed.trace_gases -= trace_gas
 							filtered_out.trace_gases += trace_gas
 
 
 				//Remix the resulting gases
-				filtered_out.update_values()
-				removed.update_values()
 				air_contents.merge(filtered_out)
 
 				loc.assume_air(removed)
@@ -139,7 +144,7 @@
 			if (air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
 				return
 
-			var/transfer_moles = environment.total_moles*(volume_rate*scrub_rate/environment.volume)
+			var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume)
 
 			var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
 
@@ -168,13 +173,13 @@
 		if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
 			return 0
 
-		if("power" in signal.data)
+		if(signal.data["power"] != null)
 			on = text2num(signal.data["power"])
-		if("power_toggle" in signal.data)
+		if(signal.data["power_toggle"] != null)
 			on = !on
 
-		if("panic_siphon" in signal.data) //must be before if("scrubbing" thing
-			panic = text2num(signal.data["panic_siphon"])
+		if(signal.data["panic_siphon"]) //must be before if("scrubbing" thing
+			panic = text2num(signal.data["panic_siphon"] != null)
 			if(panic)
 				on = 1
 				scrubbing = 0
@@ -182,7 +187,7 @@
 			else
 				scrubbing = 1
 				volume_rate = initial(volume_rate)
-		if("toggle_panic_siphon" in signal.data)
+		if(signal.data["toggle_panic_siphon"] != null)
 			panic = !panic
 			if(panic)
 				on = 1
@@ -192,38 +197,35 @@
 				scrubbing = 1
 				volume_rate = initial(volume_rate)
 
-		if("scrubbing" in signal.data)
+		if(signal.data["scrubbing"] != null)
 			scrubbing = text2num(signal.data["scrubbing"])
-		if("toggle_scrubbing" in signal.data)
+		if(signal.data["toggle_scrubbing"])
 			scrubbing = !scrubbing
 
-		if("co2_scrub" in signal.data)
+		if(signal.data["co2_scrub"] != null)
 			scrub_CO2 = text2num(signal.data["co2_scrub"])
-		if("toggle_co2_scrub" in signal.data)
+		if(signal.data["toggle_co2_scrub"])
 			scrub_CO2 = !scrub_CO2
 
-		if("tox_scrub" in signal.data)
+		if(signal.data["tox_scrub"] != null)
 			scrub_Toxins = text2num(signal.data["tox_scrub"])
-		if("toggle_tox_scrub" in signal.data)
+		if(signal.data["toggle_tox_scrub"])
 			scrub_Toxins = !scrub_Toxins
 
-		if("n2o_scrub" in signal.data)
+		if(signal.data["n2o_scrub"] != null)
 			scrub_N2O = text2num(signal.data["n2o_scrub"])
-		if("toggle_n2o_scrub" in signal.data)
+		if(signal.data["toggle_n2o_scrub"])
 			scrub_N2O = !scrub_N2O
 
-		if("init" in signal.data)
+		if(signal.data["init"] != null)
 			name = signal.data["init"]
 			return
 
-		if("status" in signal.data)
+		if(signal.data["status"] != null)
 			spawn(2)
 				broadcast_status()
 			return //do not update_icon
 
-		if("setting" in signal.data)
-			scrub_rate = text2num(signal.data["setting"])
-
 //			log_admin("DEBUG \[[world.timeofday]\]: vent_scrubber/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
 		spawn(2)
 			broadcast_status()
@@ -231,7 +233,7 @@
 		return
 
 	power_change()
-		if(powered(ENVIRON))
+		if(powered(power_channel))
 			stat &= ~NOPOWER
 		else
 			stat |= NOPOWER
@@ -261,4 +263,11 @@
 				"\blue You have unfastened \the [src].", \
 				"You hear ratchet.")
 			new /obj/item/pipe(loc, make_from=src)
-			del(src)
+			del(src)
+
+/obj/machinery/atmospherics/unary/vent_scrubber/Del()
+	if(initial_loc)
+		initial_loc.air_scrub_info -= id_tag
+		initial_loc.air_scrub_names -= id_tag
+	..()
+	return

code/ATMOSPHERICS/pipes.dm

@@ -4,9 +4,10 @@ obj/machinery/atmospherics/pipe
 	var/datum/pipeline/parent
 
 	var/volume = 0
-	var/force = 20
+	force = 20
 
 	layer = 2.4 //under wires with their 2.44
+	use_power = 0
 
 	var/alert_pressure = 80*ONE_ATMOSPHERE
 		//minimum pressure before check_pressure(...) should be called

code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm

@@ -368,7 +368,7 @@ mob
 				network.marker = rand(1,4)
 
 			for(var/obj/machinery/atmospherics/pipe/P in world)
-				P.overlays = null
+				P.overlays.Cut()
 
 				var/datum/pipe_network/master = P.return_network()
 				if(master)
@@ -378,7 +378,7 @@ mob
 					P.overlays += icon('icons/Testing/atmos_testing.dmi',"marker0")
 
 			for(var/obj/machinery/atmospherics/valve/V in world)
-				V.overlays = null
+				V.overlays.Cut()
 
 				if(V.network_node1)
 					V.overlays += icon('icons/Testing/atmos_testing.dmi',"marker[V.network_node1.marker]")
@@ -396,7 +396,7 @@ turf/simulated
 	verb
 		mark_direction()
 			set src in world
-			overlays = null
+			overlays.Cut()
 			for(var/direction in list(NORTH,SOUTH,EAST,WEST))
 				if(group_border&direction)
 					overlays += icon('icons/Testing/turf_analysis.dmi',"red_arrow",direction)

code/FEA/FEA_fire.dm

@@ -62,101 +62,114 @@
 	var/bypassing = 0
 
 
-	proc/perform_exposure()
-		var/turf/simulated/floor/location = loc
-		if(!istype(location))	return 0
+/obj/effect/hotspot/proc/perform_exposure()
+	var/turf/simulated/floor/location = loc
+	if(!istype(location))	return 0
 
-		if(volume > CELL_VOLUME*0.95)	bypassing = 1
-		else bypassing = 0
+	if(volume > CELL_VOLUME*0.95)	bypassing = 1
+	else bypassing = 0
 
-		if(bypassing)
-			if(!just_spawned)
-				volume = location.air.fuel_burnt*FIRE_GROWTH_RATE
-				temperature = location.air.temperature
-		else
-			var/datum/gas_mixture/affected = location.air.remove_ratio(volume/location.air.volume)
-			affected.temperature = temperature
-			affected.react()
-			temperature = affected.temperature
-			volume = affected.fuel_burnt*FIRE_GROWTH_RATE
-			location.assume_air(affected)
+	if(bypassing)
+		if(!just_spawned)
+			volume = location.air.fuel_burnt*FIRE_GROWTH_RATE
+			temperature = location.air.temperature
+	else
+		var/datum/gas_mixture/affected = location.air.remove_ratio(volume/location.air.volume)
+		affected.temperature = temperature
+		affected.react()
+		temperature = affected.temperature
+		volume = affected.fuel_burnt*FIRE_GROWTH_RATE
+		location.assume_air(affected)
 
-			for(var/atom/item in loc)
-				item.temperature_expose(null, temperature, volume)
+	for(var/atom/item in loc)
+		if(!bypassing)
+			item.temperature_expose(null, temperature, volume)
+		if(item) // It's possible that the item is deleted in temperature_expose
+			item.fire_act(null, temperature, volume)
+
+	return 0
+
+
+/obj/effect/hotspot/process(turf/simulated/list/possible_spread)
+	if(just_spawned)
+		just_spawned = 0
 		return 0
 
+	var/turf/simulated/floor/location = loc
+	if(!istype(location))
+		Kill()
 
-	process(turf/simulated/list/possible_spread)
-		if(just_spawned)
-			just_spawned = 0
-			return 0
+	if((temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST) || (volume <= 1))
+		Kill()
 
-		var/turf/simulated/floor/location = loc
-		if(!istype(location))
-			del(src)
+	if(location.air.toxins < 0.5 || location.air.oxygen < 0.5)
+		Kill()
 
-		if((temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST) || (volume <= 1))
-			del(src)
+	perform_exposure()
 
-		if(location.air.toxins < 0.5 || location.air.oxygen < 0.5)
-			del(src)
+	if(location.wet) location.wet = 0
 
-		perform_exposure()
+	if(bypassing)
+		icon_state = "3"
+		location.burn_tile()
 
-		if(location.wet) location.wet = 0
+		//Possible spread due to radiated heat
+		if(location.air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_SPREAD)
+			var/radiated_temperature = location.air.temperature*FIRE_SPREAD_RADIOSITY_SCALE
 
-		if(bypassing)
-			icon_state = "3"
-			location.burn_tile()
-
-			//Possible spread due to radiated heat
-			if(location.air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_SPREAD)
-				var/radiated_temperature = location.air.temperature*FIRE_SPREAD_RADIOSITY_SCALE
-
-				for(var/turf/simulated/possible_target in possible_spread)
-					if(!possible_target.active_hotspot)
-						possible_target.hotspot_expose(radiated_temperature, CELL_VOLUME/4)
+			for(var/turf/simulated/possible_target in possible_spread)
+				if(!possible_target.active_hotspot)
+					possible_target.hotspot_expose(radiated_temperature, CELL_VOLUME/4)
 
+	else
+		if(volume > CELL_VOLUME*0.4)
+			icon_state = "2"
 		else
-			if(volume > CELL_VOLUME*0.4)
-				icon_state = "2"
+			icon_state = "1"
+
+	if(temperature > location.max_fire_temperature_sustained)
+		location.max_fire_temperature_sustained = temperature
+
+	if(temperature > location.heat_capacity)
+		location.to_be_destroyed = 1
+		/*if(prob(25))
+			location.ReplaceWithSpace()
+			return 0*/
+	return 1
+
+// Garbage collect itself by nulling reference to it
+
+/obj/effect/hotspot/proc/Kill()
+	DestroyTurf()
+	if(istype(loc, /turf/simulated))
+		var/turf/simulated/T = loc
+		if(T.active_hotspot == src)
+			T.active_hotspot = null
+	loc = null
+
+/obj/effect/hotspot/proc/DestroyTurf()
+
+	if(istype(loc, /turf/simulated))
+		var/turf/simulated/T = loc
+		if(T.to_be_destroyed)
+			var/chance_of_deletion
+			if (T.heat_capacity) //beware of division by zero
+				chance_of_deletion = T.max_fire_temperature_sustained / T.heat_capacity * 8 //there is no problem with prob(23456), min() was redundant --rastaf0
 			else
-				icon_state = "1"
+				chance_of_deletion = 100
+			if(prob(chance_of_deletion))
+				T.ChangeTurf(/turf/space)
+			else
+				T.to_be_destroyed = 0
+				T.max_fire_temperature_sustained = 0
 
-		if(temperature > location.max_fire_temperature_sustained)
-			location.max_fire_temperature_sustained = temperature
+/obj/effect/hotspot/New()
+	..()
+	dir = pick(cardinal)
+	return
 
-		if(temperature > location.heat_capacity)
-			location.to_be_destroyed = 1
-			/*if(prob(25))
-				location.ReplaceWithSpace()
-				return 0*/
-		return 1
-
-
-	New()
-		..()
-		dir = pick(cardinal)
-		return
-
-
-	Del()
-		if (istype(loc, /turf/simulated))
-			var/turf/simulated/T = loc
-			loc:active_hotspot = null
-
-			if(T.to_be_destroyed)
-				var/chance_of_deletion
-				if (T.heat_capacity) //beware of division by zero
-					chance_of_deletion = T.max_fire_temperature_sustained / T.heat_capacity * 8 //there is no problem with prob(23456), min() was redundant --rastaf0
-				else
-					chance_of_deletion = 100
-				if(prob(chance_of_deletion))
-					T.ChangeTurf(/turf/space)
-				else
-					T.to_be_destroyed = 0
-					T.max_fire_temperature_sustained = 0
-
-			loc = null
-		..()
-		return
+/obj/effect/hotspot/Del()
+	if (istype(loc, /turf/simulated))
+		DestroyTurf()
+	..()
+	return

code/FEA/FEA_turf_tile.dm

@@ -124,7 +124,7 @@ turf
 			super_conduct()
 
 			update_visuals(datum/gas_mixture/model)
-				overlays = null
+				overlays.Cut()
 
 				var/siding_icon_state = return_siding_icon_state()
 				if(siding_icon_state)

code/WorkInProgress/Cael_Aislinn/Jungle/falsewall.dm

@@ -0,0 +1,59 @@
+//simplified copy of /obj/structure/falsewall
+
+/obj/effect/landmark/falsewall_spawner
+	name = "falsewall spawner"
+
+/obj/structure/temple_falsewall
+	name = "wall"
+	anchored = 1
+	icon = 'icons/turf/walls.dmi'
+	icon_state = "plasma0"
+	opacity = 1
+	var/closed_wall_dir = 0
+	var/opening = 0
+	var/mineral = "plasma"
+	var/is_metal = 0
+
+/obj/structure/temple_falsewall/New()
+	..()
+	spawn(10)
+		if(prob(95))
+			desc = pick("Something seems slightly off about it.","")
+
+		var/junction = 0 //will be used to determine from which side the wall is connected to other walls
+
+		for(var/turf/unsimulated/wall/W in orange(src,1))
+			if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
+				junction |= get_dir(src,W)
+
+		closed_wall_dir = junction
+		density = 1
+		icon_state = "[mineral][closed_wall_dir]"
+
+/obj/structure/temple_falsewall/attack_hand(mob/user as mob)
+	if(opening)
+		return
+
+	if(density)
+		opening = 1
+		if(is_metal)
+			icon_state = "metalfwall_open"
+			flick("metalfwall_opening", src)
+		else
+			icon_state = "[mineral]fwall_open"
+			flick("[mineral]fwall_opening", src)
+		sleep(15)
+		src.density = 0
+		SetOpacity(0)
+		opening = 0
+	else
+		opening = 1
+		icon_state = "[mineral][closed_wall_dir]"
+		if(is_metal)
+			flick("metalfwall_closing", src)
+		else
+			flick("[mineral]fwall_closing", src)
+		density = 1
+		sleep(15)
+		SetOpacity(1)
+		opening = 0

code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dm

@@ -0,0 +1,347 @@
+//some testin stuff
+
+#define PATH_SPREAD_CHANCE_START 90
+#define PATH_SPREAD_CHANCE_LOSS_UPPER 80
+#define PATH_SPREAD_CHANCE_LOSS_LOWER 50
+
+#define RIVER_SPREAD_CHANCE_START 100
+#define RIVER_SPREAD_CHANCE_LOSS_UPPER 65
+#define RIVER_SPREAD_CHANCE_LOSS_LOWER 50
+
+#define RANDOM_UPPER_X 100
+#define RANDOM_UPPER_Y 100
+
+#define RANDOM_LOWER_X 18
+#define RANDOM_LOWER_Y 18
+
+/area/jungle
+	name = "jungle"
+	icon = 'code/workinprogress/cael_aislinn/jungle/jungle.dmi'
+	icon_state = "area"
+	lighting_use_dynamic = 0
+	luminosity = 1
+
+//randomly spawns, will create paths around the map
+/obj/effect/landmark/path_waypoint
+	name = "path waypoint"
+	icon_state = "x2"
+	var/connected = 0
+
+/obj/effect/landmark/temple
+	name = "temple entrance"
+	icon_state = "x2"
+	var/obj/structure/ladder/my_ladder
+
+	New()
+		//pick a random temple to link to
+		var/list/waypoints = list()
+		for(var/obj/effect/landmark/temple/destination/T in world)
+			waypoints.Add(T)
+		var/obj/effect/landmark/temple/destination/dest_temple = pick(waypoints)
+		dest_temple.init()
+
+		//connect this landmark to the other
+		my_ladder = new /obj/structure/ladder(src.loc)
+		my_ladder.id = dest_temple.my_ladder.id
+		dest_temple.my_ladder.up = my_ladder
+
+		//delete the landmarks now that we're finished
+		del(dest_temple)
+		del(src)
+
+/obj/effect/landmark/temple/destination/New()
+	//nothing
+
+/obj/effect/landmark/temple/destination/proc/init()
+	my_ladder = new /obj/structure/ladder(src.loc)
+	my_ladder.id = rand(999)
+	my_ladder.height = -1
+
+	//loop over the walls in the temple and make them a random pre-chosen mineral (null is a stand in for plasma, which the walls already are)
+	//treat plasma slightly differently because it's the default wall type
+	var/mineral = pick("uranium","sandstone","gold","iron","silver","diamond","clown","plasma")
+	//world << "init [mineral]"
+	var/area/my_area = get_area(src)
+	var/list/temple_turfs = get_area_turfs(my_area.type)
+
+	for(var/turf/simulated/floor/T in temple_turfs)
+
+		for(var/obj/effect/landmark/falsewall_spawner/F in T.contents)
+			var/obj/structure/temple_falsewall/fwall = new(F.loc)
+			fwall.mineral = mineral
+			if(mineral == "iron")
+				fwall.is_metal = 1
+			del(F)
+
+		for(var/obj/effect/landmark/door_spawner/D in T.contents)
+			var/spawn_type
+			if(mineral == "iron")
+				spawn_type = text2path("/obj/machinery/door/airlock/vault")
+			else
+				spawn_type = text2path("/obj/machinery/door/airlock/[mineral]")
+			new spawn_type(D.loc)
+			del(D)
+
+	for(var/turf/unsimulated/wall/T in temple_turfs)
+		if(mineral != "plasma")
+			T.icon_state = replacetext(T.icon_state, "plasma", mineral)
+
+		/*for(var/obj/effect/landmark/falsewall_spawner/F in T.contents)
+			//world << "falsewall_spawner found in wall"
+			var/obj/structure/temple_falsewall/fwall = new(F.loc)
+			fwall.mineral = mineral
+			del(F)
+
+		for(var/obj/effect/landmark/door_spawner/D in T.contents)
+			//world << "door_spawner found in wall"
+			T = new /turf/unsimulated/floor(T.loc)
+			T.icon_state = "dark"
+			var/spawn_type = text2path("/obj/machinery/door/airlock/[door_mineral]")
+			new spawn_type(T)
+			del(D)*/
+
+//a shuttle has crashed somewhere on the map, it should have a power cell to let the adventurers get home
+/area/jungle/crash_ship_source
+	icon_state = "crash"
+
+/area/jungle/crash_ship_clean
+	icon_state = "crash"
+
+/area/jungle/crash_ship_one
+	icon_state = "crash"
+
+/area/jungle/crash_ship_two
+	icon_state = "crash"
+
+/area/jungle/crash_ship_three
+	icon_state = "crash"
+
+/area/jungle/crash_ship_four
+	icon_state = "crash"
+
+//randomly spawns, will create rivers around the map
+//uses the same logic as jungle paths
+/obj/effect/landmark/river_waypoint
+	name = "river source waypoint"
+	var/connected = 0
+
+/obj/machinery/jungle_controller
+	name = "jungle controller"
+	desc = "a mysterious and ancient piece of machinery"
+	var/list/animal_spawners = list()
+
+	New()
+		..()
+		Initialise()
+
+/obj/machinery/jungle_controller/proc/Initialise()
+	set background = 1
+	spawn(0)
+		world << "\red \b Setting up jungle, this may take a moment..."
+
+		//crash dat shuttle
+		var/area/start_location = locate(/area/jungle/crash_ship_source)
+		var/area/clean_location = locate(/area/jungle/crash_ship_clean)
+		var/list/ship_locations = list(/area/jungle/crash_ship_one, /area/jungle/crash_ship_two, /area/jungle/crash_ship_three, /area/jungle/crash_ship_four)
+		var/area/end_location = locate( pick(ship_locations) )
+		ship_locations -= end_location.type
+
+		start_location.move_contents_to(end_location)
+		for(var/area_type in ship_locations)
+			var/area/cur_location = locate(area_type)
+			clean_location.copy_turfs_to(cur_location)
+
+		//drop some random river nodes
+		var/list/river_nodes = list()
+		var/max = rand(1,3)
+		var/num_spawned = 0
+		while(num_spawned < max)
+			var/turf/unsimulated/jungle/J = locate(rand(RANDOM_LOWER_X, RANDOM_UPPER_X), rand(RANDOM_LOWER_Y, RANDOM_UPPER_Y), src.z)
+			if(!istype(J))
+				continue
+			if(!J.bushes_spawn)
+				continue
+			river_nodes.Add(new /obj/effect/landmark/river_waypoint(J))
+			num_spawned++
+
+		//make some randomly pathing rivers
+		for(var/obj/effect/landmark/river_waypoint/W in world)
+			if (W.z != src.z || W.connected)
+				continue
+
+			W.connected = 1
+			var/turf/cur_turf = new /turf/unsimulated/jungle/water(get_turf(W))
+			var/turf/target_turf = get_turf(pick(river_nodes))
+
+			var/detouring = 0
+			var/cur_dir = get_dir(cur_turf, target_turf)
+			//
+			while(cur_turf != target_turf)
+				//randomly snake around a bit
+				if(detouring)
+					if(prob(20))
+						detouring = 0
+						cur_dir = get_dir(cur_turf, target_turf)
+				else if(prob(20))
+					detouring = 1
+					if(prob(50))
+						cur_dir = turn(cur_dir, 45)
+					else
+						cur_dir = turn(cur_dir, -45)
+				else
+					cur_dir = get_dir(cur_turf, target_turf)
+
+				cur_turf = get_step(cur_turf, cur_dir)
+
+				var/skip = 0
+				if(!istype(cur_turf, /turf/unsimulated/jungle) || istype(cur_turf, /turf/unsimulated/jungle/rock))
+					detouring = 0
+					cur_dir = get_dir(cur_turf, target_turf)
+					cur_turf = get_step(cur_turf, cur_dir)
+					continue
+
+				if(!skip)
+					var/turf/unsimulated/jungle/water/water_turf = new(cur_turf)
+					water_turf.Spread(75, rand(65, 25))
+
+		var/list/path_nodes = list()
+
+		//place some ladders leading down to pre-generated temples
+		max = rand(2,5)
+		num_spawned = 0
+		while(num_spawned < max)
+			var/turf/unsimulated/jungle/J = locate(rand(RANDOM_LOWER_X, RANDOM_UPPER_X), rand(RANDOM_LOWER_Y, RANDOM_UPPER_Y), src.z)
+			if(!J || !J.bushes_spawn)
+				continue
+			new /obj/effect/landmark/temple(J)
+			path_nodes.Add(new /obj/effect/landmark/path_waypoint(J))
+			num_spawned++
+
+		//put a native tribe somewhere
+		num_spawned = 0
+		while(num_spawned < 1)
+			var/turf/unsimulated/jungle/J = locate(rand(RANDOM_LOWER_X, RANDOM_UPPER_X), rand(RANDOM_LOWER_Y, RANDOM_UPPER_Y), src.z)
+			if(!J || !J.bushes_spawn)
+				continue
+			new /obj/effect/jungle_tribe_spawn(J)
+			path_nodes.Add(new /obj/effect/landmark/path_waypoint(J))
+			num_spawned++
+
+		//place some random path waypoints to confuse players
+		max = rand(1,3)
+		num_spawned = 0
+		while(num_spawned < max)
+			var/turf/unsimulated/jungle/J = locate(rand(RANDOM_LOWER_X, RANDOM_UPPER_X), rand(RANDOM_LOWER_Y, RANDOM_UPPER_Y), src.z)
+			if(!J || !J.bushes_spawn)
+				continue
+			path_nodes.Add(new /obj/effect/landmark/path_waypoint(J))
+			num_spawned++
+
+		//get any path nodes placed on the map
+		for(var/obj/effect/landmark/path_waypoint/W in world)
+			if (W.z == src.z)
+				path_nodes.Add(W)
+
+		//make random, connecting paths
+		for(var/obj/effect/landmark/path_waypoint/W in path_nodes)
+			if (W.connected)
+				continue
+
+			W.connected = 1
+			var/turf/cur_turf = get_turf(W)
+			path_nodes.Remove(W)
+			var/turf/target_turf = get_turf(pick(path_nodes))
+			path_nodes.Add(W)
+			//
+			cur_turf = new /turf/unsimulated/jungle/path(cur_turf)
+
+			var/detouring = 0
+			var/cur_dir = get_dir(cur_turf, target_turf)
+			//
+			while(cur_turf != target_turf)
+				//randomly snake around a bit
+				if(detouring)
+					if(prob(20) || get_dist(cur_turf, target_turf) < 5)
+						detouring = 0
+						cur_dir = get_dir(cur_turf, target_turf)
+				else if(prob(20) && get_dist(cur_turf, target_turf) > 5)
+					detouring = 1
+					if(prob(50))
+						cur_dir = turn(cur_dir, 45)
+					else
+						cur_dir = turn(cur_dir, -45)
+				else
+					cur_dir = get_dir(cur_turf, target_turf)
+
+				//move a step forward
+				cur_turf = get_step(cur_turf, cur_dir)
+
+				//if we're not a jungle turf, get back to what we were doing
+				if(!istype(cur_turf, /turf/unsimulated/jungle/))
+					cur_dir = get_dir(cur_turf, target_turf)
+					cur_turf = get_step(cur_turf, cur_dir)
+					continue
+
+				var/turf/unsimulated/jungle/J = cur_turf
+				if(istype(J, /turf/unsimulated/jungle/impenetrable) || istype(J, /turf/unsimulated/jungle/water/deep))
+					cur_dir = get_dir(cur_turf, target_turf)
+					cur_turf = get_step(cur_turf, cur_dir)
+					continue
+
+				if(!istype(J, /turf/unsimulated/jungle/water))
+					J = new /turf/unsimulated/jungle/path(cur_turf)
+					J.Spread(PATH_SPREAD_CHANCE_START, rand(PATH_SPREAD_CHANCE_LOSS_UPPER, PATH_SPREAD_CHANCE_LOSS_LOWER))
+
+		//create monkey spawners
+		num_spawned = 0
+		max = rand(3,6)
+		while(num_spawned < max)
+			var/turf/unsimulated/jungle/J = locate(rand(RANDOM_LOWER_X, RANDOM_UPPER_X), rand(RANDOM_LOWER_Y, RANDOM_UPPER_Y), src.z)
+			if(!J || !J.bushes_spawn)
+				continue
+			animal_spawners.Add(new /obj/effect/landmark/animal_spawner/monkey(J))
+			num_spawned++
+
+		//create panther spawners
+		num_spawned = 0
+		max = rand(6,12)
+		while(num_spawned < max)
+			var/turf/unsimulated/jungle/J = locate(rand(RANDOM_LOWER_X, RANDOM_UPPER_X), rand(RANDOM_LOWER_Y, RANDOM_UPPER_Y), src.z)
+			if(!J || !istype(J) ||  !J.bushes_spawn)
+				continue
+			animal_spawners.Add(new /obj/effect/landmark/animal_spawner/panther(J))
+			num_spawned++
+
+		//create snake spawners
+		num_spawned = 0
+		max = rand(6,12)
+		while(num_spawned < max)
+			var/turf/unsimulated/jungle/J = locate(rand(RANDOM_LOWER_X, RANDOM_UPPER_X), rand(RANDOM_LOWER_Y, RANDOM_UPPER_Y), src.z)
+			if(!J || !istype(J) || !J.bushes_spawn)
+				continue
+			animal_spawners.Add(new /obj/effect/landmark/animal_spawner/snake(J))
+			num_spawned++
+
+		//create parrot spawners
+		num_spawned = 0
+		max = rand(3,6)
+		while(num_spawned < max)
+			var/turf/unsimulated/jungle/J = locate(rand(RANDOM_LOWER_X, RANDOM_UPPER_X), rand(RANDOM_LOWER_Y, RANDOM_UPPER_Y), src.z)
+			if(!J || !istype(J) ||  !J.bushes_spawn)
+				continue
+			animal_spawners.Add(new /obj/effect/landmark/animal_spawner/parrot(J))
+			num_spawned++
+
+#undef PATH_SPREAD_CHANCE_START
+#undef PATH_SPREAD_CHANCE_LOSS_UPPER
+#undef PATH_SPREAD_CHANCE_LOSS_LOWER
+
+#undef RIVER_SPREAD_CHANCE_START
+#undef RIVER_SPREAD_CHANCE_LOSS_UPPER
+#undef RIVER_SPREAD_CHANCE_LOSS_LOWER
+
+#undef RANDOM_UPPER_X
+#undef RANDOM_UPPER_Y
+
+#undef RANDOM_LOWER_X
+#undef RANDOM_LOWER_Y

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_animals.dm

@@ -0,0 +1,158 @@
+
+//spawns one of the specified animal type
+/obj/effect/landmark/animal_spawner
+	icon_state = "x3"
+	var/spawn_type
+	var/mob/living/spawned_animal
+	invisibility = 101
+
+/obj/effect/landmark/animal_spawner/New()
+	if(!spawn_type)
+		var/new_type = pick(typesof(/obj/effect/landmark/animal_spawner) - /obj/effect/landmark/animal_spawner)
+		new new_type(get_turf(src))
+		del(src)
+
+	processing_objects.Add(src)
+	spawned_animal = new spawn_type(get_turf(src))
+
+/obj/effect/landmark/animal_spawner/process()
+	//if any of our animals are killed, spawn new ones
+	if(!spawned_animal || spawned_animal.stat == DEAD)
+		spawned_animal = new spawn_type(src)
+		//after a random timeout, and in a random position (6-30 seconds)
+		spawn(rand(1200,2400))
+			spawned_animal.loc = locate(src.x + rand(-12,12), src.y + rand(-12,12), src.z)
+
+/obj/effect/landmark/animal_spawner/Del()
+	processing_objects.Remove(src)
+
+/obj/effect/landmark/animal_spawner/panther
+	name = "panther spawner"
+	spawn_type = /mob/living/simple_animal/hostile/panther
+
+/obj/effect/landmark/animal_spawner/parrot
+	name = "parrot spawner"
+	spawn_type = /mob/living/simple_animal/parrot
+
+/obj/effect/landmark/animal_spawner/monkey
+	name = "monkey spawner"
+	spawn_type = /mob/living/carbon/monkey
+
+/obj/effect/landmark/animal_spawner/snake
+	name = "snake spawner"
+	spawn_type = /mob/living/simple_animal/hostile/snake
+
+
+//*********//
+// Panther //
+//*********//
+
+/mob/living/simple_animal/hostile/panther
+	name = "panther"
+	desc = "A long sleek, black cat with sharp teeth and claws."
+	icon = 'jungle.dmi'
+	icon_state = "panther"
+	icon_living = "panther"
+	icon_dead = "panther_dead"
+	icon_gib = "panther_dead"
+	speak_chance = 0
+	turns_per_move = 3
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	response_help = "pets the"
+	response_disarm = "gently pushes aside the"
+	response_harm = "hits the"
+	stop_automated_movement_when_pulled = 0
+	maxHealth = 50
+	health = 50
+
+	harm_intent_damage = 8
+	melee_damage_lower = 15
+	melee_damage_upper = 15
+	attacktext = "slashes"
+	attack_sound = 'sound/weapons/bite.ogg'
+
+	layer = 3.1		//so they can stay hidde under the /obj/structure/bush
+	var/stalk_tick_delay = 3
+
+/mob/living/simple_animal/hostile/panther/ListTargets()
+	var/list/targets = list()
+	for(var/mob/living/carbon/human/H in view(src, 10))
+		targets += H
+	return targets
+
+/mob/living/simple_animal/hostile/panther/FindTarget()
+	. = ..()
+	if(.)
+		emote("nashes at [.]")
+
+/mob/living/simple_animal/hostile/panther/AttackingTarget()
+	. =..()
+	var/mob/living/L = .
+	if(istype(L))
+		if(prob(15))
+			L.Weaken(3)
+			L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
+
+/mob/living/simple_animal/hostile/panther/AttackTarget()
+	..()
+	if(stance == HOSTILE_STANCE_ATTACKING && get_dist(src, target_mob))
+		stalk_tick_delay -= 1
+		if(stalk_tick_delay <= 0)
+			src.loc = get_step_towards(src, target_mob)
+			stalk_tick_delay = 3
+
+//*******//
+// Snake //
+//*******//
+
+/mob/living/simple_animal/hostile/snake
+	name = "snake"
+	desc = "A sinuously coiled, venomous looking reptile."
+	icon = 'jungle.dmi'
+	icon_state = "snake"
+	icon_living = "snake"
+	icon_dead = "snake_dead"
+	icon_gib = "snake_dead"
+	speak_chance = 0
+	turns_per_move = 1
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	response_help = "pets the"
+	response_disarm = "gently pushes aside the"
+	response_harm = "hits the"
+	stop_automated_movement_when_pulled = 0
+	maxHealth = 25
+	health = 25
+
+	harm_intent_damage = 2
+	melee_damage_lower = 3
+	melee_damage_upper = 10
+	attacktext = "bites"
+	attack_sound = 'sound/weapons/bite.ogg'
+
+	layer = 3.1		//so they can stay hidde under the /obj/structure/bush
+	var/stalk_tick_delay = 3
+
+/mob/living/simple_animal/hostile/snake/ListTargets()
+	var/list/targets = list()
+	for(var/mob/living/carbon/human/H in view(src, 10))
+		targets += H
+	return targets
+
+/mob/living/simple_animal/hostile/snake/FindTarget()
+	. = ..()
+	if(.)
+		emote("hisses wickedly")
+
+/mob/living/simple_animal/hostile/snake/AttackingTarget()
+	. =..()
+	var/mob/living/L = .
+	if(istype(L))
+		L.apply_damage(rand(3,12), TOX)
+
+/mob/living/simple_animal/hostile/snake/AttackTarget()
+	..()
+	if(stance == HOSTILE_STANCE_ATTACKING && get_dist(src, target_mob))
+		stalk_tick_delay -= 1
+		if(stalk_tick_delay <= 0)
+			src.loc = get_step_towards(src, target_mob)
+			stalk_tick_delay = 3

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_plants.dm

@@ -0,0 +1,120 @@
+//*********************//
+// Generic undergrowth //
+//*********************//
+
+/obj/structure/bush
+	name = "foliage"
+	desc = "Pretty thick scrub, it'll take something sharp and a lot of determination to clear away."
+	icon = 'jungle.dmi'
+	icon_state = "bush1"
+	density = 1
+	anchored = 1
+	layer = 3.2
+	var/indestructable = 0
+	var/stump = 0
+
+/obj/structure/bush/New()
+	if(prob(20))
+		opacity = 1
+
+/obj/structure/bush/Bumped(M as mob)
+	if (istype(M, /mob/living/simple_animal))
+		var/mob/living/simple_animal/A = M
+		A.loc = get_turf(src)
+	else if (istype(M, /mob/living/carbon/monkey))
+		var/mob/living/carbon/monkey/A = M
+		A.loc = get_turf(src)
+
+/obj/structure/bush/attackby(var/obj/I as obj, var/mob/user as mob)
+	//hatchets can clear away undergrowth
+	if(istype(I, /obj/item/weapon/hatchet) && !stump)
+		if(indestructable)
+			//this bush marks the edge of the map, you can't destroy it
+			user << "\red You flail away at the undergrowth, but it's too thick here."
+		else
+			user.visible_message("\red <b>[user] begins clearing away [src].</b>","\red <b>You begin clearing away [src].</b>")
+			spawn(rand(15,30))
+				if(get_dist(user,src) < 2)
+					user << "\blue You clear away [src]."
+					var/obj/item/stack/sheet/wood/W = new(src.loc)
+					W.amount = rand(3,15)
+					if(prob(50))
+						icon_state = "stump[rand(1,2)]"
+						name = "cleared foliage"
+						desc = "There used to be dense undergrowth here."
+						density = 0
+						stump = 1
+						pixel_x = rand(-6,6)
+						pixel_y = rand(-6,6)
+					else
+						del(src)
+	else
+		return ..()
+
+//*******************************//
+// Strange, fruit-bearing plants //
+//*******************************//
+
+var/list/fruit_icon_states = list("badrecipe","kudzupod","reishi","lime","grapes","boiledrorocore","chocolateegg")
+var/list/reagent_effects = list("toxin","anti_toxin","stoxin","space_drugs","mindbreaker","zombiepowder","impedrezene")
+var/jungle_plants_init = 0
+
+/proc/init_jungle_plants()
+	jungle_plants_init = 1
+	fruit_icon_states = shuffle(fruit_icon_states)
+	reagent_effects = shuffle(reagent_effects)
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/jungle_fruit
+	seed = ""
+	name = "jungle fruit"
+	desc = "It smells weird and looks off."
+	icon = 'jungle.dmi'
+	icon_state = "orange"
+	potency = 1
+
+/obj/structure/jungle_plant
+	icon = 'jungle.dmi'
+	icon_state = "plant1"
+	desc = "Looks like some of that fruit might be edible."
+	var/fruits_left = 3
+	var/fruit_type = -1
+	var/icon/fruit_overlay
+	var/plant_strength = 1
+	var/fruit_r
+	var/fruit_g
+	var/fruit_b
+
+
+/obj/structure/jungle_plant/New()
+	if(!jungle_plants_init)
+		init_jungle_plants()
+
+	fruit_type = rand(1,7)
+	icon_state = "plant[fruit_type]"
+	fruits_left = rand(1,5)
+	fruit_overlay = icon('jungle.dmi',"fruit[fruits_left]")
+	fruit_r = 255 - fruit_type * 36
+	fruit_g = rand(1,255)
+	fruit_b = fruit_type * 36
+	fruit_overlay.Blend(rgb(fruit_r, fruit_g, fruit_b), ICON_ADD)
+	overlays += fruit_overlay
+	plant_strength = rand(20,200)
+
+/obj/structure/jungle_plant/attack_hand(var/mob/user as mob)
+	if(fruits_left > 0)
+		fruits_left--
+		user << "\blue You pick a fruit off [src]."
+
+		var/obj/item/weapon/reagent_containers/food/snacks/grown/jungle_fruit/J = new (src.loc)
+		J.potency = plant_strength
+		J.icon_state = fruit_icon_states[fruit_type]
+		J.reagents.add_reagent(reagent_effects[fruit_type], 1+round((plant_strength / 20), 1))
+		J.bitesize = 1+round(J.reagents.total_volume / 2, 1)
+		J.attack_hand(user)
+
+		overlays -= fruit_overlay
+		fruit_overlay = icon('jungle.dmi',"fruit[fruits_left]")
+		fruit_overlay.Blend(rgb(fruit_r, fruit_g, fruit_b), ICON_ADD)
+		overlays += fruit_overlay
+	else
+		user << "\red There are no fruit left on [src]."

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm

@@ -0,0 +1,401 @@
+//randomly generated temples, indiana jones style (minus the cultists, probably)
+
+/area/jungle/temple_one
+	name = "temple"
+	lighting_use_dynamic = 1
+	icon = 'jungle.dmi'
+	icon_state = "temple1"
+
+/area/jungle/temple_two
+	name = "temple"
+	lighting_use_dynamic = 1
+	icon = 'jungle.dmi'
+	icon_state = "temple2"
+
+/area/jungle/temple_three
+	name = "temple"
+	lighting_use_dynamic = 1
+	icon = 'jungle.dmi'
+	icon_state = "temple3"
+
+/area/jungle/temple_four
+	name = "temple"
+	lighting_use_dynamic = 1
+	icon = 'jungle.dmi'
+	icon_state = "temple4"
+
+/area/jungle/temple_five
+	name = "temple"
+	lighting_use_dynamic = 1
+	icon = 'jungle.dmi'
+	icon_state = "temple5"
+
+/area/jungle/temple_six
+	name = "temple"
+	lighting_use_dynamic = 1
+	icon = 'jungle.dmi'
+	icon_state = "temple6"
+
+/obj/effect/landmark/door_spawner
+	name = "door spawner"
+
+//******//
+// Loot //
+//******//
+
+/obj/effect/landmark/glowshroom_spawn
+	icon_state = "x3"
+	invisibility = 101
+	New()
+		if(prob(10))
+			new /obj/effect/glowshroom(src.loc)
+		del(src)
+
+/obj/effect/landmark/loot_spawn
+	name = "loot spawner"
+	icon_state = "grabbed1"
+	var/low_probability = 0
+	New()
+
+		switch(pick( \
+		low_probability * 1000;"nothing", \
+		200 - low_probability * 175;"treasure", \
+		25 + low_probability * 75;"remains", \
+		25 + low_probability * 75;"plants", \
+		5; "blob", \
+		50 + low_probability * 50;"clothes", \
+		"glasses", \
+		100 - low_probability * 50;"weapons", \
+		100 - low_probability * 50;"spacesuit", \
+		"health", \
+		25 + low_probability * 75;"snacks", \
+		25;"alien", \
+		"lights", \
+		25 - low_probability * 25;"engineering", \
+		25 - low_probability * 25;"coffin", \
+		25;"mimic", \
+		25;"viscerator", \
+		))
+			if("treasure")
+				var/obj/structure/closet/crate/C = new(src.loc)
+				if(prob(33))
+					//coins
+
+					var/amount = rand(2,6)
+					var/list/possible_spawns = list()
+					for(var/coin_type in typesof(/obj/item/weapon/coin))
+						possible_spawns += coin_type
+
+					//no icon_state for mythril coins
+					possible_spawns -= /obj/item/weapon/coin/mythril
+
+					var/coin_type = pick(possible_spawns)
+					for(var/i=0,i<amount,i++)
+						new coin_type(C)
+				else if(prob(50))
+					//bars
+
+					var/amount = rand(2,6)
+					var/quantity = rand(10,50)
+					var/list/possible_spawns = list()
+					for(var/bar_type in typesof(/obj/item/stack/sheet/mineral) - /obj/item/stack/sheet/mineral - /obj/item/stack/sheet/mineral/enruranium)
+						possible_spawns += bar_type
+
+					var/bar_type = pick(possible_spawns)
+					for(var/i=0,i<amount,i++)
+						var/obj/item/stack/sheet/mineral/M = new bar_type(C)
+						M.amount = quantity
+				else
+					//credits
+
+					var/amount = rand(2,6)
+					var/list/possible_spawns = list()
+					for(var/cash_type in typesof(/obj/item/stack/sheet/mineral))
+						possible_spawns += cash_type
+
+					var/cash_type = pick(possible_spawns)
+					for(var/i=0,i<amount,i++)
+						new cash_type(C)
+			if("remains")
+				if(prob(50))
+					new /obj/effect/decal/remains/human(src.loc)
+				else
+					new /obj/effect/decal/remains/xeno(src.loc)
+			if("plants")
+				if(prob(25))
+					new /obj/effect/glowshroom(src.loc)
+				else if(prob(33))
+					new /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap(src.loc)
+				else if(prob(50))
+					new /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris(src.loc)
+			if("blob")
+				new /obj/effect/blob/core(src.loc)
+			if("clothes")
+				var/obj/structure/closet/C = new(src.loc)
+				C.icon_state = "blue"
+				C.icon_closed = "blue"
+				if(prob(33))
+					new /obj/item/clothing/under/rainbow(C)
+					new /obj/item/clothing/shoes/rainbow(C)
+					new /obj/item/clothing/head/soft/rainbow(C)
+					new /obj/item/clothing/gloves/rainbow(C)
+				else if(prob(50))
+					new /obj/item/clothing/under/psyche(C)
+				else
+					new /obj/item/clothing/under/syndicate/combat(C)
+					new /obj/item/clothing/shoes/swat(C)
+					new /obj/item/clothing/gloves/swat(C)
+					new /obj/item/clothing/mask/balaclava(C)
+			if("glasses")
+				var/obj/structure/closet/C = new(src.loc)
+				var/new_type = pick(
+				/obj/item/clothing/glasses/material, \
+				/obj/item/clothing/glasses/thermal, \
+				/obj/item/clothing/glasses/meson, \
+				/obj/item/clothing/glasses/night, \
+				/obj/item/clothing/glasses/hud/health, \
+				/obj/item/clothing/glasses/hud/health \
+				)
+				new new_type(C)
+			if("weapons")
+				var/obj/structure/closet/crate/secure/weapon/C = new(src.loc)
+				var/new_type = pick(
+				200; /obj/item/weapon/hatchet, \
+				/obj/item/weapon/gun/projectile/pistol, \
+				/obj/item/weapon/gun/projectile/deagle, \
+				/obj/item/weapon/gun/projectile/russian, \
+				)
+				new new_type(C)
+			if("spacesuit")
+				var/obj/structure/closet/syndicate/C = new(src.loc)
+				if(prob(25))
+					new /obj/item/clothing/suit/space/syndicate/black(C)
+					new /obj/item/clothing/head/helmet/space/syndicate/black(C)
+					new /obj/item/weapon/tank/oxygen/red(C)
+					new /obj/item/clothing/mask/breath(C)
+				else if(prob(33))
+					new /obj/item/clothing/suit/space/syndicate/blue(C)
+					new /obj/item/clothing/head/helmet/space/syndicate/blue(C)
+					new /obj/item/weapon/tank/oxygen/red(C)
+					new /obj/item/clothing/mask/breath(C)
+				else if(prob(50))
+					new /obj/item/clothing/suit/space/syndicate/green(C)
+					new /obj/item/clothing/head/helmet/space/syndicate/green(C)
+					new /obj/item/weapon/tank/oxygen/red(C)
+					new /obj/item/clothing/mask/breath(C)
+				else
+					new /obj/item/clothing/suit/space/syndicate/orange(C)
+					new /obj/item/clothing/head/helmet/space/syndicate/orange(C)
+					new /obj/item/weapon/tank/oxygen/red(C)
+					new /obj/item/clothing/mask/breath(C)
+			if("health")
+				//hopefully won't be necessary, but there were an awful lot of traps to get through...
+				var/obj/structure/closet/crate/medical/C = new(src.loc)
+				if(prob(50))
+					new /obj/item/weapon/storage/firstaid/regular(C)
+				if(prob(50))
+					new /obj/item/weapon/storage/firstaid/fire(C)
+				if(prob(50))
+					new /obj/item/weapon/storage/firstaid/o2(C)
+				if(prob(50))
+					new /obj/item/weapon/storage/firstaid/toxin(C)
+			if("snacks")
+				//you're come so far, you must be in need of refreshment
+				var/obj/structure/closet/crate/freezer/C = new(src.loc)
+				var/num = rand(2,6)
+				var/new_type = pick(
+				/obj/item/weapon/reagent_containers/food/drinks/beer, \
+				/obj/item/weapon/reagent_containers/food/drinks/tea, \
+				/obj/item/weapon/reagent_containers/food/drinks/dry_ramen, \
+				/obj/item/weapon/reagent_containers/food/snacks/candiedapple, \
+				/obj/item/weapon/reagent_containers/food/snacks/chocolatebar, \
+				/obj/item/weapon/reagent_containers/food/snacks/cookie, \
+				/obj/item/weapon/reagent_containers/food/snacks/faggot, \
+				/obj/item/weapon/reagent_containers/food/snacks/plump_pie, \
+				)
+				for(var/i=0,i<num,i++)
+					new new_type(C)
+			if("alien")
+				//ancient aliens
+				var/obj/structure/closet/acloset/C = new(src.loc)
+				if(prob(33))
+					//facehuggers
+					var/num = rand(1,3)
+					for(var/i=0,i<num,i++)
+						new /obj/item/clothing/mask/facehugger(C)
+				/*else if(prob(50))
+					//something else very much alive and angry
+					var/spawn_type = pick(/mob/living/simple_animal/hostile/alien, /mob/living/simple_animal/hostile/alien/drone, /mob/living/simple_animal/hostile/alien/sentinel)
+					new spawn_type(C)*/
+
+				//33% chance of nothing
+
+			if("lights")
+				//flares, candles, matches
+				var/obj/structure/closet/crate/secure/gear/C = new(src.loc)
+				var/num = rand(2,6)
+				for(var/i=0,i<num,i++)
+					var/spawn_type = pick(/obj/item/device/flashlight/flare, /obj/item/trash/candle, /obj/item/candle/, /obj/item/weapon/storage/matchbox)
+					new spawn_type(C)
+			if("engineering")
+				var/obj/structure/closet/crate/secure/gear/C = new(src.loc)
+
+				//chance to have any combination of up to two electrical/mechanical toolboxes and one cell
+				if(prob(33))
+					new /obj/item/weapon/storage/toolbox/electrical(C)
+				else if(prob(50))
+					new /obj/item/weapon/storage/toolbox/mechanical(C)
+
+				if(prob(33))
+					new /obj/item/weapon/storage/toolbox/mechanical(C)
+				else if(prob(50))
+					new /obj/item/weapon/storage/toolbox/electrical(C)
+
+				if(prob(25))
+					new /obj/item/weapon/cell(C)
+
+			if("coffin")
+				new /obj/structure/closet/coffin(src.loc)
+				if(prob(33))
+					new /obj/effect/decal/remains/human(src)
+				else if(prob(50))
+					new /obj/effect/decal/remains/xeno(src)
+			/*if("mimic")
+				//a guardian of the tomb!
+				new /mob/living/simple_animal/hostile/mimic/crate(src.loc)*/
+			if("viscerator")
+				//more tomb guardians!
+				var/num = rand(1,3)
+				var/obj/structure/closet/crate/secure/gear/C = new(src.loc)
+				for(var/i=0,i<num,i++)
+					new /mob/living/simple_animal/hostile/viscerator(C)
+
+		del(src)
+
+/obj/effect/landmark/loot_spawn/low
+	name = "low prob loot spawner"
+	icon_state = "grabbed"
+	low_probability = 1
+
+//********//
+// Traps! //
+//********//
+
+/obj/effect/step_trigger/trap
+	name = "trap"
+	icon = 'code/workinprogress/cael_aislinn/jungle/jungle.dmi'
+	icon = 'jungle.dmi'
+	icon_state = "trap"
+	var/trap_type
+
+	New()
+		trap_type = pick(50;"thrower","sawburst","poison_dart","flame_burst",10;"plasma_gas",5;"n2_gas")
+		if( (trap_type == "plasma_gas" || trap_type == "n2_gas") && prob(10))
+			new /obj/effect/glowshroom(src.loc)
+
+		//hint that this tile is dangerous
+		if(prob(90))
+			var/turf/T = get_turf(src)
+			T.desc = pick("There is a faint sheen of moisture over the top.","It looks a little unstable.","Something doesn't seem right.")
+
+/obj/effect/step_trigger/trap/Trigger(var/atom/A)
+	var/mob/living/M = A
+	if(!istype(M))
+		return
+
+	switch(trap_type)
+		if("sawburst")
+			M << "\red <b>A sawblade shoots out of the ground and strikes you!</b>"
+			M.apply_damage(rand(5,10), BRUTE)
+
+			var/atom/myloc = src.loc
+			var/image/flicker = image('jungle.dmi',"sawblade")
+			myloc.overlays += flicker
+			spawn(8)
+				myloc.overlays -= flicker
+				del(flicker)
+			//flick("sawblade",src)
+		if("poison_dart")
+			M << "\red <b>You feel something small and sharp strike you!</b>"
+			M.apply_damage(rand(5,10), TOX)
+
+			var/atom/myloc = src.loc
+			var/image/flicker = image('jungle.dmi',"dart[rand(1,3)]")
+			myloc.overlays += flicker
+			spawn(8)
+				myloc.overlays -= flicker
+				del(flicker)
+			//flick("dart[rand(1,3)]",src)
+		if("flame_burst")
+			M << "\red <b>A jet of fire comes out of nowhere!</b>"
+			M.apply_damage(rand(5,10), BURN)
+
+			var/atom/myloc = src.loc
+			var/image/flicker = image('jungle.dmi',"flameburst")
+			myloc.overlays += flicker
+			spawn(8)
+				myloc.overlays -= flicker
+				del flicker
+			//flick("flameburst",src)
+		if("plasma_gas")
+			//spawn a bunch of plasma
+		if("n2_gas")
+			//spawn a bunch of sleeping gas
+		if("thrower")
+			//edited version of obj/effect/step_trigger/thrower
+			var/throw_dir = pick(1,2,4,8)
+			M.visible_message("\red <b>The floor under [M] suddenly tips upward!</b>","\red <b>The floor tips upward under you!</b>")
+
+			var/atom/myloc = src.loc
+			var/image/flicker = image('jungle.dmi',"throw[throw_dir]")
+			myloc.overlays += flicker
+			var/turf/my_turf = get_turf(loc)
+			if(!my_turf.density)
+				my_turf.density = 1
+				spawn(8)
+					my_turf.density = 0
+			spawn(8)
+				myloc.overlays -= flicker
+				del(flicker)
+
+			var/dist = rand(1,5)
+			var/curtiles = 0
+			while(M)
+				if(curtiles >= dist)
+					break
+				if(M.z != src.z)
+					break
+
+				curtiles++
+				sleep(1)
+
+				var/predir = M.dir
+				step(M, throw_dir)
+				M.dir = predir
+
+//gives turf a different description, to try and trick players
+/obj/effect/step_trigger/trap/fake
+	icon_state = "faketrap"
+	name = "fake trap"
+
+	New()
+		if(prob(10))
+			new /obj/effect/glowshroom(src.loc)
+		if(prob(90))
+			var/turf/T = get_turf(src)
+			T.desc = pick("It looks a little dustier than the surrounding tiles.","It is somewhat ornate.","It looks a little darker than the surrounding tiles.")
+		del(src)
+
+//50% chance of being a trap
+/obj/effect/step_trigger/trap/fifty
+	icon_state = "trap"
+	name = "fifty fifty trap"
+	icon_state = "fiftytrap"
+
+	New()
+		if(prob(50))
+			..()
+		else
+			if(prob(10))
+				new /obj/effect/glowshroom(src.loc)
+			del(src)

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_tribe.dm

@@ -0,0 +1,91 @@
+
+
+/obj/item/projectile/jungle_spear
+	damage = 10
+	damage_type = TOX
+	icon_state = "bullet"
+
+/obj/effect/jungle_tribe_spawn
+	name = "campfire"
+	desc = "Looks cosy, in an alien sort of way."
+	icon = 'jungle.dmi'
+	icon_state = "campfire"
+	anchored = 1
+	var/list/tribesmen = list()
+	var/list/enemy_players = list()
+	var/tribe_type = 1
+
+/obj/effect/jungle_tribe_spawn/New()
+	processing_objects.Add(src)
+	tribe_type = rand(1,5)
+
+	var/num_tribesmen = rand(3,6)
+	for(var/i=0,i<num_tribesmen,i++)
+		var/mob/living/simple_animal/hostile/tribesman/T = new(src.loc)
+		T.my_type = tribe_type
+		T.x += rand(-6,6)
+		T.y += rand(-6,6)
+		tribesmen += T
+
+/obj/effect/jungle_tribe_spawn/Del()
+	processing_objects.Remove(src)
+
+/obj/effect/jungle_tribe_spawn/process()
+	set background = 1
+	for(var/mob/living/simple_animal/hostile/tribesman/T in tribesmen)
+		if(T.stat == DEAD)
+			tribesmen.Remove(T)
+			spawn(rand(50,300))
+				var/mob/living/simple_animal/hostile/tribesman/B = new(src.loc)
+				B.my_type = tribe_type
+				B.x += rand(-4,4)
+				B.y += rand(-4,4)
+				tribesmen += B
+
+
+/mob/living/simple_animal/hostile/tribesman
+	name = "tribesman"
+	desc = "A noble savage, doesn't seem to know what to make of you."
+	icon = 'jungle.dmi'
+	icon_state = "native1"
+	icon_living = "native1"
+	icon_dead = "native1_dead"
+	speak_chance = 25
+	speak = list("Rong a'hu dong'a sik?","Ahi set mep'a teth.","Ohen nek'ti ep esi.")
+	speak_emote = list("chatters")
+	emote_hear = list("chatters to themselves","chatters away at something","whistles")
+	emote_see = list("bends down to examine something")
+	melee_damage_lower = 5
+	melee_damage_upper = 15
+	turns_per_move = 1
+	stop_automated_movement_when_pulled = 0
+	var/my_type = 1
+
+/mob/living/simple_animal/hostile/tribesman/New()
+	if(prob(33))
+		ranged = 1
+
+	spawn(8)
+		icon_state = "native[my_type]"
+		icon_living = "native[my_type]"
+		icon_dead = "native[my_type]_dead"
+
+/mob/living/simple_animal/hostile/tribesman/ListTargets()
+	var/list/targets = list()
+	for(var/mob/living/simple_animal/hostile/H in view(src, 10))
+		if(istype(H, /mob/living/simple_animal/hostile/tribesman))
+			continue
+		targets += H
+	return targets
+
+/mob/living/simple_animal/hostile/tribesman/FindTarget()
+	. = ..()
+	if(.)
+		emote("waves a spear at [.]")
+
+/mob/living/simple_animal/hostile/tribesman/OpenFire(target_mob)
+	visible_message("\red <b>[src]</b> throws a spear at [target_mob]!", 1)
+	flick(src, "native[my_type]_act")
+
+	var/tturf = get_turf(target_mob)
+	Shoot(tturf, src.loc, src)

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm

@@ -0,0 +1,178 @@
+
+/turf/unsimulated/jungle
+	var/bushes_spawn = 1
+	var/plants_spawn = 1
+	name = "wet grass"
+	desc = "Thick, long wet grass"
+	icon = 'jungle.dmi'
+	icon_state = "grass1"
+	var/icon_spawn_state = "grass1"
+	luminosity = 3
+
+	New()
+		icon_state = icon_spawn_state
+
+		if(plants_spawn && prob(40))
+			if(prob(90))
+				var/image/I
+				if(prob(35))
+					I = image('jungle.dmi',"plant[rand(1,7)]")
+				else
+					if(prob(30))
+						I = image('icons/obj/flora/ausflora.dmi',"reedbush_[rand(1,4)]")
+					else if(prob(33))
+						I = image('icons/obj/flora/ausflora.dmi',"leafybush_[rand(1,3)]")
+					else if(prob(50))
+						I = image('icons/obj/flora/ausflora.dmi',"fernybush_[rand(1,3)]")
+					else
+						I = image('icons/obj/flora/ausflora.dmi',"stalkybush_[rand(1,3)]")
+				I.pixel_x = rand(-6,6)
+				I.pixel_y = rand(-6,6)
+				overlays += I
+			else
+				var/obj/structure/jungle_plant/J = new(src)
+				J.pixel_x = rand(-6,6)
+				J.pixel_y = rand(-6,6)
+		if(bushes_spawn && prob(90))
+			new /obj/structure/bush(src)
+
+/turf/unsimulated/jungle/clear
+	bushes_spawn = 0
+	plants_spawn = 0
+	icon_state = "grass_clear"
+	icon_spawn_state = "grass3"
+
+/turf/unsimulated/jungle/path
+	bushes_spawn = 0
+	name = "wet grass"
+	desc = "thick, long wet grass"
+	icon = 'jungle.dmi'
+	icon_state = "grass_path"
+	icon_spawn_state = "grass2"
+
+	New()
+		..()
+		for(var/obj/structure/bush/B in src)
+			del B
+
+/turf/unsimulated/jungle/proc/Spread(var/probability, var/prob_loss = 50)
+	if(probability <= 0)
+		return
+
+	//world << "\blue Spread([probability])"
+	for(var/turf/unsimulated/jungle/J in orange(1, src))
+		if(!J.bushes_spawn)
+			continue
+
+		var/turf/unsimulated/jungle/P = null
+		if(J.type == src.type)
+			P = J
+		else
+			P = new src.type(J)
+
+		if(P && prob(probability))
+			P.Spread(probability - prob_loss)
+
+/turf/unsimulated/jungle/impenetrable
+	bushes_spawn = 0
+	icon_state = "grass_impenetrable"
+	icon_spawn_state = "grass1"
+	New()
+		..()
+		var/obj/structure/bush/B = new(src)
+		B.indestructable = 1
+
+//copy paste from asteroid mineral turfs
+/turf/unsimulated/jungle/rock
+	bushes_spawn = 0
+	plants_spawn = 0
+	density = 1
+	name = "rock wall"
+	icon = 'icons/turf/walls.dmi'
+	icon_state = "rock"
+	icon_spawn_state = "rock"
+
+/turf/unsimulated/jungle/rock/New()
+	spawn(1)
+		var/turf/T
+		if(!istype(get_step(src, NORTH), /turf/unsimulated/jungle/rock) && !istype(get_step(src, NORTH), /turf/unsimulated/wall))
+			T = get_step(src, NORTH)
+			if (T)
+				T.overlays += image('icons/turf/walls.dmi', "rock_side_s")
+		if(!istype(get_step(src, SOUTH), /turf/unsimulated/jungle/rock) && !istype(get_step(src, SOUTH), /turf/unsimulated/wall))
+			T = get_step(src, SOUTH)
+			if (T)
+				T.overlays += image('icons/turf/walls.dmi', "rock_side_n", layer=6)
+		if(!istype(get_step(src, EAST), /turf/unsimulated/jungle/rock) && !istype(get_step(src, EAST), /turf/unsimulated/wall))
+			T = get_step(src, EAST)
+			if (T)
+				T.overlays += image('icons/turf/walls.dmi', "rock_side_w", layer=6)
+		if(!istype(get_step(src, WEST), /turf/unsimulated/jungle/rock) && !istype(get_step(src, WEST), /turf/unsimulated/wall))
+			T = get_step(src, WEST)
+			if (T)
+				T.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6)
+
+/turf/unsimulated/jungle/water
+	bushes_spawn = 0
+	name = "murky water"
+	desc = "thick, murky water"
+	icon = 'icons/misc/beach.dmi'
+	icon_state = "water"
+	icon_spawn_state = "water"
+
+/turf/unsimulated/jungle/water/New()
+	..()
+	for(var/obj/structure/bush/B in src)
+		del(B)
+
+/turf/unsimulated/jungle/water/Entered(atom/movable/O)
+	..()
+	if(istype(O, /mob/living/))
+		var/mob/living/M = O
+		//slip in the murky water if we try to run through it
+		if(prob(10 + (M.m_intent == "run" ? 40 : 0)))
+			M << pick("\blue You slip on something slimy.","\blue You fall over into the murk.")
+			M.Stun(2)
+			M.Weaken(1)
+
+		//piranhas - 25% chance to be an omnipresent risk, although they do practically no damage
+		if(prob(25))
+			M << "\blue You feel something slithering around your legs."
+			if(prob(50))
+				spawn(rand(25,50))
+					var/turf/T = get_turf(M)
+					if(istype(T, /turf/unsimulated/jungle/water))
+						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
+						M.apply_damage(rand(0,1), BRUTE)
+			if(prob(50))
+				spawn(rand(25,50))
+					var/turf/T = get_turf(M)
+					if(istype(T, /turf/unsimulated/jungle/water))
+						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
+						M.apply_damage(rand(0,1), BRUTE)
+			if(prob(50))
+				spawn(rand(25,50))
+					var/turf/T = get_turf(M)
+					if(istype(T, /turf/unsimulated/jungle/water))
+						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
+						M.apply_damage(rand(0,1), BRUTE)
+			if(prob(50))
+				spawn(rand(25,50))
+					var/turf/T = get_turf(M)
+					if(istype(T, /turf/unsimulated/jungle/water))
+						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
+						M.apply_damage(rand(0,1), BRUTE)
+
+/turf/unsimulated/jungle/water/deep
+	plants_spawn = 0
+	density = 1
+	icon_state = "water2"
+	icon_spawn_state = "water2"
+
+/turf/unsimulated/jungle/temple_wall
+	name = "temple wall"
+	desc = ""
+	density = 1
+	icon = 'icons/turf/walls.dmi'
+	icon_state = "plasma0"
+	var/mineral = "plasma"

code/WorkInProgress/Cael_Aislinn/Jungle/misc_helpers.dm

@@ -0,0 +1,122 @@
+//put this here because i needed specific functionality, and i wanted to avoid the hassle of getting it onto svn
+
+
+/area/proc/copy_turfs_to(var/area/A , var/platingRequired = 0 )
+	//Takes: Area. Optional: If it should copy to areas that don't have plating
+	//Returns: Nothing.
+	//Notes: Attempts to move the contents of one area to another area.
+	//       Movement based on lower left corner. Tiles that do not fit
+	//		 into the new area will not be moved.
+
+	if(!A || !src) return 0
+
+	var/list/turfs_src = get_area_turfs(src.type)
+	var/list/turfs_trg = get_area_turfs(A.type)
+
+	var/src_min_x = 0
+	var/src_min_y = 0
+	for (var/turf/T in turfs_src)
+		if(T.x < src_min_x || !src_min_x) src_min_x	= T.x
+		if(T.y < src_min_y || !src_min_y) src_min_y	= T.y
+
+	var/trg_min_x = 0
+	var/trg_min_y = 0
+	for (var/turf/T in turfs_trg)
+		if(T.x < trg_min_x || !trg_min_x) trg_min_x	= T.x
+		if(T.y < trg_min_y || !trg_min_y) trg_min_y	= T.y
+
+	var/list/refined_src = new/list()
+	for(var/turf/T in turfs_src)
+		refined_src += T
+		refined_src[T] = new/datum/coords
+		var/datum/coords/C = refined_src[T]
+		C.x_pos = (T.x - src_min_x)
+		C.y_pos = (T.y - src_min_y)
+
+	var/list/refined_trg = new/list()
+	for(var/turf/T in turfs_trg)
+		refined_trg += T
+		refined_trg[T] = new/datum/coords
+		var/datum/coords/C = refined_trg[T]
+		C.x_pos = (T.x - trg_min_x)
+		C.y_pos = (T.y - trg_min_y)
+
+	var/list/toupdate = new/list()
+
+	var/copiedobjs = list()
+
+
+	moving:
+		for (var/turf/T in refined_src)
+			var/datum/coords/C_src = refined_src[T]
+			for (var/turf/B in refined_trg)
+				var/datum/coords/C_trg = refined_trg[B]
+				if(C_src.x_pos == C_trg.x_pos && C_src.y_pos == C_trg.y_pos)
+
+					var/old_dir1 = T.dir
+					var/old_icon_state1 = T.icon_state
+					var/old_icon1 = T.icon
+
+					if(platingRequired)
+						if(istype(B, /turf/space))
+							continue moving
+
+					var/turf/X = new T.type(B)
+					X.dir = old_dir1
+					X.icon_state = old_icon_state1
+					X.icon = old_icon1 //Shuttle floors are in shuttle.dmi while the defaults are floors.dmi
+
+
+					var/list/mobs = new/list()
+					var/list/newmobs = new/list()
+
+					for(var/mob/M in T)
+
+						if(!istype(M,/mob) || istype(M, /mob/aiEye)) continue // If we need to check for more mobs, I'll add a variable
+						mobs += M
+
+					for(var/mob/M in mobs)
+						newmobs += DuplicateObject(M , 1)
+
+					for(var/mob/M in newmobs)
+						M.loc = X
+
+
+
+					for(var/V in T.vars)
+						if(!(V in list("type","loc","locs","vars", "parent", "parent_type","verbs","ckey","key","x","y","z","contents", "luminosity")))
+							X.vars[V] = T.vars[V]
+
+//					var/area/AR = X.loc
+
+//					if(AR.lighting_use_dynamic)
+//						X.opacity = !X.opacity
+//						X.sd_SetOpacity(!X.opacity)			//TODO: rewrite this code so it's not messed by lighting ~Carn
+
+					toupdate += X
+
+					refined_src -= T
+					refined_trg -= B
+					continue moving
+
+
+
+
+	/*var/list/doors = new/list()
+
+	if(toupdate.len)
+		for(var/turf/simulated/T1 in toupdate)
+			for(var/obj/machinery/door/D2 in T1)
+				doors += D2
+			if(T1.parent)
+				air_master.groups_to_rebuild += T1.parent
+			else
+				air_master.tiles_to_update += T1
+
+	for(var/obj/O in doors)
+		O:update_nearby_tiles(1)*/
+
+
+
+
+	return copiedobjs

code/WorkInProgress/Chinsky/ashtray.dm

@@ -29,7 +29,7 @@
 			var/obj/item/clothing/mask/cigarette/cig = W
 			if (cig.lit == 1)
 				src.visible_message("[user] crushes [cig] in [src], putting it out.")
-				cig.put_out()
+				cig.smoketime = 0
 			else if (cig.lit == 0)
 				if(istype(cig, /obj/item/weapon/match))
 					user << "You place [cig] in [src] without even lighting it. Why would you do that?"

code/WorkInProgress/Sigyn/Department Sec/__README.dm

@@ -0,0 +1,8 @@
+/*
+
+Hey you!
+You only need to untick maps/tgstation.2.0.9.dmm for this if you download the modified map from:
+http://tgstation13.googlecode.com/files/tgstation.2.1.0_deptsec.zip
+
+Everything else can just be ticked on top of the original stuff.
+*/

code/WorkInProgress/Sigyn/Department Sec/jobs.dm

@@ -0,0 +1,126 @@
+var/list/sec_departments = list("engineering", "supply", "medical", "science")
+
+proc/assign_sec_to_department(var/mob/living/carbon/human/H)
+	if(sec_departments.len)
+		var/department = pick(sec_departments)
+		sec_departments -= department
+		var/access = null
+		var/destination = null
+		switch(department)
+			if("supply")
+				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/cargo(H), slot_w_uniform)
+				H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/supply(H), slot_ears)
+				access = list(access_mailsorting, access_mining)
+				destination = /area/security/checkpoint/supply
+			if("engineering")
+				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/engine(H), slot_w_uniform)
+				H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/engi(H), slot_ears)
+				access = list(access_construction, access_engine)
+				destination = /area/security/checkpoint/engineering
+			if("medical")
+				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/med(H), slot_w_uniform)
+				H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/med(H), slot_ears)
+				access = list(access_medical)
+				destination = /area/security/checkpoint/medical
+			if("science")
+				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/science(H), slot_w_uniform)
+				H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/sci(H), slot_ears)
+				access = list(access_research)
+				destination = /area/security/checkpoint/science
+			else
+				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform)
+				H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears)
+
+
+		if(destination)
+			var/teleport = 0
+			if(!ticker || ticker.current_state <= GAME_STATE_SETTING_UP)
+				teleport = 1
+			spawn(15)
+				if(H)
+					if(teleport)
+						var/turf/T
+						var/safety = 0
+						while(safety < 25)
+							T = pick(get_area_turfs(destination))
+							if(!H.Move(T))
+								safety += 1
+								continue
+							else
+								break
+					H << "<b>You have been assigned to [department]!</b>"
+					if(locate(/obj/item/weapon/card/id, H))
+						var/obj/item/weapon/card/id/I = locate(/obj/item/weapon/card/id, H)
+						if(I)
+							I.access |= access
+
+
+/datum/job/officer
+	title = "Security Officer"
+	flag = OFFICER
+	department_flag = ENGSEC
+	faction = "Station"
+	total_positions = 5
+	spawn_positions = 5
+	supervisors = "the head of security, and the head of your assigned department (if applicable)"
+	selection_color = "#ffeeee"
+
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back)
+		if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
+		assign_sec_to_department(H)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
+		H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head)
+		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_s_store)
+		H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+			H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+			H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
+		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
+		L.imp_in = H
+		L.implanted = 1
+		return 1
+
+/obj/item/device/radio/headset/headset_sec/department/New()
+	if(radio_controller)
+		initialize()
+	recalculateChannels()
+
+/obj/item/device/radio/headset/headset_sec/department/engi
+	keyslot1 = new /obj/item/device/encryptionkey/headset_sec
+	keyslot2 = new /obj/item/device/encryptionkey/headset_eng
+
+/obj/item/device/radio/headset/headset_sec/department/supply
+	keyslot1 = new /obj/item/device/encryptionkey/headset_sec
+	keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
+
+/obj/item/device/radio/headset/headset_sec/department/med
+	keyslot1 = new /obj/item/device/encryptionkey/headset_sec
+	keyslot2 = new /obj/item/device/encryptionkey/headset_med
+
+/obj/item/device/radio/headset/headset_sec/department/sci
+	keyslot1 = new /obj/item/device/encryptionkey/headset_sec
+	keyslot2 = new /obj/item/device/encryptionkey/headset_sci
+
+/obj/item/clothing/under/rank/security/cargo/New()
+	var/obj/item/clothing/tie/armband/cargo/A	= new /obj/item/clothing/tie/armband/cargo
+	hastie = A
+
+/obj/item/clothing/under/rank/security/engine/New()
+	var/obj/item/clothing/tie/armband/engine/A	= new /obj/item/clothing/tie/armband/engine
+	hastie = A
+
+/obj/item/clothing/under/rank/security/science/New()
+	var/obj/item/clothing/tie/armband/science/A	= new /obj/item/clothing/tie/armband/science
+	hastie = A
+
+/obj/item/clothing/under/rank/security/med/New()
+	var/obj/item/clothing/tie/armband/med/A		= new /obj/item/clothing/tie/armband/med
+	hastie = A

code/WorkInProgress/Sigyn/Softcurity/__README.dm

@@ -0,0 +1,10 @@
+/*
+
+Hey you!
+You'll need to untick code/game/jobs/access.dm for this to all work correctly!
+
+Everything else can just be ticked on top of the original stuff.
+
+You'll also need to download a modified map from http://tgstation13.googlecode.com/files/tgstation.2.0.9_Softcurity.zip.
+Make sure to untick the original map!
+*/

code/WorkInProgress/Sigyn/Softcurity/access.dm

@@ -0,0 +1,522 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+
+/var/const/access_security = 1 // Security equipment
+/var/const/access_brig = 2 // Brig timers and permabrig
+/var/const/access_armory = 3
+/var/const/access_forensics_lockers= 4
+/var/const/access_medical = 5
+/var/const/access_morgue = 6
+/var/const/access_tox = 7
+/var/const/access_tox_storage = 8
+/var/const/access_genetics = 9
+/var/const/access_engine = 10
+/var/const/access_engine_equip= 11
+/var/const/access_maint_tunnels = 12
+/var/const/access_external_airlocks = 13
+/var/const/access_emergency_storage = 14
+/var/const/access_change_ids = 15
+/var/const/access_ai_upload = 16
+/var/const/access_teleporter = 17
+/var/const/access_eva = 18
+/var/const/access_heads = 19
+/var/const/access_captain = 20
+/var/const/access_all_personal_lockers = 21
+/var/const/access_chapel_office = 22
+/var/const/access_tech_storage = 23
+/var/const/access_atmospherics = 24
+/var/const/access_bar = 25
+/var/const/access_janitor = 26
+/var/const/access_crematorium = 27
+/var/const/access_kitchen = 28
+/var/const/access_robotics = 29
+/var/const/access_rd = 30
+/var/const/access_cargo = 31
+/var/const/access_construction = 32
+/var/const/access_chemistry = 33
+/var/const/access_cargo_bot = 34
+/var/const/access_hydroponics = 35
+/var/const/access_manufacturing = 36
+/var/const/access_library = 37
+/var/const/access_lawyer = 38
+/var/const/access_virology = 39
+/var/const/access_cmo = 40
+/var/const/access_qm = 41
+/var/const/access_court = 42
+/var/const/access_clown = 43
+/var/const/access_mime = 44
+/var/const/access_surgery = 45
+/var/const/access_theatre = 46
+/var/const/access_research = 47
+/var/const/access_mining = 48
+/var/const/access_mining_office = 49 //not in use
+/var/const/access_mailsorting = 50
+/var/const/access_mint = 51
+/var/const/access_mint_vault = 52
+/var/const/access_heads_vault = 53
+/var/const/access_mining_station = 54
+/var/const/access_xenobiology = 55
+/var/const/access_ce = 56
+/var/const/access_hop = 57
+/var/const/access_hos = 58
+/var/const/access_RC_announce = 59 //Request console announcements
+/var/const/access_keycard_auth = 60 //Used for events which require at least two people to confirm them
+/var/const/access_tcomsat = 61 // has access to the entire telecomms satellite / machinery
+/var/const/access_gateway = 62
+/var/const/access_sec_doors = 63 // Security front doors
+
+	//BEGIN CENTCOM ACCESS
+	/*Should leave plenty of room if we need to add more access levels.
+/var/const/Mostly for admin fun times.*/
+/var/const/access_cent_general = 101//General facilities.
+/var/const/access_cent_thunder = 102//Thunderdome.
+/var/const/access_cent_specops = 103//Special Ops.
+/var/const/access_cent_medical = 104//Medical/Research
+/var/const/access_cent_living = 105//Living quarters.
+/var/const/access_cent_storage = 106//Generic storage areas.
+/var/const/access_cent_teleporter = 107//Teleporter.
+/var/const/access_cent_creed = 108//Creed's office.
+/var/const/access_cent_captain = 109//Captain's office/ID comp/AI.
+
+	//The Syndicate
+/var/const/access_syndicate = 150//General Syndicate Access
+
+	//MONEY
+/var/const/access_crate_cash = 200
+
+/obj/var/list/req_access = null
+/obj/var/req_access_txt = "0"
+/obj/var/list/req_one_access = null
+/obj/var/req_one_access_txt = "0"
+
+/obj/New()
+	..()
+	//NOTE: If a room requires more than one access (IE: Morgue + medbay) set the req_acesss_txt to "5;6" if it requires 5 and 6
+	if(src.req_access_txt)
+		var/list/req_access_str = text2list(req_access_txt,";")
+		if(!req_access)
+			req_access = list()
+		for(var/x in req_access_str)
+			var/n = text2num(x)
+			if(n)
+				req_access += n
+
+	if(src.req_one_access_txt)
+		var/list/req_one_access_str = text2list(req_one_access_txt,";")
+		if(!req_one_access)
+			req_one_access = list()
+		for(var/x in req_one_access_str)
+			var/n = text2num(x)
+			if(n)
+				req_one_access += n
+
+
+
+//returns 1 if this mob has sufficient access to use this object
+/obj/proc/allowed(mob/M)
+	//check if it doesn't require any access at all
+	if(src.check_access(null))
+		return 1
+	if(istype(M, /mob/living/silicon))
+		//AI can do whatever he wants
+		return 1
+	else if(istype(M, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = M
+		//if they are holding or wearing a card that has access, that works
+		if(src.check_access(H.get_active_hand()) || src.check_access(H.wear_id))
+			return 1
+	else if(istype(M, /mob/living/carbon/monkey) || istype(M, /mob/living/carbon/alien/humanoid))
+		var/mob/living/carbon/george = M
+		//they can only hold things :(
+		if(george.get_active_hand() && (istype(george.get_active_hand(), /obj/item/weapon/card/id) || istype(george.get_active_hand(), /obj/item/device/pda)) && src.check_access(george.get_active_hand()))
+			return 1
+	return 0
+
+/obj/item/proc/GetAccess()
+	return list()
+
+/obj/item/proc/GetID()
+	return null
+
+/obj/proc/check_access(obj/item/weapon/card/id/I)
+
+	if (istype(I, /obj/item/device/pda))
+		var/obj/item/device/pda/pda = I
+		I = pda.id
+
+	if(!src.req_access && !src.req_one_access) //no requirements
+		return 1
+	if(!istype(src.req_access, /list)) //something's very wrong
+		return 1
+
+	var/list/L = src.req_access
+	if(!L.len && (!src.req_one_access || !src.req_one_access.len)) //no requirements
+		return 1
+	if(!I || !istype(I, /obj/item/weapon/card/id) || !I.access) //not ID or no access
+		return 0
+	for(var/req in src.req_access)
+		if(!(req in I.access)) //doesn't have this access
+			return 0
+	if(src.req_one_access && src.req_one_access.len)
+		for(var/req in src.req_one_access)
+			if(req in I.access) //has an access from the single access list
+				return 1
+		return 0
+	return 1
+
+
+/obj/proc/check_access_list(var/list/L)
+	if(!src.req_access  && !src.req_one_access)	return 1
+	if(!istype(src.req_access, /list))	return 1
+	if(!src.req_access.len && (!src.req_one_access || !src.req_one_access.len))	return 1
+	if(!L)	return 0
+	if(!istype(L, /list))	return 0
+	for(var/req in src.req_access)
+		if(!(req in L)) //doesn't have this access
+			return 0
+	if(src.req_one_access && src.req_one_access.len)
+		for(var/req in src.req_one_access)
+			if(req in L) //has an access from the single access list
+				return 1
+		return 0
+	return 1
+
+
+/proc/get_access(job)
+	switch(job)
+		if("Geneticist")
+			return list(access_medical, access_morgue, access_genetics)
+		if("Station Engineer")
+			return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction)
+		if("Assistant")
+			if(config.assistant_maint)
+				return list(access_maint_tunnels)
+			else
+				return list()
+		if("Chaplain")
+			return list(access_morgue, access_chapel_office, access_crematorium)
+		if("Detective")
+			return list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
+		if("Medical Doctor")
+			return list(access_medical, access_morgue, access_surgery)
+		if("Botanist")	// -- TLE
+			return list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning.
+		if("Librarian") // -- TLE
+			return list(access_library)
+		if("Lawyer") //Muskets 160910
+			return list(access_lawyer, access_court, access_sec_doors)
+		if("Captain")
+			return get_all_accesses()
+		if("Crew Supervisor")
+			return list(access_security, access_sec_doors, access_brig, access_court)
+		if("Correctional Advisor")
+			return list(access_security, access_sec_doors, access_brig, access_armory, access_court)
+		if("Scientist")
+			return list(access_tox, access_tox_storage, access_research, access_xenobiology)
+		if("Safety Administrator")
+			return list(access_medical, access_morgue, access_tox, access_tox_storage, access_chemistry, access_genetics, access_court,
+			            access_teleporter, access_heads, access_tech_storage, access_security, access_sec_doors, access_brig, access_atmospherics,
+			            access_maint_tunnels, access_bar, access_janitor, access_kitchen, access_robotics, access_armory, access_hydroponics,
+			            access_theatre, access_research, access_hos, access_RC_announce, access_forensics_lockers, access_keycard_auth, access_gateway)
+		if("Head of Personnel")
+			return list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
+			            access_tox, access_tox_storage, access_chemistry, access_medical, access_genetics, access_engine,
+			            access_emergency_storage, access_change_ids, access_ai_upload, access_eva, access_heads,
+			            access_all_personal_lockers, access_tech_storage, access_maint_tunnels, access_bar, access_janitor,
+			            access_crematorium, access_kitchen, access_robotics, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
+			            access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
+			            access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway)
+		if("Atmospheric Technician")
+			return list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction)
+		if("Bartender")
+			return list(access_bar)
+		if("Chemist")
+			return list(access_medical, access_chemistry)
+		if("Janitor")
+			return list(access_janitor, access_maint_tunnels)
+		if("Clown")
+			return list(access_clown, access_theatre)
+		if("Mime")
+			return list(access_mime, access_theatre)
+		if("Chef")
+			return list(access_kitchen, access_morgue)
+		if("Roboticist")
+			return list(access_robotics, access_tech_storage, access_morgue) //As a job that handles so many corpses, it makes sense for them to have morgue access.
+		if("Cargo Technician")
+			return list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting)
+		if("Shaft Miner")
+			return list(access_mining, access_mint, access_mining_station)
+		if("Quartermaster")
+			return list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
+		if("Chief Engineer")
+			return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
+			            access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
+			            access_heads, access_ai_upload, access_construction, access_robotics,
+			            access_mint, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_sec_doors)
+		if("Research Director")
+			return list(access_rd, access_heads, access_tox, access_genetics,
+			            access_tox_storage, access_teleporter,
+			            access_research, access_robotics, access_xenobiology,
+			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_sec_doors)
+		if("Virologist")
+			return list(access_medical, access_virology)
+		if("Chief Medical Officer")
+			return list(access_medical, access_morgue, access_genetics, access_heads,
+			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
+			access_keycard_auth, access_sec_doors)
+		else
+			return list()
+
+/proc/get_centcom_access(job)
+	switch(job)
+		if("VIP Guest")
+			return list(access_cent_general)
+		if("Custodian")
+			return list(access_cent_general, access_cent_living, access_cent_storage)
+		if("Thunderdome Overseer")
+			return list(access_cent_general, access_cent_thunder)
+		if("Intel Officer")
+			return list(access_cent_general, access_cent_living)
+		if("Medical Officer")
+			return list(access_cent_general, access_cent_living, access_cent_medical)
+		if("Death Commando")
+			return list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)
+		if("Research Officer")
+			return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_teleporter, access_cent_storage)
+		if("BlackOps Commander")
+			return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed)
+		if("Supreme Commander")
+			return get_all_centcom_access()
+
+/proc/get_all_accesses()
+	return list(access_security, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_court,
+	            access_medical, access_genetics, access_morgue, access_rd,
+	            access_tox, access_tox_storage, access_chemistry, access_engine, access_engine_equip, access_maint_tunnels,
+	            access_external_airlocks, access_emergency_storage, access_change_ids, access_ai_upload,
+	            access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers,
+	            access_tech_storage, access_chapel_office, access_atmospherics, access_kitchen,
+	            access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_cargo_bot, access_construction,
+	            access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery,
+	            access_theatre, access_research, access_mining, access_mailsorting, access_mint_vault, access_mint,
+	            access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce,
+	            access_keycard_auth, access_tcomsat, access_gateway)
+
+/proc/get_all_centcom_access()
+	return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_creed, access_cent_captain)
+
+/proc/get_all_syndicate_access()
+	return list(access_syndicate)
+
+/proc/get_region_accesses(var/code)
+	switch(code)
+		if(0)
+			return get_all_accesses()
+		if(1) //security
+			return list(access_sec_doors, access_security, access_brig, access_armory, access_forensics_lockers, access_court, access_hos)
+		if(2) //medbay
+			return list(access_medical, access_genetics, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo)
+		if(3) //research
+			return list(access_research, access_tox, access_tox_storage, access_xenobiology, access_rd)
+		if(4) //engineering and maintenance
+			return list(access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_construction, access_robotics, access_ce)
+		if(5) //command
+			return list(access_heads, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_all_personal_lockers, access_heads_vault, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_hop, access_captain)
+		if(6) //station general
+			return list(access_kitchen,access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime)
+		if(7) //supply
+			return list(access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_mining, access_mining_station)
+
+/proc/get_region_accesses_name(var/code)
+	switch(code)
+		if(0)
+			return "All"
+		if(1) //security
+			return "Security"
+		if(2) //medbay
+			return "Medbay"
+		if(3) //research
+			return "Research"
+		if(4) //engineering and maintenance
+			return "Engineering"
+		if(5) //command
+			return "Command"
+		if(6) //station general
+			return "Station General"
+		if(7) //supply
+			return "Supply"
+
+
+/proc/get_access_desc(A)
+	switch(A)
+		if(access_cargo)
+			return "Cargo Bay"
+		if(access_cargo_bot)
+			return "Cargo Bot Delivery"
+		if(access_security)
+			return "Security"
+		if(access_brig)
+			return "Holding Cells"
+		if(access_court)
+			return "Courtroom"
+		if(access_forensics_lockers)
+			return "Detective's Office"
+		if(access_medical)
+			return "Medical"
+		if(access_genetics)
+			return "Genetics Lab"
+		if(access_morgue)
+			return "Morgue"
+		if(access_tox)
+			return "Research Lab"
+		if(access_tox_storage)
+			return "Toxins Storage"
+		if(access_chemistry)
+			return "Chemistry Lab"
+		if(access_rd)
+			return "RD Private"
+		if(access_bar)
+			return "Bar"
+		if(access_janitor)
+			return "Custodial Closet"
+		if(access_engine)
+			return "Engineering"
+		if(access_engine_equip)
+			return "APCs"
+		if(access_maint_tunnels)
+			return "Maintenance"
+		if(access_external_airlocks)
+			return "External Airlocks"
+		if(access_emergency_storage)
+			return "Emergency Storage"
+		if(access_change_ids)
+			return "ID Computer"
+		if(access_ai_upload)
+			return "AI Upload"
+		if(access_teleporter)
+			return "Teleporter"
+		if(access_eva)
+			return "EVA"
+		if(access_heads)
+			return "Bridge"
+		if(access_captain)
+			return "Captain Private"
+		if(access_all_personal_lockers)
+			return "Personal Lockers"
+		if(access_chapel_office)
+			return "Chapel Office"
+		if(access_tech_storage)
+			return "Technical Storage"
+		if(access_atmospherics)
+			return "Atmospherics"
+		if(access_crematorium)
+			return "Crematorium"
+		if(access_armory)
+			return "Armory"
+		if(access_construction)
+			return "Construction Areas"
+		if(access_kitchen)
+			return "Kitchen"
+		if(access_hydroponics)
+			return "Hydroponics"
+		if(access_library)
+			return "Library"
+		if(access_lawyer)
+			return "Law Office"
+		if(access_robotics)
+			return "Robotics"
+		if(access_virology)
+			return "Virology"
+		if(access_cmo)
+			return "CMO Private"
+		if(access_qm)
+			return "Quartermaster's Office"
+		if(access_clown)
+			return "HONK! Access"
+		if(access_mime)
+			return "Silent Access"
+		if(access_surgery)
+			return "Surgery"
+		if(access_theatre)
+			return "Theatre"
+		if(access_manufacturing)
+			return "Manufacturing"
+		if(access_research)
+			return "Science"
+		if(access_mining)
+			return "Mining"
+		if(access_mining_office)
+			return "Mining Office"
+		if(access_mailsorting)
+			return "Delivery Office"
+		if(access_mint)
+			return "Mint"
+		if(access_mint_vault)
+			return "Mint Vault"
+		if(access_heads_vault)
+			return "Main Vault"
+		if(access_mining_station)
+			return "Mining Station EVA"
+		if(access_xenobiology)
+			return "Xenobiology Lab"
+		if(access_hop)
+			return "HoP Private"
+		if(access_hos)
+			return "HoS Private"
+		if(access_ce)
+			return "CE Private"
+		if(access_RC_announce)
+			return "RC Announcements"
+		if(access_keycard_auth)
+			return "Keycode Auth. Device"
+		if(access_tcomsat)
+			return "Telecommunications"
+		if(access_gateway)
+			return "Gateway"
+		if(access_sec_doors)
+			return "Brig"
+
+/proc/get_centcom_access_desc(A)
+	switch(A)
+		if(access_cent_general)
+			return "Code Grey"
+		if(access_cent_thunder)
+			return "Code Yellow"
+		if(access_cent_storage)
+			return "Code Orange"
+		if(access_cent_living)
+			return "Code Green"
+		if(access_cent_medical)
+			return "Code White"
+		if(access_cent_teleporter)
+			return "Code Blue"
+		if(access_cent_specops)
+			return "Code Black"
+		if(access_cent_creed)
+			return "Code Silver"
+		if(access_cent_captain)
+			return "Code Gold"
+
+/proc/get_all_jobs()
+	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Botanist", "Quartermaster", "Cargo Technician",
+				"Shaft Miner", "Clown", "Mime", "Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
+				"Atmospheric Technician", "Roboticist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
+				"Research Director", "Scientist", "Head of Security", "Warden", "Detective", "Security Officer")
+
+/proc/get_all_centcom_jobs()
+	return list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Supreme Commander")
+
+/obj/proc/GetJobName()
+	if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
+		return
+
+	var/jobName
+
+	if(istype(src, /obj/item/device/pda))
+		if(src:id)
+			jobName = src:id:assignment
+	if(istype(src, /obj/item/weapon/card/id))
+		jobName = src:assignment
+
+	if(jobName in get_all_jobs())
+		return jobName
+	else
+		return "Unknown"

code/WorkInProgress/Sigyn/Softcurity/clothing.dm

@@ -0,0 +1,33 @@
+/obj/item/clothing/under/rank/administrator
+	name = "safety administrator's jumpsuit"
+	desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Safety Administrator\"."
+	icon_state = "hosblueclothes"
+	item_state = "ba_suit"
+	color = "hosblueclothes"
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+
+/obj/item/clothing/under/rank/advisor
+	name = "correctional advisor's jumpsuit"
+	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the words \"Correctional Advisor\" written on the shoulders."
+	icon_state = "wardenblueclothes"
+	item_state = "ba_suit"
+	color = "wardenblueclothes"
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+
+/obj/item/clothing/under/rank/supervisor
+	name = "crew supervisor's jumpsuit"
+	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
+	icon_state = "officerblueclothes"
+	item_state = "ba_suit"
+	color = "officerblueclothes"
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+
+/obj/item/clothing/shoes/boots
+	name = "boots"
+	desc = "Nanotrasen-issue hard-toe safety boots."
+	icon_state = "secshoes"
+	item_state = "secshoes"
+	color = "hosred"

code/WorkInProgress/Sigyn/Softcurity/jobs.dm

@@ -0,0 +1,152 @@
+/datum/job/hos
+	title = "Safety Administrator"
+	flag = HOS
+	department_flag = ENGSEC
+	faction = "Station"
+	total_positions = 1
+	spawn_positions = 1
+	supervisors = "the captain"
+	selection_color = "#ffdddd"
+	idtype = /obj/item/weapon/card/id/silver
+	req_admin_notify = 1
+
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hos(H), slot_ears)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/administrator(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hos(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
+		H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/taser(H), slot_s_store)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
+		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
+		L.imp_in = H
+		L.implanted = 1
+		return 1
+
+
+
+/datum/job/warden
+	title = "Correctional Advisor"
+	flag = WARDEN
+	department_flag = ENGSEC
+	faction = "Station"
+	total_positions = 1
+	spawn_positions = 1
+	supervisors = "the safety administrator"
+	selection_color = "#ffeeee"
+
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/advisor(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/warden(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
+		H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
+		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
+		L.imp_in = H
+		L.implanted = 1
+		return 1
+
+
+
+/datum/job/detective
+	title = "Detective"
+	flag = DETECTIVE
+	department_flag = ENGSEC
+	faction = "Station"
+	total_positions = 1
+	spawn_positions = 1
+	supervisors = "the safety administrator"
+	selection_color = "#ffeeee"
+
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/det(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/detective(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(H), slot_head)
+		var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H)
+		CIG.light("")
+		H.equip_to_slot_or_del(CIG, slot_wear_mask)
+		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/det_suit(H), slot_wear_suit)
+		H.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(H), slot_l_store)
+
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack)
+		H.equip_to_slot_or_del(new /obj/item/device/detective_scanner(H), slot_in_backpack)
+
+		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
+		L.imp_in = H
+		L.implanted = 1
+		return 1
+
+
+
+/datum/job/officer
+	title = "Crew Supervisor"
+	flag = OFFICER
+	department_flag = ENGSEC
+	faction = "Station"
+	total_positions = 5
+	spawn_positions = 5
+	supervisors = "the safety administrator"
+	selection_color = "#ffeeee"
+
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/supervisor(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_r_store)
+		H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
+		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
+		L.imp_in = H
+		L.implanted = 1
+		return 1
+
+/datum/job/hop
+	title = "Head of Personnel"
+	flag = HOP
+	department_flag = CIVILIAN
+	faction = "Station"
+	total_positions = 1
+	spawn_positions = 1
+	supervisors = "the captain"
+	selection_color = "#ddddff"
+	idtype = /obj/item/weapon/card/id/silver
+	req_admin_notify = 1
+
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hop(H), slot_ears)
+		if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+		if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hop(H), slot_belt)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H.back), slot_in_backpack)
+		return 1

code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm

@@ -0,0 +1,235 @@
+/obj/structure/closet/secure_closet/captains
+	name = "Captain's Locker"
+	req_access = list(access_captain)
+	icon_state = "capsecure1"
+	icon_closed = "capsecure"
+	icon_locked = "capsecure1"
+	icon_opened = "capsecureopen"
+	icon_broken = "capsecurebroken"
+	icon_off = "capsecureoff"
+
+	New()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/captain(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_cap(src)
+		new /obj/item/clothing/suit/captunic(src)
+		new /obj/item/clothing/head/helmet/cap(src)
+		new /obj/item/clothing/under/rank/captain(src)
+		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/weapon/cartridge/captain(src)
+		new /obj/item/clothing/head/helmet/swat(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/device/radio/headset/heads/captain(src)
+		new /obj/item/weapon/reagent_containers/food/drinks/flask(src)
+		new /obj/item/clothing/gloves/captain(src)
+		new /obj/item/weapon/gun/energy/gun(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/hop
+	name = "Head of Personnel's Locker"
+	req_access = list(access_hop)
+	icon_state = "hopsecure1"
+	icon_closed = "hopsecure"
+	icon_locked = "hopsecure1"
+	icon_opened = "hopsecureopen"
+	icon_broken = "hopsecurebroken"
+	icon_off = "hopsecureoff"
+
+	New()
+		sleep(2)
+		new /obj/item/clothing/under/rank/head_of_personnel(src)
+		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/head/helmet(src)
+		new /obj/item/weapon/cartridge/hop(src)
+		new /obj/item/device/radio/headset/heads/hop(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/weapon/storage/id_kit(src)
+		new /obj/item/weapon/storage/id_kit( src )
+		new /obj/item/device/flash(src)
+		new /obj/item/clothing/glasses/sunglasses(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/hos
+	name = "Safety Administrator's Locker"
+	req_access = list(access_hos)
+	icon_state = "hossecure1"
+	icon_closed = "hossecure"
+	icon_locked = "hossecure1"
+	icon_opened = "hossecureopen"
+	icon_broken = "hossecurebroken"
+	icon_off = "hossecureoff"
+
+	New()
+		sleep(2)
+		new /obj/item/weapon/storage/backpack/satchel_sec(src)
+		new /obj/item/weapon/cartridge/hos(src)
+		new /obj/item/device/radio/headset/heads/hos(src)
+		new /obj/item/weapon/storage/lockbox/loyalty(src)
+		new /obj/item/weapon/storage/flashbang_kit(src)
+		new /obj/item/weapon/storage/belt/security(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/weapon/melee/baton(src)
+		new /obj/item/weapon/gun/energy/taser(src)
+		new /obj/item/weapon/reagent_containers/spray/pepper(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/warden
+	name = "Correctional Advisor's Locker"
+	req_access = list(access_armory)
+	icon_state = "wardensecure1"
+	icon_closed = "wardensecure"
+	icon_locked = "wardensecure1"
+	icon_opened = "wardensecureopen"
+	icon_broken = "wardensecurebroken"
+	icon_off = "wardensecureoff"
+
+
+	New()
+		sleep(2)
+		new /obj/item/weapon/storage/backpack/satchel_sec(src)
+		new /obj/item/clothing/under/rank/advisor(src)
+		new /obj/item/device/radio/headset/headset_sec(src)
+		new /obj/item/clothing/glasses/sunglasses(src)
+		new /obj/item/weapon/storage/flashbang_kit(src)
+		new /obj/item/weapon/storage/belt/security(src)
+		new /obj/item/weapon/reagent_containers/spray/pepper(src)
+		new /obj/item/weapon/reagent_containers/spray/pepper(src)
+		new /obj/item/weapon/melee/baton(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/security
+	name = "Crew Supervisor's Locker"
+	req_access = list(access_security)
+	icon_state = "sec1"
+	icon_closed = "sec"
+	icon_locked = "sec1"
+	icon_opened = "secopen"
+	icon_broken = "secbroken"
+	icon_off = "secoff"
+
+	New()
+		sleep(2)
+		new /obj/item/weapon/storage/backpack/satchel_sec(src)
+		new /obj/item/device/radio/headset/headset_sec(src)
+		new /obj/item/weapon/storage/belt/security(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/weapon/reagent_containers/spray/pepper(src)
+		new /obj/item/weapon/reagent_containers/spray/pepper(src)
+		new /obj/item/clothing/glasses/sunglasses(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/detective
+	name = "Detective's Cabinet"
+	req_access = list(access_forensics_lockers)
+	icon_state = "cabinetdetective_locked"
+	icon_closed = "cabinetdetective"
+	icon_locked = "cabinetdetective_locked"
+	icon_opened = "cabinetdetective_open"
+	icon_broken = "cabinetdetective_broken"
+	icon_off = "cabinetdetective_broken"
+
+	New()
+		sleep(2)
+		new /obj/item/clothing/under/det(src)
+		new /obj/item/clothing/suit/armor/det_suit(src)
+		new /obj/item/clothing/suit/det_suit(src)
+		new /obj/item/clothing/gloves/black(src)
+		new /obj/item/clothing/head/det_hat(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/device/radio/headset/headset_sec(src)
+		new /obj/item/weapon/cartridge/detective(src)
+		new /obj/item/weapon/clipboard(src)
+		new /obj/item/device/detective_scanner(src)
+		new /obj/item/weapon/storage/box/evidence(src)
+		return
+
+/obj/structure/closet/secure_closet/detective/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened
+
+/obj/structure/closet/secure_closet/injection
+	name = "Lethal Injections"
+	req_access = list(access_hos)
+
+
+	New()
+		sleep(2)
+		new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src)
+		new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/brig
+	name = "Brig Locker"
+	req_access = list(access_brig)
+	anchored = 1
+
+	New()
+		new /obj/item/clothing/under/color/orange( src )
+		new /obj/item/clothing/shoes/orange( src )
+		return
+
+
+
+/obj/structure/closet/secure_closet/courtroom
+	name = "Courtroom Locker"
+	req_access = list(access_court)
+
+	New()
+		sleep(2)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/pen (src)
+		new /obj/item/clothing/suit/judgerobe (src)
+		new /obj/item/clothing/head/powdered_wig (src)
+		new /obj/item/weapon/storage/briefcase(src)
+		return
+
+/obj/structure/closet/secure_closet/wall
+	name = "wall locker"
+	req_access = list(access_security)
+	icon_state = "wall-locker1"
+	density = 1
+	icon_closed = "wall-locker"
+	icon_locked = "wall-locker1"
+	icon_opened = "wall-lockeropen"
+	icon_broken = "wall-lockerbroken"
+	icon_off = "wall-lockeroff"
+
+	//too small to put a man in
+	large = 0
+
+/obj/structure/closet/secure_closet/wall/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened

code/WorkInProgress/Sigyn/Softcurity/wardrobe.dm

@@ -0,0 +1,311 @@
+/obj/structure/closet/wardrobe
+	name = "wardrobe"
+	desc = "It's a storage unit for standard-issue Nanotrasen attire."
+	icon_state = "blue"
+	icon_closed = "blue"
+
+/obj/structure/closet/wardrobe/New()
+	new /obj/item/clothing/under/color/blue(src)
+	new /obj/item/clothing/under/color/blue(src)
+	new /obj/item/clothing/under/color/blue(src)
+	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/clothing/shoes/brown(src)
+	return
+
+
+/obj/structure/closet/wardrobe/red
+	name = "security wardrobe"
+	icon_state = "red"
+	icon_closed = "red"
+
+/obj/structure/closet/wardrobe/red/New()
+	new /obj/item/clothing/under/rank/supervisor(src)
+	new /obj/item/clothing/under/rank/supervisor(src)
+	new /obj/item/clothing/under/rank/supervisor(src)
+	new /obj/item/clothing/shoes/boots(src)
+	new /obj/item/clothing/shoes/boots(src)
+	new /obj/item/clothing/shoes/boots(src)
+	new /obj/item/clothing/head/soft/grey(src)
+	new /obj/item/clothing/head/soft/grey(src)
+	new /obj/item/clothing/head/soft/grey(src)
+	return
+
+
+/obj/structure/closet/wardrobe/pink
+	name = "pink wardrobe"
+	icon_state = "pink"
+	icon_closed = "pink"
+
+/obj/structure/closet/wardrobe/pink/New()
+	new /obj/item/clothing/under/color/pink(src)
+	new /obj/item/clothing/under/color/pink(src)
+	new /obj/item/clothing/under/color/pink(src)
+	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/clothing/shoes/brown(src)
+	return
+
+/obj/structure/closet/wardrobe/black
+	name = "black wardrobe"
+	icon_state = "black"
+	icon_closed = "black"
+
+/obj/structure/closet/wardrobe/black/New()
+	new /obj/item/clothing/under/color/black(src)
+	new /obj/item/clothing/under/color/black(src)
+	new /obj/item/clothing/under/color/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/head/that(src)
+	new /obj/item/clothing/head/that(src)
+	new /obj/item/clothing/head/that(src)
+	return
+
+
+/obj/structure/closet/wardrobe/chaplain_black
+	name = "chapel wardrobe"
+	desc = "It's a storage unit for Nanotrasen-approved religious attire."
+	icon_state = "black"
+	icon_closed = "black"
+
+/obj/structure/closet/wardrobe/chaplain_black/New()
+	new /obj/item/clothing/under/rank/chaplain(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/suit/nun(src)
+	new /obj/item/clothing/head/nun_hood(src)
+	new /obj/item/clothing/suit/chaplain_hoodie(src)
+	new /obj/item/clothing/head/chaplain_hood(src)
+	new /obj/item/clothing/suit/holidaypriest(src)
+	new /obj/item/weapon/storage/backpack/cultpack (src)
+	new /obj/item/weapon/storage/fancy/candle_box(src)
+	new /obj/item/weapon/storage/fancy/candle_box(src)
+	return
+
+
+/obj/structure/closet/wardrobe/green
+	name = "green wardrobe"
+	icon_state = "green"
+	icon_closed = "green"
+
+/obj/structure/closet/wardrobe/green/New()
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	return
+
+
+/obj/structure/closet/wardrobe/orange
+	name = "prison wardrobe"
+	desc = "It's a storage unit for Nanotrasen-regulation prisoner attire."
+	icon_state = "orange"
+	icon_closed = "orange"
+
+/obj/structure/closet/wardrobe/orange/New()
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	return
+
+
+/obj/structure/closet/wardrobe/yellow
+	name = "yellow wardrobe"
+	icon_state = "wardrobe-y"
+	icon_closed = "wardrobe-y"
+
+/obj/structure/closet/wardrobe/yellow/New()
+	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	return
+
+
+/obj/structure/closet/wardrobe/atmospherics_yellow
+	name = "atmospherics wardrobe"
+	icon_state = "yellow"
+	icon_closed = "yellow"
+
+/obj/structure/closet/wardrobe/atmospherics_yellow/New()
+	new /obj/item/clothing/under/rank/atmospheric_technician(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	return
+
+
+
+/obj/structure/closet/wardrobe/engineering_yellow
+	name = "engineering wardrobe"
+	icon_state = "yellow"
+	icon_closed = "yellow"
+
+/obj/structure/closet/wardrobe/engineering_yellow/New()
+	new /obj/item/clothing/under/rank/engineer(src)
+	new /obj/item/clothing/under/rank/engineer(src)
+	new /obj/item/clothing/under/rank/engineer(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	return
+
+
+/obj/structure/closet/wardrobe/white
+	name = "white wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/white/New()
+	new /obj/item/clothing/under/color/white(src)
+	new /obj/item/clothing/under/color/white(src)
+	new /obj/item/clothing/under/color/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	return
+
+
+/obj/structure/closet/wardrobe/pjs
+	name = "Pajama wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/pjs/New()
+	new /obj/item/clothing/under/pj/red(src)
+	new /obj/item/clothing/under/pj/red(src)
+	new /obj/item/clothing/under/pj/blue(src)
+	new /obj/item/clothing/under/pj/blue(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	return
+
+
+/obj/structure/closet/wardrobe/toxins_white
+	name = "toxins wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/toxins_white/New()
+	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/suit/labcoat(src)
+	new /obj/item/clothing/suit/labcoat(src)
+	new /obj/item/clothing/suit/labcoat(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	return
+
+
+/obj/structure/closet/wardrobe/robotics_black
+	name = "robotics wardrobe"
+	icon_state = "black"
+	icon_closed = "black"
+
+/obj/structure/closet/wardrobe/robotics_black/New()
+	new /obj/item/clothing/under/rank/roboticist(src)
+	new /obj/item/clothing/under/rank/roboticist(src)
+	new /obj/item/clothing/suit/labcoat(src)
+	new /obj/item/clothing/suit/labcoat(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/gloves/black(src)
+	return
+
+
+/obj/structure/closet/wardrobe/chemistry_white
+	name = "chemistry wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/chemistry_white/New()
+	new /obj/item/clothing/under/rank/chemist(src)
+	new /obj/item/clothing/under/rank/chemist(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/labcoat/chemist(src)
+	new /obj/item/clothing/suit/labcoat/chemist(src)
+	return
+
+
+/obj/structure/closet/wardrobe/genetics_white
+	name = "genetics wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/genetics_white/New()
+	new /obj/item/clothing/under/rank/geneticist(src)
+	new /obj/item/clothing/under/rank/geneticist(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/labcoat/genetics(src)
+	new /obj/item/clothing/suit/labcoat/genetics(src)
+	return
+
+
+/obj/structure/closet/wardrobe/virology_white
+	name = "virology wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/virology_white/New()
+	new /obj/item/clothing/under/rank/virologist(src)
+	new /obj/item/clothing/under/rank/virologist(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/labcoat/virologist(src)
+	new /obj/item/clothing/suit/labcoat/virologist(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	return
+
+
+/obj/structure/closet/wardrobe/grey
+	name = "grey wardrobe"
+	icon_state = "grey"
+	icon_closed = "grey"
+
+/obj/structure/closet/wardrobe/grey/New()
+	new /obj/item/clothing/under/color/grey(src)
+	new /obj/item/clothing/under/color/grey(src)
+	new /obj/item/clothing/under/color/grey(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/head/soft/grey(src)
+	new /obj/item/clothing/head/soft/grey(src)
+	new /obj/item/clothing/head/soft/grey(src)
+	return
+
+
+/obj/structure/closet/wardrobe/mixed
+	name = "mixed wardrobe"
+	icon_state = "mixed"
+	icon_closed = "mixed"
+
+/obj/structure/closet/wardrobe/mixed/New()
+	new /obj/item/clothing/under/color/white(src)
+	new /obj/item/clothing/under/color/blue(src)
+	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/pink(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/clothing/shoes/white(src)
+	return

code/WorkInProgress/Susan/susan_desert_turfs.dm

@@ -6,12 +6,19 @@ turf/unsimulated/desert
 	icon_state = "desert"
 	temperature = 393.15
 	luminosity = 5
-	brightness_on = 1
 	lighting_lumcount = 8
 
 turf/unsimulated/desert/New()
 	icon_state = "desert[rand(0,4)]"
 
+turf/simulated/wall/impassable_rock
+	name = "Mountain Wall"
+
+	//so that you can see the impassable sections in the map editor
+	icon_state = "riveted"
+	New()
+		icon_state = "rock"
+
 /area/awaymission/labs/researchdivision
 	name = "Research"
 	icon_state = "away3"
@@ -54,47 +61,8 @@ turf/unsimulated/desert/New()
 
 //corpses and possibly other decorative items
 
-/obj/effect/landmark/corpse/alien/New() //Creates a mob and checks for gear in each slot before attempting to equip it.
-	var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc)
-	M.dna.mutantrace = "lizard"
-	M.real_name = src.name
-	M.stat = 2 //Kills the new mob
-	if(src.corpseuniform)
-		M.equip_to_slot_or_del(new src.corpseuniform(M), slot_w_uniform)
-	if(src.corpsesuit)
-		M.equip_to_slot_or_del(new src.corpsesuit(M), slot_wear_suit)
-	if(src.corpseshoes)
-		M.equip_to_slot_or_del(new src.corpseshoes(M), slot_shoes)
-	if(src.corpsegloves)
-		M.equip_to_slot_or_del(new src.corpsegloves(M), slot_gloves)
-	if(src.corpseradio)
-		M.equip_to_slot_or_del(new src.corpseradio(M), slot_ears)
-	if(src.corpseglasses)
-		M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses)
-	if(src.corpsemask)
-		M.equip_to_slot_or_del(new src.corpsemask(M), slot_wear_mask)
-	if(src.corpsehelmet)
-		M.equip_to_slot_or_del(new src.corpsehelmet(M), slot_head)
-	if(src.corpsebelt)
-		M.equip_to_slot_or_del(new src.corpsebelt(M), slot_belt)
-	if(src.corpsepocket1)
-		M.equip_to_slot_or_del(new src.corpsepocket1(M), slot_r_store)
-	if(src.corpsepocket2)
-		M.equip_to_slot_or_del(new src.corpsepocket2(M), slot_l_store)
-	if(src.corpseback)
-		M.equip_to_slot_or_del(new src.corpseback(M), slot_back)
-	if(src.corpseid == 1)
-		var/obj/item/weapon/card/id/W = new(M)
-		W.name = "[M.real_name]'s ID Card"
-		if(src.corpseidicon)
-			W.icon_state = corpseidicon
-		if(src.corpseidaccess)
-			W.access = get_access(corpseidaccess)
-		if(corpseidjob)
-			W.assignment = corpseidjob
-		W.registered_name = M.real_name
-		M.equip_to_slot_or_del(W, slot_wear_id)
-	del(src)
+/obj/effect/landmark/corpse/alien
+	mutantrace = "lizard"
 
 /obj/effect/landmark/corpse/alien/cargo
 	name = "Cargo Technician"

code/WorkInProgress/autopsy.dm

@@ -1,3 +1,12 @@
+
+//moved these here from code/defines/obj/weapon.dm
+//please preference put stuff where it's easy to find - C
+
+/obj/item/weapon/autopsy_scanner/var/list/datum/autopsy_data_scanner/wdata = list()
+/obj/item/weapon/autopsy_scanner/var/list/datum/autopsy_data_scanner/chemtraces = list()
+/obj/item/weapon/autopsy_scanner/var/target_name = null
+/obj/item/weapon/autopsy_scanner/var/timeofdeath = null
+
 /datum/autopsy_data_scanner
 	var/weapon = null // this is the DEFINITE weapon type that was used
 	var/list/organs_scanned = list() // this maps a number of scanned organs to

code/ZAS/Airflow.dm

@@ -206,8 +206,9 @@ proc/AirflowSpace(zone/A)
 		if(M.last_airflow > world.time - vsc.airflow_delay) continue
 
 		if(ismob(M) && n > vsc.airflow_stun_pressure)
-			if(M:nodamage) continue
-			M:airflow_stun()
+			var/mob/O = M
+			if(O.status_flags & GODMODE) continue
+			O.airflow_stun()
 
 		if(M.check_airflow_movable(n))
 

code/ZAS/FEA_gas_mixture.dm

@@ -4,6 +4,13 @@ What are the archived variables for?
 	This prevents race conditions that arise based on the order of tile processing.
 */
 
+#define SPECIFIC_HEAT_TOXIN		200
+#define SPECIFIC_HEAT_AIR		20
+#define SPECIFIC_HEAT_CDO		30
+#define HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,toxins) \
+	(carbon_dioxide*SPECIFIC_HEAT_CDO + (oxygen+nitrogen)*SPECIFIC_HEAT_AIR + toxins*SPECIFIC_HEAT_TOXIN)
+
+#define MINIMUM_HEAT_CAPACITY	0.0003
 #define QUANTIZE(variable)		(round(variable,0.0001))
 #define TRANSFER_FRACTION 5 //What fraction (1/#) of the air difference to try and transfer
 

code/ZAS/ZAS_Zones.dm

@@ -151,8 +151,10 @@ zone/proc/process()
 	//Sometimes explosions will cause the air to be deleted for some reason.
 	if(!air)
 		air = new()
-		air.adjust(MOLES_O2STANDARD, 0, MOLES_N2STANDARD, 0, list())
+		air.oxygen = MOLES_O2STANDARD
+		air.nitrogen = MOLES_N2STANDARD
 		air.temperature = T0C
+		air.total_moles()
 		world.log << "Air object lost in zone. Regenerating."
 
 	progress = "problem with: ShareSpace()"

code/ZAS_defines.dm

@@ -1,89 +0,0 @@
-//from setup.dm, which was removed in tgcode
-
-#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05
-	//Minimum ratio of air that must move to/from a tile to suspend group processing
-#define MINIMUM_AIR_TO_SUSPEND MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_SUSPEND
-	//Minimum amount of air that has to move before a group processing can be suspended
-
-#define MINIMUM_MOLES_DELTA_TO_MOVE MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_SUSPEND //Either this must be active
-#define MINIMUM_TEMPERATURE_TO_MOVE	T20C+100 		  //or this (or both, obviously)
-
-#define MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND 0.012
-#define MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND 4
-	//Minimum temperature difference before group processing is suspended
-#define MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER 0.5
-	//Minimum temperature difference before the gas temperatures are just set to be equal
-
-#define MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION		T20C+10
-#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION	T20C+200
-
-#define FLOOR_HEAT_TRANSFER_COEFFICIENT 0.08
-#define WALL_HEAT_TRANSFER_COEFFICIENT 0.03
-#define SPACE_HEAT_TRANSFER_COEFFICIENT 0.20 //a hack to partly simulate radiative heat
-#define OPEN_HEAT_TRANSFER_COEFFICIENT 0.40
-#define WINDOW_HEAT_TRANSFER_COEFFICIENT 0.10 //a hack for now
-	//Must be between 0 and 1. Values closer to 1 equalize temperature faster
-	//Should not exceed 0.4 else strange heat flow occur
-
-#define FIRE_MINIMUM_TEMPERATURE_TO_SPREAD	150+T0C
-#define FIRE_MINIMUM_TEMPERATURE_TO_EXIST	100+T0C
-#define FIRE_SPREAD_RADIOSITY_SCALE		0.85
-#define FIRE_CARBON_ENERGY_RELEASED	  500000 //Amount of heat released per mole of burnt carbon into the tile
-#define FIRE_PLASMA_ENERGY_RELEASED	 3000000 //Amount of heat released per mole of burnt plasma into the tile
-#define FIRE_GROWTH_RATE			25000 //For small fires
-
-//Plasma fire properties
-#define PLASMA_MINIMUM_BURN_TEMPERATURE		100+T0C
-#define PLASMA_UPPER_TEMPERATURE			1370+T0C
-#define PLASMA_MINIMUM_OXYGEN_NEEDED		2
-#define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO	30
-#define PLASMA_OXYGEN_FULLBURN				10
-
-#define T0C 273.15					// 0degC
-#define T20C 293.15					// 20degC
-#define TCMB 2.7					// -270.3degC
-
-#define TANK_LEAK_PRESSURE		(30.*ONE_ATMOSPHERE)	// Tank starts leaking
-#define TANK_RUPTURE_PRESSURE	(40.*ONE_ATMOSPHERE) // Tank spills all contents into atmosphere
-
-#define TANK_FRAGMENT_PRESSURE	(50.*ONE_ATMOSPHERE) // Boom 3x3 base explosion
-#define TANK_FRAGMENT_SCALE	    (10.*ONE_ATMOSPHERE) // +1 for each SCALE kPa aboe threshold
-								// was 2 atm
-
-#define NORMPIPERATE 30					//pipe-insulation rate divisor
-#define HEATPIPERATE 8					//heat-exch pipe insulation
-
-#define FLOWFRAC 0.99				// fraction of gas transfered per process
-
-#define CELL_VOLUME 2500	//liters in a cell
-#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION))	//moles in a 2.5 m^3 cell at 101.325 Pa and 20 degC
-
-#define O2STANDARD 0.21
-#define N2STANDARD 0.79
-
-#define MOLES_O2STANDARD MOLES_CELLSTANDARD*O2STANDARD	// O2 standard value (21%)
-#define MOLES_N2STANDARD MOLES_CELLSTANDARD*N2STANDARD	// N2 standard value (79%)
-
-#define MOLES_PLASMA_VISIBLE	0.5 //Moles in a standard cell after which plasma is visible
-
-#define SPECIFIC_HEAT_TOXIN		200
-#define SPECIFIC_HEAT_AIR		20
-#define SPECIFIC_HEAT_CDO		30
-#define HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,toxins) \
-	(carbon_dioxide*SPECIFIC_HEAT_CDO + (oxygen+nitrogen)*SPECIFIC_HEAT_AIR + toxins*SPECIFIC_HEAT_TOXIN)
-
-#define MINIMUM_HEAT_CAPACITY	0.0003
-#define QUANTIZE(variable)		(round(variable,0.0001))
-#define TRANSFER_FRACTION 5 //What fraction (1/#) of the air difference to try and transfer
-
-//from FEA_gas_mixture.dm
-
-#define SPECIFIC_HEAT_TOXIN		200
-#define SPECIFIC_HEAT_AIR		20
-#define SPECIFIC_HEAT_CDO		30
-#define HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,toxins) \
-	(carbon_dioxide*SPECIFIC_HEAT_CDO + (oxygen+nitrogen)*SPECIFIC_HEAT_AIR + toxins*SPECIFIC_HEAT_TOXIN)
-
-#define MINIMUM_HEAT_CAPACITY	0.0003
-#define QUANTIZE(variable)		(round(variable,0.0001))
-#define TRANSFER_FRACTION 5 //What fraction (1/#) of the air difference to try and transfer

code/__HELPERS/files.dm

@@ -15,4 +15,46 @@
 //Sends resource files to client cache
 /client/proc/getFiles()
 	for(var/file in args)
-		src << browse_rsc(file)
+		src << browse_rsc(file)
+
+/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list(".txt",".log",".htm"))
+	var/path = root
+
+	for(var/i=0, i<max_iterations, i++)
+		var/list/choices = flist(path)
+		if(path != root)
+			choices.Insert(1,"/")
+
+		var/choice = input(src,"Choose a file to access:","Download",null) as null|anything in choices
+		switch(choice)
+			if(null)
+				return
+			if("/")
+				path = root
+				continue
+		path += choice
+
+		if(copytext(path,-1,0) != "/")		//didn't choose a directory, no need to iterate again
+			break
+
+	var/extension = copytext(path,-4,0)
+	if( !fexists(path) || !(extension in valid_extensions) )
+		src << "<font color='red'>Error: browse_files(): File not found/Invalid file([path]).</font>"
+		return
+
+	return path
+
+#define FTPDELAY 200	//200 tick delay to discourage spam
+/*	This proc is a failsafe to prevent spamming of file requests.
+	It is just a timer that only permits a download every [FTPDELAY] ticks.
+	This can be changed by modifying FTPDELAY's value above.
+
+	PLEASE USE RESPONSIBLY, Some log files canr each sizes of 4MB!	*/
+/client/proc/file_spam_check()
+	var/time_to_wait = fileaccess_timer - world.time
+	if(time_to_wait > 0)
+		src << "<font color='red'>Error: file_spam_check(): Spam. Please wait [round(time_to_wait/10)] seconds.</font>"
+		return 1
+	fileaccess_timer = world.time + FTPDELAY
+	return 0
+#undef FTPDELAY

code/__HELPERS/game.dm

@@ -275,6 +275,8 @@ proc/isInSight(var/atom/A, var/atom/B)
 		if(M.ckey == lowertext(key))
 			return M
 	return null
+
+//i think this is used soley by verb/give(), cael
 proc/check_can_reach(atom/user, atom/target)
 	if(!in_range(user,target))
 		return 0
@@ -316,7 +318,6 @@ var/list/DummyCache = list()
 	return 1
 
 // Will return a list of active candidates. It increases the buffer 5 times until it finds a candidate which is active within the buffer.
-
 /proc/get_active_candidates(var/buffer = 1)
 
 	var/list/candidates = list() //List of candidate KEYS to assume control of the new larva ~Carn
@@ -344,3 +345,20 @@ var/list/DummyCache = list()
 		i++
 	return candidates
 
+/proc/ScreenText(obj/O, maptext="", screen_loc="CENTER-7,CENTER-7", maptext_height=480, maptext_width=480)
+	if(!isobj(O))	O = new /obj/screen/text()
+	O.maptext = maptext
+	O.maptext_height = maptext_height
+	O.maptext_width = maptext_width
+	O.screen_loc = screen_loc
+	return O
+
+/proc/Show2Group4Delay(obj/O, list/group, delay=0)
+	if(!isobj(O))	return
+	if(!group)	group = clients
+	for(var/client/C in group)
+		C.screen += O
+	if(delay)
+		spawn(delay)
+			for(var/client/C in group)
+				C.screen -= O

code/__HELPERS/lists.dm

@@ -313,4 +313,11 @@ proc/listclearnulls(list/list)
 		if(index == i)
 			return key
 		i++
-	return null
+	return null
+
+/proc/count_by_type(var/list/L, type)
+	var/i = 0
+	for(var/T in L)
+		if(istype(T, type))
+			i++
+	return i

code/__HELPERS/mobs.dm

@@ -15,7 +15,7 @@ proc/random_name(gender, species = "Human")
 	else				return capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names))
 
 proc/random_skin_tone()
-	switch(pick(55;"caucasian", 15;"afroamerican", 10;"african", 10;"latino", 5;"albino", 5;"weird"))
+	switch(pick(60;"caucasian", 15;"afroamerican", 10;"african", 10;"latino", 5;"albino"))
 		if("caucasian")		. = -10
 		if("afroamerican")	. = -115
 		if("african")		. = -165

code/__HELPERS/names.dm

@@ -265,7 +265,7 @@ var/syndicate_code_response//Code response for traitors.
 		if(4)
 			syndicate_code_phrase += pick("I wish I was","My dad was","His mom was","Where do I find","The hero this station needs is","I'd fuck","I wouldn't trust","Someone caught","HoS caught","Someone found","I'd wrestle","I wanna kill")
 			syndicate_code_phrase += " [pick("a","the")] "
-			syndicate_code_phrase += pick("wizard","ninja","xeno","lizard","metroid","monkey","syndicate","cyborg","clown","space carp","singularity","singulo","mime")
+			syndicate_code_phrase += pick("wizard","ninja","xeno","lizard","slime","monkey","syndicate","cyborg","clown","space carp","singularity","singulo","mime")
 			syndicate_code_phrase += "."
 		if(5)
 			syndicate_code_phrase += pick("Do we have","Is there","Where is","Where's","Who's")

code/__HELPERS/unsorted.dm

@@ -474,7 +474,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 		moblist.Add(M)
 	for(var/mob/living/carbon/monkey/M in sortmob)
 		moblist.Add(M)
-	for(var/mob/living/carbon/metroid/M in sortmob)
+	for(var/mob/living/carbon/slime/M in sortmob)
 		moblist.Add(M)
 	for(var/mob/living/simple_animal/M in sortmob)
 		moblist.Add(M)
@@ -1227,6 +1227,13 @@ proc/get_mob_with_client_list()
 		location = location.loc
 	return null
 
+/proc/get(atom/loc, type)
+	while(loc)
+		if(istype(loc, type))
+			return loc
+		loc = loc.loc
+	return null
+
 /proc/get_turf_or_move(turf/location)
 	return get_turf(location)
 
@@ -1281,6 +1288,11 @@ var/global/list/common_tools = list(
 		return 1
 	return 0
 
+/proc/iswire(O)
+	if(istype(O, /obj/item/weapon/cable_coil))
+		return 1
+	return 0
+
 proc/is_hot(obj/item/W as obj)
 	switch(W.type)
 		if(/obj/item/weapon/weldingtool)
@@ -1384,7 +1396,7 @@ var/list/WALLITEMS = list(
 	"/obj/machinery/status_display", "/obj/machinery/requests_console", "/obj/machinery/light_switch", "/obj/effect/sign",
 	"/obj/machinery/newscaster", "/obj/machinery/firealarm", "/obj/structure/noticeboard", "/obj/machinery/door_control",
 	"/obj/machinery/computer/security/telescreen", "/obj/machinery/embedded_controller/radio/simple_vent_controller",
-	"/obj/item/weapon/secstorage/ssafe", "/obj/machinery/door_timer", "/obj/machinery/flasher", "/obj/machinery/keycard_auth",
+	"/obj/item/weapon/storage/secure/safe", "/obj/machinery/door_timer", "/obj/machinery/flasher", "/obj/machinery/keycard_auth",
 	"/obj/structure/mirror", "/obj/structure/closet/fireaxecabinet", "/obj/machinery/computer/security/telescreen/entertainment"
 	)
 /proc/gotwallitem(loc, dir)

code/controllers/_DynamicAreaLighting_TG.dm

@@ -236,18 +236,24 @@ turf/proc/update_lumcount(amount)
 
 turf/proc/shift_to_subarea()
 	lighting_changed = 0
-
 	var/area/Area = loc
+
 	if(!istype(Area) || !Area.lighting_use_dynamic) return
 
 	// change the turf's area depending on its brightness
 	// restrict light to valid levels
 	var/light = min(max(round(lighting_lumcount,1),0),lighting_controller.lighting_states)
-	var/new_tag = "[Area.type]sd_L[light]"
+
+	var/find = findtextEx(Area.tag, "sd_L")
+	var/new_tag = copytext(Area.tag, 1, find)
+	new_tag += "sd_L[light]"
 
 	if(Area.tag!=new_tag)	//skip if already in this area
+
 		var/area/A = locate(new_tag)	// find an appropriate area
+
 		if(!A)
+
 			A = new Area.type()    // create area if it wasn't found
 			// replicate vars
 			for(var/V in Area.vars)
@@ -294,73 +300,6 @@ area
 			//show the dark overlay so areas, not yet in a lighting subarea, won't be bright as day and look silly.
 				SetLightLevel(4)
 
-atom
-	var/light_on = 0 //Am I emitting light?
-	var/brightness_on = 0 //Luminosity when the above: light_on = 1
-
-	//Called when turning off or dropping a flashlight for ex.
-	//It checks the users slots for another source of light, and return the appropriate brightness. 0 if no other source is found
-	proc/search_light(mob/M, obj/item/W as obj)
-		var/list/slots
-		var/obj/item/I
-		var brightness = 0 //the new brightness to be returned
-
-		if (istype(M, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = M
-			slots = list (
-				"l_hand",
-				"r_hand",
-				"belt",
-				"head",
-				"l_pocket",
-				"r_pocket",
-				"s_store")
-
-			for (var/slot in slots)
-				switch(slot)
-					if("belt")
-						I = H.belt
-					if("head")
-						I = H.head
-					if("l_hand")
-						I = H.l_hand
-					if("r_hand")
-						I = H.r_hand
-					if("l_pocket")
-						I = H.l_store
-					if("r_pocket")
-						I = H.r_store
-					if("s_store")
-						I = H.s_store
-				if (I)
-					if ((I.light_on) && (I != W)) //an item emitting light other than itself
-						if (I.brightness_on > brightness)
-							brightness = I.brightness_on
-
-		else if (istype(M, /mob/living/carbon/monkey))
-			slots = list (
-				"l_hand",
-				"r_hand")
-
-			for (var/slot in slots)
-				switch(slot)
-					if("l_hand")
-						I = M.l_hand
-					if("r_hand")
-						I = M.r_hand
-				if (I)
-					if ((I.light_on) && (I != W)) //an item emitting light other than itself
-						if (I.brightness_on > brightness)
-							brightness = I.brightness_on
-
-		else
-			for (I in M.contents) //Justin Case
-				if (I)
-					if ((I.light_on) && (I != W)) //an item emitting light other than itself
-						if (I.brightness_on > brightness)
-							brightness = I.brightness_on
-
-		return brightness
 
 #undef LIGHTING_MAX_LUMINOSITY
 #undef LIGHTING_MAX_LUMINOSITY_MOB

code/controllers/configuration.dm

@@ -33,6 +33,7 @@
 	var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard
 	var/traitor_scaling = 0 			//if amount of traitors scales based on amount of players
 	var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other
+	var/continous_rounds = 0			// Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke.
 	var/allow_Metadata = 0				// Metadata is supported.
 	var/popup_admin_pm = 0				//adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
 	var/Ticklag = 0.9
@@ -54,6 +55,7 @@
 	var/load_jobs_from_txt = 0
 	var/ToRban = 0
 	var/automute_on = 0					//enables automuting/spam prevention
+	var/jobs_have_minimal_access = 0	//determines whether jobs use minimal access or expanded access.
 
 	var/usealienwhitelist = 0
 	var/limitalienplayers = 0
@@ -100,7 +102,7 @@
 	var/robot_delay = 0
 	var/monkey_delay = 0
 	var/alien_delay = 0
-	var/metroid_delay = 0
+	var/slime_delay = 0
 	var/animal_delay = 0
 
 	var/admin_legacy_system = 0	//Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt
@@ -160,6 +162,9 @@
 				if ("ban_legacy_system")
 					config.ban_legacy_system = 1
 
+				if ("jobs_have_minimal_access")
+					config.jobs_have_minimal_access = 1
+
 				if ("log_ooc")
 					config.log_ooc = 1
 
@@ -371,6 +376,9 @@
 				if("gateway_delay")
 					config.gateway_delay = text2num(value)
 
+				if("continuous_rounds")
+					config.continous_rounds = 1
+
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 
@@ -403,8 +411,8 @@
 					config.monkey_delay = value
 				if("alien_delay")
 					config.alien_delay = value
-				if("metroid_delay")
-					config.metroid_delay = value
+				if("slime_delay")
+					config.slime_delay = value
 				if("animal_delay")
 					config.animal_delay = value
 				if("organ_health_multiplier")

code/controllers/master_controller.dm

@@ -21,6 +21,7 @@ datum/controller/game_controller
 	var/objects_cost	= 0
 	var/networks_cost	= 0
 	var/powernets_cost	= 0
+	var/events_cost		= 0
 	var/ticker_cost		= 0
 	var/total_cost		= 0
 
@@ -69,7 +70,7 @@ datum/controller/game_controller/proc/setup()
 datum/controller/game_controller/proc/setup_objects()
 	world << "\red \b Initializing objects"
 	sleep(-1)
-	for(var/obj/object in world)
+	for(var/atom/movable/object in world)
 		object.initialize()
 
 	world << "\red \b Initializing pipe networks"
@@ -238,6 +239,20 @@ datum/controller/game_controller/proc/process()
 
 				sleep(breather_ticks)
 
+				//EVENTS
+				timer = world.timeofday
+				last_thing_processed = /datum/event
+				i = 1
+				while(i<=events.len)
+					var/datum/event/Event = events[i]
+					if(Event)
+						Event.process()
+						i++
+						continue
+					events.Cut(i,i+1)
+				checkEvent()
+				events_cost = (world.timeofday - timer) / 10
+
 				//TICKER
 				timer = world.timeofday
 				last_thing_processed = ticker.type
@@ -245,7 +260,7 @@ datum/controller/game_controller/proc/process()
 				ticker_cost = (world.timeofday - timer) / 10
 
 				//TIMING
-				total_cost = air_cost + sun_cost + mobs_cost + diseases_cost + machines_cost + objects_cost + networks_cost + powernets_cost + ticker_cost
+				total_cost = air_cost + sun_cost + mobs_cost + diseases_cost + machines_cost + objects_cost + networks_cost + powernets_cost + events_cost + ticker_cost
 
 				var/end_time = world.timeofday
 				if(end_time < start_time)

code/controllers/shuttle_controller.dm

@@ -22,29 +22,29 @@ datum/shuttle_controller
 	var/timelimit //important when the shuttle gets called for more than shuttlearrivetime
 		//timeleft = 360 //600
 	var/fake_recall = 0 //Used in rounds to prevent "ON NOES, IT MUST [INSERT ROUND] BECAUSE SHUTTLE CAN'T BE CALLED"
+
+	var/always_fake_recall = 0
 	var/deny_shuttle = 0 //for admins not allowing it to be called.
 	var/departed = 0
-
 	// call the shuttle
 	// if not called before, set the endtime to T+600 seconds
 	// otherwise if outgoing, switch to incoming
 	proc/incall(coeff = 1)
 		if(deny_shuttle && alert == 1) //crew transfer shuttle does not gets recalled by gamemode
 			return
-
 		if(endtime)
 			if(direction == -1)
 				setdirection(1)
 		else
 			settimeleft(SHUTTLEARRIVETIME*coeff)
 			online = 1
-		//turning on the red lights in hallways
+			if(always_fake_recall)
+				fake_recall = rand(300,500)		//turning on the red lights in hallways
 		if(alert == 0)
 			for(var/area/A in world)
 				if(istype(A, /area/hallway))
 					A.readyalert()
 
-
 	proc/shuttlealert(var/X)
 		alert = X
 
@@ -241,7 +241,7 @@ datum/shuttle_controller
 
 					else if((fake_recall != 0) && (timeleft <= fake_recall))
 						recall()
-
+						fake_recall = 0
 						return 0
 
 					/* --- Shuttle has docked with the station - begin countdown to transit --- */

code/controllers/voting.dm

@@ -174,6 +174,8 @@ datum/controller/vote
 			initiator = initiator_key
 			started_time = world.time
 			var/text = "[capitalize(mode)] vote started by [initiator]."
+			if(mode == "custom")
+				text += "\n[question]"
 			log_vote(text)
 			world << "<font color='purple'><b>[text]</b>\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote.</font>"
 			time_remaining = round(config.vote_period/10)

code/datums/datumvars.dm

@@ -260,7 +260,7 @@ client
 				body += "<option value='?_src_=vars;makerobot=\ref[D]'>Make cyborg</option>"
 				body += "<option value='?_src_=vars;makemonkey=\ref[D]'>Make monkey</option>"
 				body += "<option value='?_src_=vars;makealien=\ref[D]'>Make alien</option>"
-				body += "<option value='?_src_=vars;makemetroid=\ref[D]'>Make metroid</option>"
+				body += "<option value='?_src_=vars;makeslime=\ref[D]'>Make slime</option>"
 			body += "<option value>---</option>"
 			body += "<option value='?_src_=vars;gib=\ref[D]'>Gib</option>"
 		if(isobj(D))
@@ -691,10 +691,10 @@ client
 			return
 		holder.Topic(href, list("makealien"=href_list["makealien"]))
 
-	else if(href_list["makemetroid"])
+	else if(href_list["makeslime"])
 		if(!check_rights(0))	return
 
-		var/mob/living/carbon/human/H = locate(href_list["makemetroid"])
+		var/mob/living/carbon/human/H = locate(href_list["makeslime"])
 		if(!istype(H))
 			usr << "This can only be done to instances of type /mob/living/carbon/human"
 			return
@@ -703,7 +703,7 @@ client
 		if(!H)
 			usr << "Mob doesn't exist anymore"
 			return
-		holder.Topic(href, list("makemetroid"=href_list["makemetroid"]))
+		holder.Topic(href, list("makeslime"=href_list["makeslime"]))
 
 	else if(href_list["makeai"])
 		if(!check_rights(0))	return
@@ -727,10 +727,12 @@ client
 			usr << "This can only be done to instances of type /mob/living/carbon/human"
 			return
 
-		var/new_mutantrace = input("Please choose a new mutantrace","Mutantrace",null) as null|anything in list("NONE","golem","lizard","metroid","plant","shadow","tajaran","skrell")
+		var/new_mutantrace = input("Please choose a new mutantrace","Mutantrace",null) as null|anything in list("NONE","golem","lizard","slime","plant","shadow","tajaran","skrell")
 		switch(new_mutantrace)
-			if(null)		return
-			if("NONE")		new_mutantrace = ""
+			if(null)
+				return
+			if("NONE")
+				new_mutantrace = ""
 		if(!H)
 			usr << "Mob doesn't exist anymore"
 			return

code/datums/disease.dm

@@ -44,7 +44,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 	var/permeability_mod = 1//permeability modifier coefficient.
 	var/desc = null//description. Leave it null and this disease won't show in med records.
 	var/severity = null//severity descr
-	var/longevity = 250//time in "ticks" the virus stays in inanimate object (blood stains, corpses, etc). In syringes, bottles and beakers it stays infinitely.
+	var/longevity = 150//time in "ticks" the virus stays in inanimate object (blood stains, corpses, etc). In syringes, bottles and beakers it stays infinitely.
 	var/list/hidden = list(0, 0)
 	var/can_carry = 1 // If the disease allows "carriers".
 	var/age = 0 // age of the disease in the current mob
@@ -66,15 +66,13 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 	if(stage > max_stages)
 		stage = max_stages
 
-	if(stage < max_stages && prob(stage_prob) && !cure_present) //now the disease shouldn't get back up to stage 4 in no time
-		stage++
-		//world << "up"
-	if(stage > 0 && (cure_present && prob(cure_chance)))
-		stage--
-		//world << "down"
+	if(!cure_present && prob(stage_prob)) //now the disease shouldn't get back up to stage 4 in no time
+		stage = min(stage + 1, max_stages)
+
+	else if(cure_present && prob(cure_chance))
+		stage = max(stage - 1, 1)
 
 	if(stage <= 1 && ((prob(1) && curable) || (cure_present && prob(cure_chance))))
-//		world << "Cured as stage act"
 		cure()
 		return
 	return
@@ -178,8 +176,8 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 		if(resistance && !(type in affected_mob.resistances))
 			var/saved_type = "[type]"
 			affected_mob.resistances += text2path(saved_type)
-		if(istype(src, /datum/disease/alien_embryo))	//Get rid of the infection flag if it's a xeno embryo.
-			affected_mob.status_flags &= ~(XENO_HOST)
+		/*if(istype(src, /datum/disease/alien_embryo))	//Get rid of the infection flag if it's a xeno embryo.
+			affected_mob.status_flags &= ~(XENO_HOST)*/
 		affected_mob.viruses -= src		//remove the datum from the list
 	del(src)	//delete the datum to stop it processing
 	return
@@ -187,7 +185,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 
 /datum/disease/New(var/process=1, var/datum/disease/D)//process = 1 - adding the object to global list. List is processed by master controller.
 	cure_list = list(cure_id) // to add more cures, add more vars to this list in the actual disease's New()
-	if(process)					 // Viruses in list are considered active.
+	if(process)				 // Viruses in list are considered active.
 		active_diseases += src
 	initial_spread = spread
 

code/datums/diseases/advance/advance.dm

@@ -94,15 +94,12 @@ var/list/advance_cures = 	list(
 
 // Compares type then ID.
 /datum/disease/advance/IsSame(var/datum/disease/advance/D)
-	if(!(istype(D, /datum/disease/advance)))
-		//error("Returning 0 because not same type.")
 
+	if(!(istype(D, /datum/disease/advance)))
 		return 0
-	//error("Comparing [src.GetDiseaseID()] [D.GetDiseaseID()]")
+
 	if(src.GetDiseaseID() != D.GetDiseaseID())
-		//error("Returing 0")
 		return 0
-	//error("Returning 1")
 	return 1
 
 // To add special resistances.
@@ -416,4 +413,11 @@ var/list/advance_cures = 	list(
 			name_symptoms += S.name
 		message_admins("[key_name_admin(user)] has triggered a custom virus outbreak of [D.name]! It has these symptoms: [english_list(name_symptoms)]")
 
+/*
+/mob/verb/test()
+
+	for(var/datum/disease/D in active_diseases)
+		src << "<a href='?_src_=vars;Vars=\ref[D]'>[D.name] - [D.holder]</a>"
+*/
+
 #undef RANDOM_STARTING_LEVEL

code/datums/diseases/advance/symptoms/vomit.dm

@@ -86,7 +86,7 @@ Bonus
 
 	// They lose blood and health.
 	var/brute_dam = M.getBruteLoss()
-	if(brute_dam >= 50)
+	if(brute_dam < 50)
 		M.adjustBruteLoss(3)
 
 	var/turf/pos = get_turf(M)

code/datums/diseases/alien_embryo.dm

@@ -1,5 +1,7 @@
 //affected_mob.contract_disease(new /datum/disease/alien_embryo)
 
+//cael - retained this file for legacy reference, see code\modules\mob\living\carbon\alien\special\alien_embryo.dm for replacement
+
 //Our own special process so that dead hosts still chestburst
 /datum/disease/alien_embryo/process()
 	if(!holder) return
@@ -98,6 +100,9 @@
 				gibbed = 1
 				return
 
+/datum/disease/alien_embryo/stage_change(var/old_stage)
+	RefreshInfectionImage()
+
 /*----------------------------------------
 Proc: RefreshInfectionImage()
 Des: Removes all infection images from aliens and places an infection image on all infected mobs for aliens.
@@ -107,7 +112,7 @@ Des: Removes all infection images from aliens and places an infection image on a
 		for (var/mob/living/carbon/alien/alien in player_list)
 			if (alien.client)
 				for(var/image/I in alien.client.images)
-					if(I.icon_state == "infected")
+					if(dd_hasprefix_case(I.icon_state, "infected"))
 						del(I)
 
 		for (var/mob/living/carbon/alien/alien in player_list)
@@ -115,7 +120,7 @@ Des: Removes all infection images from aliens and places an infection image on a
 				for (var/mob/living/carbon/C in mob_list)
 					if(C)
 						if (C.status_flags & XENO_HOST)
-							var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected")
+							var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[stage]")
 							alien.client.images += I
 		return
 
@@ -128,7 +133,7 @@ Des: Checks if the passed mob (C) is infected with the alien egg, then gives eac
 		for (var/mob/living/carbon/alien/alien in player_list)
 			if (alien.client)
 				if (C.status_flags & XENO_HOST)
-					var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected")
+					var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[stage]")
 					alien.client.images += I
 	return
 
@@ -143,6 +148,6 @@ Des: Removes the alien infection image from all aliens in the world located in p
 			if (alien.client)
 				for(var/image/I in alien.client.images)
 					if(I.loc == C)
-						if(I.icon_state == "infected")
+						if(dd_hasprefix_case(I.icon_state, "infected"))
 							del(I)
 	return

code/datums/mind.dm

@@ -368,7 +368,7 @@ datum/mind
 				if(!def_value)//If it's a custom objective, it will be an empty string.
 					def_value = "custom"
 
-			var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "debrain", "protect", "hijack", "escape", "survive", "steal", "download", "nuclear", "capture", "absorb", "custom")
+			var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "debrain", "protect", "prevent", "hijack", "escape", "survive", "steal", "download", "nuclear", "capture", "absorb", "custom")
 			if (!new_obj_type) return
 
 			var/datum/objective/new_objective = null
@@ -406,6 +406,10 @@ datum/mind
 						//Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
 						new_objective.explanation_text = "[objective_type] [new_target:real_name], the [new_target:mind:assigned_role=="MODE" ? (new_target:mind:special_role) : (new_target:mind:assigned_role)]."
 
+				if ("prevent")
+					new_objective = new /datum/objective/block
+					new_objective.owner = src
+
 				if ("hijack")
 					new_objective = new /datum/objective/hijack
 					new_objective.owner = src
@@ -647,6 +651,7 @@ datum/mind
 						ticker.mode.changelings -= src
 						special_role = null
 						current.remove_changeling_powers()
+						current.verbs -= /datum/changeling/proc/EvolutionMenu
 						if(changeling)	del(changeling)
 						current << "<FONT color='red' size = 3><B>You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!</B></FONT>"
 						log_admin("[key_name_admin(usr)] has de-changeling'ed [current].")
@@ -1139,10 +1144,10 @@ datum/mind
 /mob/living/carbon/monkey/mind_initialize()
 	..()
 
-//METROID
-/mob/living/carbon/metroid/mind_initialize()
+//slime
+/mob/living/carbon/slime/mind_initialize()
 	..()
-	mind.assigned_role = "Metroid"
+	mind.assigned_role = "slime"
 
 //XENO
 /mob/living/carbon/alien/mind_initialize()

code/datums/spells/area_teleport.dm

@@ -42,6 +42,10 @@
 				if(clear)
 					L+=T
 
+		if(!L.len)
+			usr <<"The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry."
+			return
+
 		var/attempt = 0
 		var/success = 0
 		while(!success)

code/datums/spells/conjure.dm

@@ -25,7 +25,7 @@
 		for(var/i=0,i<summon_amt,i++)
 			if(!targets.len)
 				break
-			var/summoned_object_type = text2path(pick(summon_type))
+			var/summoned_object_type = pick(summon_type)
 			var/spawn_place = pick(targets)
 			if(summon_ignore_prev_spawn_points)
 				targets -= spawn_place
@@ -58,7 +58,7 @@
 	name = "Dispense Wizard Justice"
 	desc = "This spell dispenses wizard justice."
 
-	summon_type = list("/obj/machinery/bot/ed209")
+	summon_type = list(/obj/machinery/bot/ed209)
 	summon_amt = 10
 	range = 3
 	newVars = list("emagged" = 1,"name" = "Wizard's Justicebot")

code/datums/spells/dumbfire.dm

@@ -0,0 +1,86 @@
+/obj/effect/proc_holder/spell/dumbfire
+
+	var/projectile_type = ""
+	var/activate_on_collision = 1
+
+	var/proj_icon = 'icons/obj/projectiles.dmi'
+	var/proj_icon_state = "spell"
+	var/proj_name = "a spell projectile"
+
+	var/proj_trail = 0 //if it leaves a trail
+	var/proj_trail_lifespan = 0 //deciseconds
+	var/proj_trail_icon = 'icons/obj/wizard.dmi'
+	var/proj_trail_icon_state = "trail"
+
+	var/proj_type = "/obj/effect/proc_holder/spell" //IMPORTANT use only subtypes of this
+
+	var/proj_insubstantial = 0 //if it can pass through dense objects or not
+	var/proj_trigger_range = 1 //the range from target at which the projectile triggers cast(target)
+
+	var/proj_lifespan = 100 //in deciseconds * proj_step_delay
+	var/proj_step_delay = 1 //lower = faster
+
+/obj/effect/proc_holder/spell/dumbfire/choose_targets(mob/user = usr)
+
+	var/turf/T = get_turf(usr)
+	for(var/i = 1; i < range; i++)
+		var/turf/new_turf = get_step(T, usr.dir)
+		if(new_turf.density)
+			break
+		T = new_turf
+	perform(list(T))
+
+/obj/effect/proc_holder/spell/dumbfire/cast(list/targets, mob/user = usr)
+
+	for(var/turf/target in targets)
+		spawn(0)
+			var/obj/effect/proc_holder/spell/targeted/projectile
+			if(istext(proj_type))
+				var/projectile_type = text2path(proj_type)
+				projectile = new projectile_type(user)
+			if(istype(proj_type,/obj/effect/proc_holder/spell))
+				projectile = new /obj/effect/proc_holder/spell/targeted/trigger(user)
+				projectile:linked_spells += proj_type
+			projectile.icon = proj_icon
+			projectile.icon_state = proj_icon_state
+			projectile.dir = get_dir(projectile, target)
+			projectile.name = proj_name
+
+			var/current_loc = usr.loc
+
+			projectile.loc = current_loc
+
+			for(var/i = 0,i < proj_lifespan,i++)
+				if(!projectile)
+					break
+
+				if(proj_insubstantial)
+					projectile.loc = get_step(projectile, projectile.dir)
+				else
+					step(projectile, projectile.dir)
+
+				if(projectile.loc == current_loc || i == proj_lifespan)
+					projectile.cast(current_loc)
+					break
+
+				var/mob/living/L = locate(/mob/living) in range(projectile, proj_trigger_range) - usr
+				if(L)
+					projectile.cast(L.loc)
+					break
+
+				if(proj_trail && projectile)
+					spawn(0)
+						if(projectile)
+							var/obj/effect/overlay/trail = new /obj/effect/overlay(projectile.loc)
+							trail.icon = proj_trail_icon
+							trail.icon_state = proj_trail_icon_state
+							trail.density = 0
+							spawn(proj_trail_lifespan)
+								del(trail)
+
+				current_loc = projectile.loc
+
+				sleep(proj_step_delay)
+
+			if(projectile)
+				del(projectile)

code/datums/spells/inflict_handler.dm

@@ -23,6 +23,11 @@
 		switch(destroys)
 			if("gib")
 				target.gib()
+			if("gib_brain")
+				if(ishuman(target) || ismonkey(target))
+					var/obj/item/brain/B = new(target.loc)
+					B.transfer_identity(target)
+				target.gib()
 			if("disintegrate")
 				target.dust()
 

code/datums/spells/wizard.dm

@@ -54,7 +54,7 @@
 	invocation_type = "shout"
 	range = 1
 
-	destroys = "gib"
+	destroys = "gib_brain"
 
 	sparks_spread = 1
 	sparks_amt = 4
@@ -138,8 +138,8 @@
 
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/carp
-	name = "Summon Bigger Carp"
-	desc = "This spell conjures an elite carp."
+	name = "Summon Carp"
+	desc = "This spell conjures a simple carp."
 
 	school = "conjuration"
 	charge_max = 1200
@@ -148,7 +148,7 @@
 	invocation_type = "shout"
 	range = 1
 
-	summon_type = list("/obj/effect/critter/spesscarp/elite")
+	summon_type = list(/mob/living/simple_animal/hostile/carp)
 
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/construct
@@ -162,7 +162,7 @@
 	invocation_type = "none"
 	range = 0
 
-	summon_type = list("/obj/structure/constructshell")
+	summon_type = list(/obj/structure/constructshell)
 
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/creature
@@ -177,7 +177,7 @@
 	summon_amt = 10
 	range = 3
 
-	summon_type = list("/obj/effect/critter/creature")
+	summon_type = list(/mob/living/simple_animal/hostile/creature)
 
 /obj/effect/proc_holder/spell/targeted/trigger/blind
 	name = "Blind"
@@ -200,26 +200,27 @@
 	disabilities = 1
 	duration = 300
 
-/obj/effect/proc_holder/spell/targeted/projectile/fireball
+/obj/effect/proc_holder/spell/dumbfire/fireball
 	name = "Fireball"
 	desc = "This spell fires a fireball at a target and does not require wizard garb."
 
 	school = "evocation"
-	charge_max = 200
+	charge_max = 100
 	clothes_req = 0
 	invocation = "ONI SOMA"
 	invocation_type = "shout"
+	range = 20
 
 	proj_icon_state = "fireball"
 	proj_name = "a fireball"
-	proj_lingering = 1
-	proj_type = "/obj/effect/proc_holder/spell/targeted/trigger/fireball"
+	proj_type = "/obj/effect/proc_holder/spell/turf/fireball"
 
 	proj_lifespan = 200
 	proj_step_delay = 1
 
-/obj/effect/proc_holder/spell/targeted/trigger/fireball
-	starting_spells = list("/obj/effect/proc_holder/spell/targeted/inflict_handler/fireball","/obj/effect/proc_holder/spell/targeted/explosion/fireball")
+/obj/effect/proc_holder/spell/turf/fireball/cast(var/turf/T)
+	explosion(T, -1, 1, 2, 3)
+
 
 /obj/effect/proc_holder/spell/targeted/inflict_handler/fireball
 	amt_dam_brute = 20
@@ -251,7 +252,7 @@
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
-	summon_type = list("/turf/simulated/floor/engine/cult")
+	summon_type = list(/turf/simulated/floor/engine/cult)
 	centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/wall
@@ -264,7 +265,7 @@
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
-	summon_type = list("/turf/simulated/wall/cult")
+	summon_type = list(/turf/simulated/wall/cult)
 	centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
@@ -280,7 +281,7 @@
 	centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
 	delay = 50
 
-	summon_type = list("/turf/simulated/wall/r_wall")
+	summon_type = list(/turf/simulated/wall/r_wall)
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone
 	name = "Summon Soulstone"
@@ -293,7 +294,7 @@
 	invocation_type = "none"
 	range = 0
 
-	summon_type = list("/obj/item/device/soulstone")
+	summon_type = list(/obj/item/device/soulstone)
 
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall
@@ -306,7 +307,7 @@
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
-	summon_type = list("/obj/effect/forcefield")
+	summon_type = list(/obj/effect/forcefield)
 	summon_lifespan = 50
 
 

code/datums/sun.dm

@@ -4,8 +4,11 @@
 	var/dy
 	var/counter = 50		// to make the vars update during 1st call
 	var/rate
+	var/list/solars			// for debugging purposes, references solars_list at the constructor
 
 /datum/sun/New()
+
+	solars = solars_list
 	rate = rand(75,125)/100			// 75% - 125% of standard rotation
 	if(prob(50))
 		rate = -rate
@@ -41,12 +44,23 @@
 		dy = c / abs(s)
 
 
-	for(var/obj/machinery/power/tracker/T in machines)
-		T.set_angle(angle)
+	for(var/obj/machinery/power/M in solars_list)
+
+		if(!M.powernet)
+			solars_list.Remove(M)
+			continue
+
+		// Solar Tracker
+		if(istype(M, /obj/machinery/power/tracker))
+			var/obj/machinery/power/tracker/T = M
+			T.set_angle(angle)
+
+		// Solar Panel
+		else if(istype(M, /obj/machinery/power/solar))
+			var/obj/machinery/power/solar/S = M
+			if(S.control)
+				occlusion(S)
 
-	for(var/obj/machinery/power/solar/S in machines)
-		if(S.control)
-			occlusion(S)
 
 
 // for a solar panel, trace towards sun to see if we're in shadow

code/datums/supplypacks.dm

@@ -29,7 +29,7 @@
 
 /datum/supply_packs/specialops
 	name = "Special Ops supplies"
-	contains = list(/obj/item/weapon/storage/emp_kit,
+	contains = list(/obj/item/weapon/storage/box/emps,
 					/obj/item/weapon/grenade/smokebomb,
 					/obj/item/weapon/grenade/smokebomb,
 					/obj/item/weapon/grenade/smokebomb,
@@ -56,7 +56,7 @@
 
 /datum/supply_packs/monkey
 	name = "Monkey crate"
-	contains = list (/obj/item/weapon/storage/monkeycube_box)
+	contains = list (/obj/item/weapon/storage/box/monkeycubes)
 	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Monkey crate"
@@ -92,7 +92,7 @@
 
 /datum/supply_packs/party
 	name = "Party equipment"
-	contains = list(/obj/item/weapon/storage/drinkingglasses,
+	contains = list(/obj/item/weapon/storage/box/drinkingglasses,
 					/obj/item/weapon/reagent_containers/food/drinks/shaker,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/patron,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager,
@@ -101,9 +101,7 @@
 					/obj/item/weapon/reagent_containers/food/drinks/beer,
 					/obj/item/weapon/reagent_containers/food/drinks/beer,
 					/obj/item/weapon/reagent_containers/food/drinks/beer,
-					/obj/item/weapon/reagent_containers/food/drinks/beer,
-					/obj/item/weapon/cigpacket/dromedaryco,
-					/obj/item/weapon/lipstick/random)
+					/obj/item/weapon/reagent_containers/food/drinks/beer)
 	cost = 20
 	containertype = /obj/structure/closet/crate
 	containername = "Party equipment"
@@ -161,9 +159,9 @@
 
 /datum/supply_packs/lightbulbs
 	name = "Replacement lights"
-	contains = list(/obj/item/weapon/storage/lightbox/mixed,
-					/obj/item/weapon/storage/lightbox/mixed,
-					/obj/item/weapon/storage/lightbox/mixed)
+	contains = list(/obj/item/weapon/storage/box/lights/mixed,
+					/obj/item/weapon/storage/box/lights/mixed,
+					/obj/item/weapon/storage/box/lights/mixed)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Replacement lights"
@@ -247,6 +245,16 @@
 	containername = "Seeds crate"
 	access = access_hydroponics
 
+/datum/supply_packs/weedcontrol
+	name = "Weed Control Crate"
+	contains = list(/obj/item/weapon/scythe,
+					/obj/item/clothing/mask/gas,
+					/obj/item/weapon/grenade/chem_grenade/antiweed,
+					/obj/item/weapon/grenade/chem_grenade/antiweed)
+	cost = 20
+	containertype = /obj/structure/closet/crate/secure/hydrosec
+	containername = "Weed control crate"
+	access = access_hydroponics
 
 /datum/supply_packs/exoticseeds
 	name = "Exotic Seeds Crate"
@@ -274,7 +282,7 @@
 					/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
 					/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
 					/obj/item/weapon/reagent_containers/glass/bottle/stoxin,
-					/obj/item/weapon/storage/syringes)
+					/obj/item/weapon/storage/box/syringes)
 	cost = 10
 	containertype = /obj/structure/closet/crate/medical
 	containername = "Medical crate"
@@ -291,8 +299,8 @@
 					/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat,
 					/obj/item/weapon/reagent_containers/glass/bottle/brainrot,
 					/obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion,
-					/obj/item/weapon/storage/syringes,
-					/obj/item/weapon/storage/beakerbox,
+					/obj/item/weapon/storage/box/syringes,
+					/obj/item/weapon/storage/box/beakers,
 					/obj/item/weapon/reagent_containers/glass/bottle/mutagen)
 	containername = "Virus crate"
 	access = access_cmo
@@ -356,25 +364,59 @@
 	containertype = /obj/structure/largecrate
 	containername = "fuel tank crate"
 
+/datum/supply_packs/solar
+	name = "Solar Pack crate"
+	contains  = list(/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly,
+					/obj/item/solar_assembly, // 21 Solar Assemblies. 1 Extra for the controller
+					/obj/item/weapon/circuitboard/solar_control,
+					/obj/item/weapon/tracker_electronics,
+					/obj/item/weapon/paper/solar)
+	cost = 20
+	containertype = /obj/structure/closet/crate
+	containername = "solar pack crate"
+
 /datum/supply_packs/engine
 	name = "Emitter crate"
-	contains = list(/obj/machinery/emitter,
-					/obj/machinery/emitter)
+	contains = list(/obj/machinery/power/emitter,
+					/obj/machinery/power/emitter)
 	cost = 10
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Emitter crate"
-	access = access_heads
+	access = access_ce
 
 /datum/supply_packs/engine/field_gen
 	name = "Field Generator crate"
 	contains = list(/obj/machinery/field_generator,
 					/obj/machinery/field_generator)
+	containertype = /obj/structure/closet/crate/secure
 	containername = "Field Generator crate"
+	access = access_ce
 
 /datum/supply_packs/engine/sing_gen
 	name = "Singularity Generator crate"
 	contains = list(/obj/machinery/the_singularitygen)
+	containertype = /obj/structure/closet/crate/secure
 	containername = "Singularity Generator crate"
+	access = access_ce
 
 /datum/supply_packs/engine/collector
 	name = "Collector crate"
@@ -393,7 +435,9 @@
 					/obj/structure/particle_accelerator/particle_emitter/right,
 					/obj/structure/particle_accelerator/power_box,
 					/obj/structure/particle_accelerator/end_cap)
+	containertype = /obj/structure/closet/crate/secure
 	containername = "Particle Accelerator crate"
+	access = access_ce
 
 /datum/supply_packs/mecha_ripley
 	name = "Circuit Crate (\"Ripley\" APLU)"
@@ -449,7 +493,7 @@
 	cost = 10
 	containertype = /obj/structure/closet/crate/secure/plasma
 	containername = "Plasma assembly crate"
-	access = access_tox
+	access = access_tox_storage
 
 /datum/supply_packs/weapons
 	name = "Weapons crate"
@@ -459,8 +503,8 @@
 					/obj/item/weapon/gun/energy/laser,
 					/obj/item/weapon/gun/energy/taser,
 					/obj/item/weapon/gun/energy/taser,
-					/obj/item/weapon/storage/flashbang_kit,
-					/obj/item/weapon/storage/flashbang_kit)
+					/obj/item/weapon/storage/box/flashbangs,
+					/obj/item/weapon/storage/box/flashbangs)
 	cost = 30
 	containertype = /obj/structure/closet/crate/secure/weapon
 	containername = "Weapons crate"
@@ -499,9 +543,9 @@
 					/obj/item/weapon/shield/riot,
 					/obj/item/weapon/shield/riot,
 					/obj/item/weapon/shield/riot,
-					/obj/item/weapon/storage/flashbang_kit,
-					/obj/item/weapon/storage/flashbang_kit,
-					/obj/item/weapon/storage/flashbang_kit,
+					/obj/item/weapon/storage/box/flashbangs,
+					/obj/item/weapon/storage/box/flashbangs,
+					/obj/item/weapon/storage/box/flashbangs,
 					/obj/item/weapon/handcuffs,
 					/obj/item/weapon/handcuffs,
 					/obj/item/weapon/handcuffs,
@@ -567,6 +611,17 @@
 	containertype = /obj/structure/closet/crate/secure/gear
 	containername = "Security Barriers crate"
 
+/datum/supply_packs/securitybarriers
+	name = "Shield Generators"
+	contains = list(/obj/machinery/shieldwallgen,
+					/obj/machinery/shieldwallgen,
+					/obj/machinery/shieldwallgen,
+					/obj/machinery/shieldwallgen)
+	cost = 20
+	containertype = /obj/structure/closet/crate/secure
+	containername = "Shield Generators crate"
+	access = access_teleporter
+
 /datum/supply_packs/randomised
 	var/num_contained = 3 //number of items picked to be contained in a randomised crate
 	contains = list(/obj/item/clothing/head/collectable/chef,
@@ -584,7 +639,7 @@
 					/obj/item/clothing/head/collectable/HoS,
 					/obj/item/clothing/head/collectable/thunderdome,
 					/obj/item/clothing/head/collectable/swat,
-					/obj/item/clothing/head/collectable/metroid,
+					/obj/item/clothing/head/collectable/slime,
 					/obj/item/clothing/head/collectable/police,
 					/obj/item/clothing/head/collectable/slime,
 					/obj/item/clothing/head/collectable/xenom,
@@ -600,7 +655,7 @@
 
 /datum/supply_packs/artscrafts
 	name = "Arts and Crafts supplies"
-	contains = list(/obj/item/weapon/storage/crayonbox,
+	contains = list(/obj/item/weapon/storage/fancy/crayons,
 	/obj/item/device/camera,
 	/obj/item/device/camera_film,
 	/obj/item/device/camera_film,
@@ -625,10 +680,14 @@
 
 /datum/supply_packs/randomised/contraband
 	num_contained = 5
-	contains = list(/obj/item/seeds/bloodtomatoseed,
-	/obj/item/weapon/storage/pill_bottle/zoom,
-	/obj/item/weapon/storage/pill_bottle/happy,
-	/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe)
+	contains = list(/obj/item/weapon/contraband/poster,
+					/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
+					/obj/item/weapon/lipstick/random,
+					/obj/item/seeds/bloodtomatoseed,
+					/obj/item/weapon/storage/pill_bottle/zoom,
+					/obj/item/weapon/storage/pill_bottle/happy,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe)
+
 	name = "Contraband crate"
 	cost = 30
 	containertype = /obj/structure/closet/crate
@@ -674,8 +733,8 @@
 	name = "Sterile equipment crate"
 	contains = list(/obj/item/clothing/under/rank/medical/green,
 					/obj/item/clothing/under/rank/medical/green,
-					/obj/item/weapon/storage/stma_kit,
-					/obj/item/weapon/storage/lglo_kit)
+					/obj/item/weapon/storage/box/masks,
+					/obj/item/weapon/storage/box/gloves)
 	cost = 10
 	containertype = "/obj/structure/closet/crate"
 	containername = "Sterile equipment crate"

code/datums/vote.dm

@@ -1,13 +0,0 @@
-/datum/vote
-	var/voting = 0			// true if currently voting
-	var/nextvotetime = 0 	// time at which next vote can be started
-	var/votetime = 60		// time at which voting will end
-	var/mode = 0			// 0 = restart vote, 1 = mode vote
-							// modes which can be voted for
-	var/winner = null		// the vote winner
-
-	var/customname
-	var/choices = list()
-	var/enteringchoices = 0
-
-	var/instant_restart = 0

code/defines/obj.dm

@@ -238,7 +238,7 @@
 	var/moving = null
 	var/list/parts = list(  )
 
-/obj/effect/showcase
+/obj/structure/showcase
 	name = "Showcase"
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "showcase_1"

code/defines/obj/hydro.dm

@@ -43,6 +43,8 @@
 		user << "-Plant Production: \blue [production]"
 		if(potency != -1)
 			user << "-Plant Potency: \blue [potency]"
+		return
+	..() // Fallthrough to item/attackby() so that bags can pick seeds up
 
 /obj/item/seeds/chiliseed
 	name = "pack of chili seeds"
@@ -1217,6 +1219,10 @@
 			reagents.add_reagent("pacid", round(potency, 1))
 			force = round((5+potency/2.5), 1)
 
+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] is eating some of the [src]! It looks like \he's trying to commit suicide.</b>"
+		return (BRUTELOSS|TOXLOSS)
+
 // *************************************
 // Pestkiller defines for hydroponics
 // *************************************
@@ -1284,6 +1290,10 @@
 	var/toxicity = 4
 	var/WeedKillStr = 2
 
+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] is huffing the [src]! It looks like \he's trying to commit suicide.</b>"
+		return (TOXLOSS)
+
 /obj/item/weapon/pestspray // -- Skie
 	desc = "It's some pest eliminator spray! <I>Do not inhale!</I>"
 	icon = 'icons/obj/hydroponics.dmi'
@@ -1299,6 +1309,10 @@
 	var/toxicity = 4
 	var/PestKillStr = 2
 
+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] is huffing the [src]! It looks like \he's trying to commit suicide.</b>"
+		return (TOXLOSS)
+
 /obj/item/weapon/minihoe // -- Numbers
 	name = "mini hoe"
 	desc = "It's used for removing weeds or scratching your back."

code/defines/obj/machinery.dm

@@ -1,339 +0,0 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-
-/obj/machinery
-	name = "machinery"
-	icon = 'icons/obj/stationobjs.dmi'
-	var/stat = 0
-	var/emagged = 0
-	var/use_power = 0
-		//0 = dont run the auto
-		//1 = run auto, use idle
-		//2 = run auto, use active
-	var/idle_power_usage = 0
-	var/active_power_usage = 0
-	var/power_channel = EQUIP
-		//EQUIP,ENVIRON or LIGHT
-	var/list/component_parts = null //list of all the parts used to build it, if made from certain kinds of frames.
-	var/uid
-	var/manual = 0
-	var/global/gl_uid = 1
-
-/obj/machinery/autolathe
-	name = "\improper Autolathe"
-	desc = "It produces items using metal and glass."
-	icon_state = "autolathe"
-	density = 1
-	var/m_amount = 0.0
-	var/g_amount = 0.0
-	var/operating = 0.0
-	var/opened = 0.0
-	anchored = 1.0
-	var/list/L = list()
-	var/list/LL = list()
-	var/hacked = 0
-	var/disabled = 0
-	var/shocked = 0
-	var/list/wires = list()
-	var/hack_wire
-	var/disable_wire
-	var/shock_wire
-	use_power = 1
-	idle_power_usage = 10
-	active_power_usage = 100
-
-/obj/machinery/dna_scanner
-	name = "\improper DNA scanner/implanter"
-	desc = "It scans DNA structures."
-	icon = 'icons/obj/Cryogenic2.dmi'
-	icon_state = "scanner_0"
-	density = 1
-	var/locked = 0.0
-	var/mob/occupant = null
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 50
-	active_power_usage = 300
-
-/obj/machinery/dna_scannernew
-	name = "\improper DNA modifier"
-	desc = "It scans DNA structures."
-	icon = 'icons/obj/Cryogenic2.dmi'
-	icon_state = "scanner_0"
-	density = 1
-	var/locked = 0.0
-	var/mob/occupant = null
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 50
-	active_power_usage = 300
-
-/obj/machinery/firealarm
-	name = "fire alarm"
-	desc = "<i>\"Pull this in case of emergency\"<i>. Thus, keep pulling it forever."
-	icon = 'icons/obj/monitors.dmi'
-	icon_state = "fire0"
-	var/detecting = 1.0
-	var/working = 1.0
-	var/time = 10.0
-	var/timing = 0.0
-	var/lockdownbyai = 0
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 2
-	active_power_usage = 6
-	power_channel = ENVIRON
-
-	New()
-		if(z == 1)
-			if(security_level)
-				src.overlays += image('icons/obj/monitors.dmi', "overlay_[get_security_level()]")
-			else
-				src.overlays += image('icons/obj/monitors.dmi', "overlay_green")
-
-/obj/machinery/partyalarm
-	name = "\improper PARTY BUTTON"
-	desc = "Cuban Pete is in the house!"
-	icon = 'icons/obj/monitors.dmi'
-	icon_state = "fire0"
-	var/detecting = 1.0
-	var/working = 1.0
-	var/time = 10.0
-	var/timing = 0.0
-	var/lockdownbyai = 0
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 2
-	active_power_usage = 6
-
-
-/obj/machinery/igniter
-	name = "igniter"
-	desc = "It's useful for igniting plasma."
-	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "igniter1"
-	var/id = null
-	var/on = 1.0
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 2
-	active_power_usage = 4
-
-/obj/machinery/injector
-	name = "injector"
-	desc = "It injects gas into a chamber."
-	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "injector"
-	density = 1
-	anchored = 1.0
-	flags = ON_BORDER
-	use_power = 1
-	idle_power_usage = 2
-	active_power_usage = 4
-	layer = TURF_LAYER
-
-/obj/machinery/meter
-	name = "meter"
-	desc = "It measures something."
-	icon = 'icons/obj/meter.dmi'
-	icon_state = "meterX"
-	var/obj/machinery/atmospherics/pipe/target = null
-	anchored = 1.0
-	power_channel = ENVIRON
-	var/frequency = 0
-	var/id
-	use_power = 1
-	idle_power_usage = 2
-	active_power_usage = 4
-
-/obj/machinery/restruct
-	name = "\improper DNA physical restructurization accelerator"
-	desc = "It looks ridiculously complex."
-	icon = 'icons/obj/Cryogenic2.dmi'
-	icon_state = "restruct_0"
-	density = 1
-	var/locked = 0.0
-	var/mob/occupant = null
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 10
-	active_power_usage = 600
-
-/obj/machinery/scan_console
-	name = "\improper DNA Scanner Access Console"
-	desc = "It scans DNA structures."
-	icon = 'icons/obj/computer.dmi'
-	icon_state = "scanner"
-	density = 1
-	var/obj/item/weapon/card/data/scan = null
-	var/func = ""
-	var/data = ""
-	var/special = ""
-	var/status = null
-	var/prog_p1 = null
-	var/prog_p2 = null
-	var/prog_p3 = null
-	var/prog_p4 = null
-	var/temp = null
-	var/obj/machinery/dna_scanner/connected = null
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 10
-	active_power_usage = 400
-
-/obj/machinery/door_control
-	name = "remote door-control"
-	desc = "It controls doors, remotely."
-	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "doorctrl0"
-	desc = "A remote control-switch for a door."
-	power_channel = ENVIRON
-	var/id = null
-	var/range = 10
-	var/normaldoorcontrol = 0
-	var/desiredstate = 0 // Zero is closed, 1 is open.
-	var/specialfunctions = 1
-	/*
-	Bitflag, 	1= open
-				2= idscan,
-				4= bolts
-				8= shock
-				16= door safties
-
-	*/
-
-	var/exposedwires = 0
-	var/wires = 3
-	/*
-	Bitflag,	1=checkID
-				2=Network Access
-	*/
-
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 2
-	active_power_usage = 4
-
-/obj/machinery/driver_button
-	name = "mass driver button"
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "launcherbtt"
-	desc = "A remote control switch for a mass driver."
-	var/id = null
-	var/active = 0
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 2
-	active_power_usage = 4
-
-/obj/machinery/ignition_switch
-	name = "ignition switch"
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "launcherbtt"
-	desc = "A remote control switch for a mounted igniter."
-	var/id = null
-	var/active = 0
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 2
-	active_power_usage = 4
-
-/obj/machinery/flasher_button
-	name = "flasher button"
-	desc = "A remote control switch for a mounted flasher."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "launcherbtt"
-	var/id = null
-	var/active = 0
-	anchored = 1.0
-	use_power = 1
-	idle_power_usage = 2
-	active_power_usage = 4
-
-/obj/machinery/teleport
-	name = "teleport"
-	icon = 'icons/obj/stationobjs.dmi'
-	density = 1
-	anchored = 1.0
-	var/lockeddown = 0
-
-/obj/machinery/teleport/hub
-	name = "teleporter hub"
-	desc = "It's the hub of a teleporting machine."
-	icon_state = "tele0"
-	var/accurate = 0
-	use_power = 1
-	idle_power_usage = 10
-	active_power_usage = 2000
-
-/obj/machinery/teleport/station
-	name = "station"
-	desc = "It's the station thingy of a teleport thingy." //seriously, wtf.
-	icon_state = "controller"
-	var/active = 0
-	var/engaged = 0
-	use_power = 1
-	idle_power_usage = 10
-	active_power_usage = 2000
-/*
-/obj/machinery/wire
-	name = "wire"
-	icon = 'icons/obj/power_cond_red.dmi'
-	use_power = 1
-	idle_power_usage = 0
-	active_power_usage = 1
-*/
-
-/obj/machinery/light_switch
-	name = "light switch"
-	desc = "It turns lights on and off. What are you, simple?"
-	icon = 'icons/obj/power.dmi'
-	icon_state = "light1"
-	anchored = 1.0
-	var/on = 1
-	var/area/area = null
-	var/otherarea = null
-	//	luminosity = 1
-
-/obj/machinery/crema_switch
-	desc = "Burn baby burn!"
-	name = "crematorium igniter"
-	icon = 'icons/obj/power.dmi'
-	icon_state = "crema_switch"
-	anchored = 1.0
-	req_access = list(access_crematorium)
-	var/on = 0
-	var/area/area = null
-	var/otherarea = null
-	var/id = 1
-
-/obj/machinery/hologram
-	anchored = 1
-	use_power = 1
-	idle_power_usage = 5
-	active_power_usage = 100
-	var/obj/effect/overlay/hologram//The projection itself. If there is one, the instrument is on, off otherwise.
-
-/obj/machinery/hologram/holopad
-	name = "\improper AI holopad"
-	desc = "It's a floor-mounted device for projecting holographic images. It is activated remotely."
-	icon_state = "holopad0"
-	var/mob/living/silicon/ai/master//Which AI, if any, is controlling the object? Only one AI may control a hologram at any time.
-	var/last_request = 0 //to prevent request spam. ~Carn
-	var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating.
-
-/obj/machinery/hologram/projector
-	name = "hologram projector"
-	desc = "It makes a hologram appear...with magnets or something..."
-	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "hologram0"
-
-/obj/machinery/hologram/proj_ai
-	name = "hologram projector platform"
-	desc = "It's used by the AI for fooling around."
-	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "hologram0"
-	var/temp = null
-	var/lumens = 0.0
-	var/h_r = 245.0
-	var/h_g = 245.0
-	var/h_b = 245.0

code/defines/procs/command_alert.dm

@@ -1,9 +1,11 @@
-/proc/command_alert(var/text, var/title = "", var/maintitle = "NanoTrasen Update")
-	world << "<h1 class='alert'>[maintitle]</h1>"
-
+/proc/command_alert(var/text, var/title = "")
+	var/command
+	command += "<h1 class='alert'>[command_name()] Update</h1>"
 	if (title && length(title) > 0)
-		world << "<h2 class='alert'>[html_encode(title)]</h2>"
-
-	world << "<span class='alert'>[html_encode(text)]</span>"
-	world << "<br>"
+		command += "<br><h2 class='alert'>[html_encode(title)]</h2>"
 
+	command += "<br><span class='alert'>[html_encode(text)]</span><br>"
+	command += "<br>"
+	for(var/mob/M in player_list)
+		if(!istype(M,/mob/new_player))
+			M << command

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

@@ -606,11 +606,11 @@ proc/process_ghost_teleport_locs()
 	icon_state = "fsmaint"
 
 /area/maintenance/asmaint
-	name = "Library Maintenance"
+	name = "Medbay Maintenance"
 	icon_state = "asmaint"
 
 /area/maintenance/asmaint2
-	name = "Med-Sci Maintenance"
+	name = "Science Maintenance"
 	icon_state = "asmaint"
 
 /area/maintenance/apmaint
@@ -634,7 +634,7 @@ proc/process_ghost_teleport_locs()
 	icon_state = "pmaint"
 
 /area/maintenance/aft
-	name = "Robotics Maintenance"
+	name = "Engineering Maintenance"
 	icon_state = "amaint"
 
 /area/maintenance/storage
@@ -696,7 +696,7 @@ proc/process_ghost_teleport_locs()
 	music = null
 
 /area/crew_quarters/captain
-	name = "\improper Captain's Quarters"
+	name = "\improper Captain's Office"
 	icon_state = "captain"
 
 /area/crew_quarters/heads/hop
@@ -887,10 +887,10 @@ proc/process_ghost_teleport_locs()
 
 	engineering
 		name = "Engineering"
-		icon_state = "engine"
+		icon_state = "engine_smes"
 
 	break_room
-		name = "\improper Engineering Break Room"
+		name = "\improper Engineering Foyer"
 		icon_state = "engine"
 
 	chiefs_office
@@ -947,17 +947,24 @@ proc/process_ghost_teleport_locs()
 
 
 /area/assembly/chargebay
-	name = "\improper Recharging Bay"
+	name = "\improper Mech Bay"
 	icon_state = "mechbay"
 
 /area/assembly/showroom
 	name = "\improper Robotics Showroom"
 	icon_state = "showroom"
 
-/area/assembly/assembly_line
-	name = "\improper Robotics Assembly Line"
+/area/assembly/robotics
+	name = "\improper Robotics Lab"
 	icon_state = "ass_line"
 
+/area/assembly/assembly_line //Derelict Assembly Line
+	name = "\improper Assembly Line"
+	icon_state = "ass_line"
+	power_equip = 0
+	power_light = 0
+	power_environ = 0
+
 //Teleporter
 
 /area/teleporter
@@ -965,7 +972,7 @@ proc/process_ghost_teleport_locs()
 	icon_state = "teleporter"
 	music = "signal"
 
-/area/teleporter/gateway
+/area/gateway
 	name = "\improper Gateway"
 	icon_state = "teleporter"
 	music = "signal"
@@ -1042,7 +1049,7 @@ proc/process_ghost_teleport_locs()
 	icon_state = "cloning"
 
 /area/medical/sleeper
-	name = "\improper Medical Sleeper Room"
+	name = "Medbay Treatment Center"
 	icon_state = "exam_room"
 
 //Security
@@ -1112,6 +1119,22 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Security Checkpoint"
 	icon_state = "security"
 
+/area/security/checkpoint/supply
+	name = "Security Post - Cargo Bay"
+	icon_state = "checkpoint1"
+
+/area/security/checkpoint/engineering
+	name = "Security Post - Engineering"
+	icon_state = "checkpoint1"
+
+/area/security/checkpoint/medical
+	name = "Security Post - Medbay"
+	icon_state = "checkpoint1"
+
+/area/security/checkpoint/science
+	name = "Security Post - Science"
+	icon_state = "checkpoint1"
+
 /area/security/vacantoffice
 	name = "\improper Vacant Office"
 	icon_state = "security"
@@ -1163,7 +1186,7 @@ proc/process_ghost_teleport_locs()
 //Toxins
 
 /area/toxins/lab
-	name = "\improper Research Hallway"
+	name = "\improper Research and Development"
 	icon_state = "toxlab"
 
 /area/toxins/hallway
@@ -1400,7 +1423,7 @@ proc/process_ghost_teleport_locs()
 	icon_state = "ai_upload"
 
 /area/turret_protected/ai_upload_foyer
-	name = "Secure Network Access"
+	name = "AI Upload Access"
 	icon_state = "ai_foyer"
 
 /area/turret_protected/ai

code/game/atoms.dm

@@ -236,6 +236,9 @@ its easier to just keep the beam vertical.
 /atom/proc/blob_act()
 	return
 
+/atom/proc/fire_act()
+	return
+
 /atom/proc/attack_hand(mob/user as mob)
 	return
 
@@ -270,8 +273,8 @@ its easier to just keep the beam vertical.
 /atom/proc/attack_larva(mob/user as mob)
 	return
 
-// for metroids
-/atom/proc/attack_metroid(mob/user as mob)
+// for slimes
+/atom/proc/attack_slime(mob/user as mob)
 	return
 
 /atom/proc/hand_h(mob/user as mob)			//human (hand) - restrained
@@ -291,7 +294,7 @@ its easier to just keep the beam vertical.
 	src.hand_p(user)
 	return
 
-/atom/proc/hand_m(mob/user as mob)			//metroid - restrained
+/atom/proc/hand_m(mob/user as mob)			//slime - restrained
 	return
 
 
@@ -528,20 +531,7 @@ its easier to just keep the beam vertical.
 			var/turf/simulated/source2 = src
 			new /obj/effect/decal/cleanable/oil(source2)
 
-/atom/proc/clean_prints()
-	if(istype(fingerprints, /list))
-		//Smudge up dem prints some
-		for(var/P in fingerprints)
-			var/test_print = stars(fingerprints[P], rand(10,20))
-			if(stringpercent(test_print) == 32) //She's full of stars! (No actual print left)
-				fingerprints.Remove(P)
-			else
-				fingerprints[P] = test_print
-		if(!fingerprints.len)
-			del(fingerprints)
-
 /atom/proc/clean_blood()
-	clean_prints()
 	src.germ_level = 0
 	if(istype(blood_DNA, /list))
 		del(blood_DNA)
@@ -602,8 +592,8 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 				src.attack_paw(usr)
 			else if(isalienadult(usr))
 				src.attack_alien(usr)
-			else if(ismetroid(usr))
-				src.attack_metroid(usr)
+			else if(isslime(usr))
+				src.attack_slime(usr)
 			else if(isanimal(usr))
 				src.attack_animal(usr)
 			else
@@ -621,7 +611,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 				src.hand_p(usr, usr.hand)
 			else if(isalienadult(usr))
 				src.hand_al(usr, usr.hand)
-			else if(ismetroid(usr))
+			else if(isslime(usr))
 				return
 			else if(isanimal(usr))
 				return
@@ -832,28 +822,28 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 			if ( !alien.restrained() )
 				attack_larva(alien)
 
-	else if(ismetroid(usr))
-		var/mob/living/carbon/metroid/metroid = usr
-		//-metroid stuff-
+	else if(isslime(usr))
+		var/mob/living/carbon/slime/slime = usr
+		//-slime stuff-
 
-		if(metroid.stat)
+		if(slime.stat)
 			return
 
-		var/in_range = in_range(src, metroid) || src.loc == metroid
+		var/in_range = in_range(src, slime) || src.loc == slime
 
 		if (in_range)
-			if ( !metroid.restrained() )
+			if ( !slime.restrained() )
 				if (W)
-					attackby(W,metroid)
+					attackby(W,slime)
 					if (W)
-						W.afterattack(src, metroid)
+						W.afterattack(src, slime)
 				else
-					attack_metroid(metroid)
+					attack_slime(slime)
 			else
-				hand_m(metroid, metroid.hand)
+				hand_m(slime, slime.hand)
 		else
-			if ( (W) && !metroid.restrained() )
-				W.afterattack(src, metroid)
+			if ( (W) && !slime.restrained() )
+				W.afterattack(src, slime)
 
 
 	else if(isanimal(usr))
@@ -1165,8 +1155,8 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 						src.attack_larva(usr)
 					else if (istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot))
 						src.attack_ai(usr, usr.hand)
-					else if(istype(usr, /mob/living/carbon/metroid))
-						src.attack_metroid(usr)
+					else if(istype(usr, /mob/living/carbon/slime))
+						src.attack_slime(usr)
 					else if(istype(usr, /mob/living/simple_animal))
 						src.attack_animal(usr)
 		else

code/game/atoms_movable.dm

@@ -90,7 +90,7 @@
 
 
 
-		while(src && target &&((((src.x < target.x && dx == EAST) || (src.x > target.x && dx == WEST)) && dist_travelled < range) || (a.has_gravity == 0)  || istype(src.loc, /turf/space)) && src.throwing && istype(src.loc, /turf))
+		while(src && target &&((((src.x < target.x && dx == EAST) || (src.x > target.x && dx == WEST)) && dist_travelled < range) || (a && a.has_gravity == 0)  || istype(src.loc, /turf/space)) && src.throwing && istype(src.loc, /turf))
 			// only stop when we've gone the whole distance (or max throw range) and are on a non-space tile, or hit something, or hit the end of the map, or someone picks it up
 			if(error < 0)
 				var/atom/step = get_step(src, dy)

code/game/communications.dm

@@ -106,11 +106,10 @@ var/list/radiochannels = list(
 	"Security" = 1359,
 	"Deathsquad" = 1441,
 	"Syndicate" = 1213,
-	"Mining" = 1349,
-	"Cargo" = 1347,
+	"Supply" = 1347,
 )
 //depenging helpers
-var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213,1441,1349,1347)
+var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213,1441,1347)
 var/const/COMM_FREQ = 1353 //command, colored gold in chat window
 var/const/SYND_FREQ = 1213
 

code/game/dna.dm

@@ -680,6 +680,19 @@
 
 
 /////////////////////////// DNA MACHINES
+/obj/machinery/dna_scannernew
+	name = "\improper DNA modifier"
+	desc = "It scans DNA structures."
+	icon = 'icons/obj/Cryogenic2.dmi'
+	icon_state = "scanner_0"
+	density = 1
+	var/locked = 0.0
+	var/mob/occupant = null
+	anchored = 1.0
+	use_power = 1
+	idle_power_usage = 50
+	active_power_usage = 300
+
 /obj/machinery/dna_scannernew/New()
 	..()
 	component_parts = list()
@@ -838,6 +851,7 @@
 			A.loc = src.loc
 		del(src)
 
+
 /obj/machinery/computer/scan_consolenew/ex_act(severity)
 
 	switch(severity)
@@ -993,31 +1007,32 @@
 				src.temphtml = text("No viable occupant detected.")//More than anything, this just acts as a sanity check in case the option DOES appear for whatever reason
 				usr << browse(temphtml, "window=scannernew;size=550x650")
 				onclose(usr, "scannernew")
-			src.delete = 1
-			src.temphtml = text("Working ... Please wait ([] Seconds)", src.radduration)
-			usr << browse(temphtml, "window=scannernew;size=550x650")
-			onclose(usr, "scannernew")
-			var/lock_state = src.connected.locked
-			src.connected.locked = 1//lock it
-			sleep(10*src.radduration)
-			if (!src.connected.occupant)
+			else
+				src.delete = 1
+				src.temphtml = text("Working ... Please wait ([] Seconds)", src.radduration)
+				usr << browse(temphtml, "window=scannernew;size=550x650")
+				onclose(usr, "scannernew")
+				var/lock_state = src.connected.locked
+				src.connected.locked = 1//lock it
+				sleep(10*src.radduration)
+				if (!src.connected.occupant)
+					temphtml = null
+					delete = 0
+					return null
+				if (prob(95))
+					if(prob(75))
+						randmutb(src.connected.occupant)
+					else
+						randmuti(src.connected.occupant)
+				else
+					if(prob(95))
+						randmutg(src.connected.occupant)
+					else
+						randmuti(src.connected.occupant)
+				src.connected.occupant.radiation += ((src.radstrength*3)+src.radduration*3)
+				src.connected.locked = lock_state
 				temphtml = null
 				delete = 0
-				return null
-			if (prob(95))
-				if(prob(75))
-					randmutb(src.connected.occupant)
-				else
-					randmuti(src.connected.occupant)
-			else
-				if(prob(95))
-					randmutg(src.connected.occupant)
-				else
-					randmuti(src.connected.occupant)
-			src.connected.occupant.radiation += ((src.radstrength*3)+src.radduration*3)
-			src.connected.locked = lock_state
-			temphtml = null
-			delete = 0
 		if (href_list["radset"])
 			src.temphtml = text("Radiation Duration: <B><font color='green'>[]</B></FONT><BR>", src.radduration)
 			src.temphtml += text("Radiation Intensity: <font color='green'><B>[]</B></FONT><BR><BR>", src.radstrength)
@@ -1056,21 +1071,22 @@
 				src.temphtml = text("No viable occupant detected.")
 				usr << browse(temphtml, "window=scannernew;size=550x650")
 				onclose(usr, "scannernew")
-			//src.temphtml = text("Unique Identifier: <font color='blue'>[]</FONT><BR><BR>", src.connected.occupant.dna.uni_identity)
-			//src.temphtml = text("Unique Identifier: <font color='blue'>[getleftblocks(src.connected.occupant.dna.uni_identity,uniblock,3)][src.subblock == 1 ? "<U><B>"+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)+"</U></B>" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)][src.subblock == 2 ? "<U><B>"+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)+"</U></B>" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)][src.subblock == 3 ? "<U><B>"+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)+"</U></B>" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)][getrightblocks(src.connected.occupant.dna.uni_identity,uniblock,3)]</FONT><BR><BR>")
+			else
+				//src.temphtml = text("Unique Identifier: <font color='blue'>[]</FONT><BR><BR>", src.connected.occupant.dna.uni_identity)
+				//src.temphtml = text("Unique Identifier: <font color='blue'>[getleftblocks(src.connected.occupant.dna.uni_identity,uniblock,3)][src.subblock == 1 ? "<U><B>"+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)+"</U></B>" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)][src.subblock == 2 ? "<U><B>"+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)+"</U></B>" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)][src.subblock == 3 ? "<U><B>"+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)+"</U></B>" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)][getrightblocks(src.connected.occupant.dna.uni_identity,uniblock,3)]</FONT><BR><BR>")
 
-			// New way of displaying DNA blocks
-			src.temphtml = text("Unique Identifier: <font color='blue'>[getblockstring(src.connected.occupant.dna.uni_identity,uniblock,subblock,3, src,1)]</FONT><br><br>")
+				// New way of displaying DNA blocks
+				src.temphtml = text("Unique Identifier: <font color='blue'>[getblockstring(src.connected.occupant.dna.uni_identity,uniblock,subblock,3, src,1)]</FONT><br><br>")
 
-			src.temphtml += text("Selected Block: <font color='blue'><B>[]</B></FONT><BR>", src.uniblock)
-			src.temphtml += text("<A href='?src=\ref[];unimenuminus=1'><-</A> Block <A href='?src=\ref[];unimenuplus=1'>-></A><BR><BR>", src, src)
-			src.temphtml += text("Selected Sub-Block: <font color='blue'><B>[]</B></FONT><BR>", src.subblock)
-			src.temphtml += text("<A href='?src=\ref[];unimenusubminus=1'><-</A> Sub-Block <A href='?src=\ref[];unimenusubplus=1'>-></A><BR><BR>", src, src)
-			src.temphtml += text("Selected Target: <font color='blue'><B>[]</B></FONT><BR>", src.unitargethex)
-			src.temphtml += text("<A href='?src=\ref[];unimenutargetminus=1'><-</A> Target <A href='?src=\ref[];unimenutargetplus=1'>-></A><BR><BR>", src, src)
-			src.temphtml += "<B>Modify Block:</B><BR>"
-			src.temphtml += text("<A href='?src=\ref[];unipulse=1'>Irradiate</A><BR>", src)
-			src.delete = 0
+				src.temphtml += text("Selected Block: <font color='blue'><B>[]</B></FONT><BR>", src.uniblock)
+				src.temphtml += text("<A href='?src=\ref[];unimenuminus=1'><-</A> Block <A href='?src=\ref[];unimenuplus=1'>-></A><BR><BR>", src, src)
+				src.temphtml += text("Selected Sub-Block: <font color='blue'><B>[]</B></FONT><BR>", src.subblock)
+				src.temphtml += text("<A href='?src=\ref[];unimenusubminus=1'><-</A> Sub-Block <A href='?src=\ref[];unimenusubplus=1'>-></A><BR><BR>", src, src)
+				src.temphtml += text("Selected Target: <font color='blue'><B>[]</B></FONT><BR>", src.unitargethex)
+				src.temphtml += text("<A href='?src=\ref[];unimenutargetminus=1'><-</A> Target <A href='?src=\ref[];unimenutargetplus=1'>-></A><BR><BR>", src, src)
+				src.temphtml += "<B>Modify Block:</B><BR>"
+				src.temphtml += text("<A href='?src=\ref[];unipulse=1'>Irradiate</A><BR>", src)
+				src.delete = 0
 		if (href_list["unimenuplus"])
 			if (src.uniblock < 13)
 				src.uniblock++
@@ -1188,15 +1204,20 @@
 				src.temphtml = text("No viable occupant detected.")
 				usr << browse(temphtml, "window=scannernew;size=550x650")
 				onclose(usr, "scannernew")
-			var/mob/living/carbon/human/H = src.connected.occupant
-			if(H)
-				if (H.reagents.get_reagent_amount("inaprovaline") < 60)
-					H.reagents.add_reagent("inaprovaline", 30)
-				usr << text("Occupant now has [] units of rejuvenation in his/her bloodstream.", H.reagents.get_reagent_amount("inaprovaline"))
-				src.delete = 0
+			else
+				var/mob/living/carbon/human/H = src.connected.occupant
+				if(H)
+					if (H.reagents.get_reagent_amount("inaprovaline") < 60)
+						H.reagents.add_reagent("inaprovaline", 30)
+					usr << text("Occupant now has [] units of rejuvenation in his/her bloodstream.", H.reagents.get_reagent_amount("inaprovaline"))
+					src.delete = 0
 		////////////////////////////////////////////////////////
 		if (href_list["strucmenu"])
-			if(src.connected.occupant)
+			if(!src.connected.occupant || !src.connected.occupant.dna)
+				src.temphtml = text("No viable occupant detected.")
+				usr << browse(temphtml, "window=scannernew;size=550x650")
+				onclose(usr, "scannernew")
+			else
 				// Get this shit outta here it sucks
 				//src.temphtml = text("Structural Enzymes: <font color='blue'>[getleftblocks(src.connected.occupant.dna.struc_enzymes,strucblock,3)][src.subblock == 1 ? "<U><B>"+getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),1,1)+"</U></B>" : getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),1,1)][src.subblock == 2 ? "<U><B>"+getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),2,1)+"</U></B>" : getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),2,1)][src.subblock == 3 ? "<U><B>"+getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),3,1)+"</U></B>" : getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),3,1)][getrightblocks(src.connected.occupant.dna.struc_enzymes,strucblock,3)]</FONT><BR><BR>")
 				//src.temphtml = text("Structural Enzymes: <font color='blue'>[]</FONT><BR><BR>", src.connected.occupant.dna.struc_enzymes)

code/game/gamemodes/blob/blob.dm

@@ -109,7 +109,9 @@ var/list/blob_nodes = list()
 
 			if (1)
 				command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
-				world << sound('sound/AI/outbreak5.ogg')
+				for(var/mob/M in player_list)
+					if(!istype(M,/mob/new_player))
+						M << sound('sound/AI/outbreak5.ogg')
 				autoexpand = 0//No more extra pulses
 				stage = -1
 				//next stage in 4-5 minutes

code/game/gamemodes/blob/blobs/factory.dm

@@ -19,5 +19,48 @@
 
 	run_action()
 		if(spores.len >= max_spores)	return 0
-		new/obj/effect/critter/blob(src.loc, src)
+		new/mob/living/simple_animal/hostile/blobspore(src.loc, src)
 		return 1
+
+
+/mob/living/simple_animal/hostile/blobspore
+	name = "blob"
+	desc = "Some blob thing."
+	icon = 'icons/mob/critter.dmi'
+	icon_state = "blobsquiggle"
+	icon_living = "blobsquiggle"
+	pass_flags = PASSBLOB
+	health = 20
+	maxHealth = 20
+	melee_damage_lower = 4
+	melee_damage_upper = 8
+	attacktext = "hits"
+	attack_sound = 'sound/weapons/genhit1.ogg'
+	var/obj/effect/blob/factory/factory = null
+	faction = "blob"
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+	minbodytemp = 0
+	maxbodytemp = 360
+
+
+	New(loc, var/obj/effect/blob/factory/linked_node)
+		..()
+		if(istype(linked_node))
+			factory = linked_node
+			factory.spores += src
+		..(loc)
+		return
+	Die()
+		..()
+		if(factory)
+			factory.spores -= src
+		..()
+		del(src)
+

code/game/gamemodes/changeling/changeling_powers.dm

@@ -35,29 +35,29 @@
 
 //Helper proc. Does all the checks and stuff for us to avoid copypasta
 /mob/proc/changeling_power(var/required_chems=0, var/required_dna=0, var/max_genetic_damage=100, var/max_stat=0)
-	if(!usr)			return
-	if(!usr.mind)		return
-	if(!iscarbon(usr))	return
 
-	var/datum/changeling/changeling = usr.mind.changeling
+	if(!src.mind)		return
+	if(!iscarbon(src))	return
+
+	var/datum/changeling/changeling = src.mind.changeling
 	if(!changeling)
-		world.log << "[usr] has the changeling_transform() verb but is not a changeling."
+		world.log << "[src] has the changeling_transform() verb but is not a changeling."
 		return
 
-	if(usr.stat > max_stat)
-		usr << "<span class='warning'>We are incapacitated.</span>"
+	if(src.stat > max_stat)
+		src << "<span class='warning'>We are incapacitated.</span>"
 		return
 
 	if(changeling.absorbed_dna.len < required_dna)
-		usr << "<span class='warning'>We require at least [required_dna] samples of compatible DNA.</span>"
+		src << "<span class='warning'>We require at least [required_dna] samples of compatible DNA.</span>"
 		return
 
 	if(changeling.chem_charges < required_chems)
-		usr << "<span class='warning'>We require at least [required_chems] units of chemicals to do that!</span>"
+		src << "<span class='warning'>We require at least [required_chems] units of chemicals to do that!</span>"
 		return
 
 	if(changeling.geneticdamage > max_genetic_damage)
-		usr << "<span class='warning'>Our geneomes are still reassembling. We need time to recover first.</span>"
+		src << "<span class='warning'>Our geneomes are still reassembling. We need time to recover first.</span>"
 		return
 
 	return changeling
@@ -72,55 +72,55 @@
 	var/datum/changeling/changeling = changeling_power(0,0,100)
 	if(!changeling)	return
 
-	var/obj/item/weapon/grab/G = usr.get_active_hand()
+	var/obj/item/weapon/grab/G = src.get_active_hand()
 	if(!istype(G))
-		usr << "<span class='warning'>We must be grabbing a creature in our active hand to absorb them.</span>"
+		src << "<span class='warning'>We must be grabbing a creature in our active hand to absorb them.</span>"
 		return
 
 	var/mob/living/carbon/human/T = G.affecting
 	if(!istype(T))
-		usr << "<span class='warning'>[T] is not compatible with our biology.</span>"
+		src << "<span class='warning'>[T] is not compatible with our biology.</span>"
 		return
 
 	if(NOCLONE in T.mutations)
-		usr << "<span class='warning'>This creature's DNA is ruined beyond useability!</span>"
+		src << "<span class='warning'>This creature's DNA is ruined beyond useability!</span>"
 		return
 
 	if(!G.killing)
-		usr << "<span class='warning'>We must have a tighter grip to absorb this creature.</span>"
+		src << "<span class='warning'>We must have a tighter grip to absorb this creature.</span>"
 		return
 
 	if(changeling.isabsorbing)
-		usr << "<span class='warning'>We are already absorbing!</span>"
+		src << "<span class='warning'>We are already absorbing!</span>"
 		return
 
 	changeling.isabsorbing = 1
 	for(var/stage = 1, stage<=3, stage++)
 		switch(stage)
 			if(1)
-				usr << "<span class='notice'>This creature is compatible. We must hold still...</span>"
+				src << "<span class='notice'>This creature is compatible. We must hold still...</span>"
 			if(2)
-				usr << "<span class='notice'>We extend a proboscis.</span>"
-				usr.visible_message("<span class='warning'>[usr] extends a proboscis!</span>")
+				src << "<span class='notice'>We extend a proboscis.</span>"
+				src.visible_message("<span class='warning'>[src] extends a proboscis!</span>")
 			if(3)
-				usr << "<span class='notice'>We stab [T] with the proboscis.</span>"
-				usr.visible_message("<span class='danger'>[usr] stabs [T] with the proboscis!</span>")
+				src << "<span class='notice'>We stab [T] with the proboscis.</span>"
+				src.visible_message("<span class='danger'>[src] stabs [T] with the proboscis!</span>")
 				T << "<span class='danger'>You feel a sharp stabbing pain!</span>"
 				T.take_overall_damage(40)
 
 		feedback_add_details("changeling_powers","A[stage]")
-		if(!do_mob(usr, T, 150))
-			usr << "<span class='warning'>Our absorption of [T] has been interrupted!</span>"
+		if(!do_mob(src, T, 150))
+			src << "<span class='warning'>Our absorption of [T] has been interrupted!</span>"
 			changeling.isabsorbing = 0
 			return
 
-	usr << "<span class='notice'>We have absorbed [T]!</span>"
-	usr.visible_message("<span class='danger'>[usr] sucks the fluids from [T]!</span>")
+	src << "<span class='notice'>We have absorbed [T]!</span>"
+	src.visible_message("<span class='danger'>[src] sucks the fluids from [T]!</span>")
 	T << "<span class='danger'>You have been absorbed by the changeling!</span>"
 
 	T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set.
 	changeling.absorbed_dna |= T.dna
-	if(usr.nutrition < 400) usr.nutrition = min((usr.nutrition + T.nutrition), 400)
+	if(src.nutrition < 400) src.nutrition = min((src.nutrition + T.nutrition), 400)
 	changeling.chem_charges += 10
 	changeling.geneticpoints += 2
 
@@ -143,7 +143,7 @@
 					if(!Tp.isVerb)
 						call(Tp.verbpath)()
 					else
-						usr.make_changeling()
+						src.make_changeling()
 
 		changeling.chem_charges += T.mind.changeling.chem_charges
 		changeling.geneticpoints += T.mind.changeling.geneticpoints
@@ -179,15 +179,15 @@
 		return
 
 	changeling.chem_charges -= 5
-	usr.visible_message("<span class='warning'>[usr] transforms!</span>")
+	src.visible_message("<span class='warning'>[src] transforms!</span>")
 	changeling.geneticdamage = 30
-	usr.dna = chosen_dna
-	usr.real_name = chosen_dna.real_name
-	updateappearance(usr, usr.dna.uni_identity)
-	domutcheck(usr, null)
+	src.dna = chosen_dna
+	src.real_name = chosen_dna.real_name
+	updateappearance(src, src.dna.uni_identity)
+	domutcheck(src, null)
 
-	usr.verbs -= /mob/proc/changeling_transform
-	spawn(10)	usr.verbs += /mob/proc/changeling_transform
+	src.verbs -= /mob/proc/changeling_transform
+	spawn(10)	src.verbs += /mob/proc/changeling_transform
 
 	feedback_add_details("changeling_powers","TR")
 	return 1
@@ -201,7 +201,7 @@
 	var/datum/changeling/changeling = changeling_power(1,0,0)
 	if(!changeling)	return
 
-	var/mob/living/carbon/C = usr
+	var/mob/living/carbon/C = src
 	changeling.chem_charges--
 	C.remove_changeling_powers()
 	C.visible_message("<span class='warning'>[C] transforms!</span>")
@@ -216,7 +216,7 @@
 	C.monkeyizing = 1
 	C.canmove = 0
 	C.icon = null
-	C.overlays = null
+	C.overlays.Cut()
 	C.invisibility = 101
 
 	var/atom/movable/overlay/animation = new /atom/movable/overlay( C.loc )
@@ -276,7 +276,7 @@
 	if(!chosen_dna)
 		return
 
-	var/mob/living/carbon/C = usr
+	var/mob/living/carbon/C = src
 
 	changeling.chem_charges--
 	C.remove_changeling_powers()
@@ -290,7 +290,7 @@
 	C.monkeyizing = 1
 	C.canmove = 0
 	C.icon = null
-	C.overlays = null
+	C.overlays.Cut()
 	C.invisibility = 101
 	var/atom/movable/overlay/animation = new /atom/movable/overlay( C.loc )
 	animation.icon_state = "blank"
@@ -300,7 +300,7 @@
 	sleep(48)
 	del(animation)
 
-	for(var/obj/item/W in usr)
+	for(var/obj/item/W in src)
 		C.u_equip(W)
 		if (C.client)
 			C.client.screen -= W
@@ -350,7 +350,7 @@
 	var/datum/changeling/changeling = changeling_power(20,1,100,DEAD)
 	if(!changeling)	return
 
-	var/mob/living/carbon/C = usr
+	var/mob/living/carbon/C = src
 	if(!C.stat && alert("Are we sure we wish to fake our death?",,"Yes","No") == "No")//Confirmation for living changelings if they want to fake their death
 		return
 	C << "<span class='notice'>We will attempt to regenerate our form.</span>"
@@ -380,7 +380,7 @@
 			C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss())
 			C.reagents.clear_reagents()
 			C << "<span class='notice'>We have regenerated.</span>"
-			C.visible_message("<span class='warning'>[usr] appears to wake from the dead, having healed all wounds.</span>")
+			C.visible_message("<span class='warning'>[src] appears to wake from the dead, having healed all wounds.</span>")
 
 			C.status_flags &= ~(FAKEDEATH)
 			C.update_canmove()
@@ -398,10 +398,10 @@
 	var/datum/changeling/changeling = changeling_power(10,0,100)
 	if(!changeling)	return 0
 	changeling.chem_charges -= 10
-	usr << "<span class='notice'>Your throat adjusts to launch the sting.</span>"
+	src << "<span class='notice'>Your throat adjusts to launch the sting.</span>"
 	changeling.sting_range = 2
-	usr.verbs -= /mob/proc/changeling_boost_range
-	spawn(5)	usr.verbs += /mob/proc/changeling_boost_range
+	src.verbs -= /mob/proc/changeling_boost_range
+	spawn(5)	src.verbs += /mob/proc/changeling_boost_range
 	feedback_add_details("changeling_powers","RS")
 	return 1
 
@@ -416,7 +416,7 @@
 	if(!changeling)	return 0
 	changeling.chem_charges -= 45
 
-	var/mob/living/carbon/human/C = usr
+	var/mob/living/carbon/human/C = src
 	C.stat = 0
 	C.SetParalysis(0)
 	C.SetStunned(0)
@@ -424,45 +424,44 @@
 	C.lying = 0
 	C.update_canmove()
 
-	usr.verbs -= /mob/proc/changeling_unstun
-	spawn(5)	usr.verbs += /mob/proc/changeling_unstun
+	src.verbs -= /mob/proc/changeling_unstun
+	spawn(5)	src.verbs += /mob/proc/changeling_unstun
 	feedback_add_details("changeling_powers","UNS")
 	return 1
 
 
 //Speeds up chemical regeneration
 /mob/proc/changeling_fastchemical()
-	usr.mind.changeling.chem_recharge_rate *= 2
+	src.mind.changeling.chem_recharge_rate *= 2
 	return 1
 
 //Increases macimum chemical storage
 /mob/proc/changeling_engorgedglands()
-	usr.mind.changeling.chem_storage += 25
+	src.mind.changeling.chem_storage += 25
 	return 1
 
 
 //Prevents AIs tracking you but makes you easily detectable to the human-eye.
 /mob/proc/changeling_digitalcamo()
 	set category = "Changeling"
-	set name = "Toggle Digital Camoflague (10)"
+	set name = "Toggle Digital Camoflague"
 	set desc = "The AI can no longer track us, but we will look different if examined.  Has a constant cost while active."
 
-	var/datum/changeling/changeling = changeling_power(10)
+	var/datum/changeling/changeling = changeling_power()
 	if(!changeling)	return 0
-	usr.mind.changeling.chem_charges -= 10
 
-	var/mob/living/carbon/human/C = usr
+	var/mob/living/carbon/human/C = src
 	if(C.digitalcamo)	C << "<span class='notice'>We return to normal.</span>"
 	else				C << "<span class='notice'>We distort our form to prevent AI-tracking.</span>"
 	C.digitalcamo = !C.digitalcamo
 
 	spawn(0)
-		while(C && C.digitalcamo)
-			C.mind.changeling.chem_charges -= 1
+		while(C && C.digitalcamo && C.mind && C.mind.changeling)
+			C.mind.changeling.chem_charges = max(C.mind.changeling.chem_charges - 1, 0)
 			sleep(40)
 
-	usr.verbs -= /mob/proc/changeling_digitalcamo
-	spawn(5)	usr.verbs += /mob/proc/changeling_digitalcamo
+	src.verbs -= /mob/proc/changeling_digitalcamo
+	spawn(5)	src.verbs += /mob/proc/changeling_digitalcamo
 	feedback_add_details("changeling_powers","CAM")
 	return 1
 
@@ -475,9 +474,9 @@
 
 	var/datum/changeling/changeling = changeling_power(30,0,100,UNCONSCIOUS)
 	if(!changeling)	return 0
-	usr.mind.changeling.chem_charges -= 30
+	src.mind.changeling.chem_charges -= 30
 
-	var/mob/living/carbon/human/C = usr
+	var/mob/living/carbon/human/C = src
 	spawn(0)
 		for(var/i = 0, i<10,i++)
 			if(C)
@@ -487,8 +486,8 @@
 				C.adjustFireLoss(-10)
 				sleep(10)
 
-	usr.verbs -= /mob/proc/changeling_rapidregen
-	spawn(5)	usr.verbs += /mob/proc/changeling_rapidregen
+	src.verbs -= /mob/proc/changeling_rapidregen
+	spawn(5)	src.verbs += /mob/proc/changeling_rapidregen
 	feedback_add_details("changeling_powers","RR")
 	return 1
 
@@ -510,7 +509,7 @@ var/list/datum/dna/hivemind_bank = list()
 			names += DNA.real_name
 
 	if(names.len <= 0)
-		usr << "<span class='notice'>The airwaves already have all of our DNA.</span>"
+		src << "<span class='notice'>The airwaves already have all of our DNA.</span>"
 		return
 
 	var/S = input("Select a DNA to channel: ", "Channel DNA", null) as null|anything in names
@@ -522,7 +521,7 @@ var/list/datum/dna/hivemind_bank = list()
 
 	changeling.chem_charges -= 10
 	hivemind_bank += chosen_dna
-	usr << "<span class='notice'>We channel the DNA of [S] to the air.</span>"
+	src << "<span class='notice'>We channel the DNA of [S] to the air.</span>"
 	feedback_add_details("changeling_powers","HU")
 	return 1
 
@@ -540,7 +539,7 @@ var/list/datum/dna/hivemind_bank = list()
 			names[DNA.real_name] = DNA
 
 	if(names.len <= 0)
-		usr << "<span class='notice'>There's no new DNA to absorb from the air.</span>"
+		src << "<span class='notice'>There's no new DNA to absorb from the air.</span>"
 		return
 
 	var/S = input("Select a DNA absorb from the air: ", "Absorb DNA", null) as null|anything in names
@@ -551,7 +550,7 @@ var/list/datum/dna/hivemind_bank = list()
 
 	changeling.chem_charges -= 20
 	changeling.absorbed_dna += chosen_dna
-	usr << "<span class='notice'>We absorb the DNA of [S] from the air.</span>"
+	src << "<span class='notice'>We absorb the DNA of [S] from the air.</span>"
 	feedback_add_details("changeling_powers","HD")
 	return 1
 
@@ -559,32 +558,32 @@ var/list/datum/dna/hivemind_bank = list()
 
 /mob/proc/changeling_mimicvoice()
 	set category = "Changeling"
-	set name = "Mimic Voice (10)"
-	set desc = "Shape our vocal glands to form a voice of someone we choose."
+	set name = "Mimic Voice"
+	set desc = "Shape our vocal glands to form a voice of someone we choose. We cannot regenerate chemicals when mimicing."
 
-	var/datum/changeling/changeling = changeling_power(10,1)
+
+	var/datum/changeling/changeling = changeling_power()
 	if(!changeling)	return
 
 	if(changeling.mimicing)
 		changeling.mimicing = ""
-		usr << "<span class='notice'>We return our vocal glands to their original location.</span>"
+		src << "<span class='notice'>We return our vocal glands to their original location.</span>"
 		return
 
 	var/mimic_voice = input("Enter a name to mimic.", "Mimic Voice", null) as text
 	if(!mimic_voice)
 		return
 
-	changeling.chem_charges -= 10
 	changeling.mimicing = mimic_voice
 
-	usr << "<span class='notice'>We shape our glands to take the voice of <b>[mimic_voice]</b>, this will stop us from regenerating chemicals while active.</span>"
-	usr << "<span class='notice'>Use this power again to return to our original voice and reproduce chemicals again.</span>"
+	src << "<span class='notice'>We shape our glands to take the voice of <b>[mimic_voice]</b>, this will stop us from regenerating chemicals while active.</span>"
+	src << "<span class='notice'>Use this power again to return to our original voice and reproduce chemicals again.</span>"
 
 	feedback_add_details("changeling_powers","MV")
 
 	spawn(0)
 		while(src && src.mind && src.mind.changeling && src.mind.changeling.mimicing)
-			src.mind.changeling.chem_charges -= 1
+			src.mind.changeling.chem_charges = max(src.mind.changeling.chem_charges - 1, 0)
 			sleep(40)
 		if(src && src.mind && src.mind.changeling)
 			src.mind.changeling.mimicing = ""
@@ -607,7 +606,7 @@ var/list/datum/dna/hivemind_bank = list()
 	var/list/victims = list()
 	for(var/mob/living/carbon/C in oview(changeling.sting_range))
 		victims += C
-	var/mob/living/carbon/T = input(usr, "Who will we sting?") as null|anything in victims
+	var/mob/living/carbon/T = input(src, "Who will we sting?") as null|anything in victims
 
 	if(!T) return
 	if(!(T in view(changeling.sting_range))) return
@@ -616,10 +615,10 @@ var/list/datum/dna/hivemind_bank = list()
 
 	changeling.chem_charges -= required_chems
 	changeling.sting_range = 1
-	usr.verbs -= verb_path
-	spawn(10)	usr.verbs += verb_path
+	src.verbs -= verb_path
+	spawn(10)	src.verbs += verb_path
 
-	usr << "<span class='notice'>We stealthily sting [T].</span>"
+	src << "<span class='notice'>We stealthily sting [T].</span>"
 	if(!T.mind || !T.mind.changeling)	return T	//T will be affected by the sting
 	T << "<span class='warning'>You feel a tiny prick.</span>"
 	return
@@ -712,7 +711,7 @@ var/list/datum/dna/hivemind_bank = list()
 	var/mob/living/carbon/T = changeling_sting(40,/mob/proc/changeling_transformation_sting)
 	if(!T)	return 0
 	if((HUSK in T.mutations) || (!ishuman(T) && !ismonkey(T)))
-		usr << "<span class='warning'>Our sting appears ineffective against its DNA.</span>"
+		src << "<span class='warning'>Our sting appears ineffective against its DNA.</span>"
 		return 0
 	T.visible_message("<span class='warning'>[T] transforms!</span>")
 	T.dna = chosen_dna
@@ -756,8 +755,8 @@ var/list/datum/dna/hivemind_bank = list()
 	set desc="Stealthily sting a target to extract their DNA."
 
 	var/datum/changeling/changeling = null
-	if(usr.mind && usr.mind.changeling)
-		changeling = usr.mind.changeling
+	if(src.mind && src.mind.changeling)
+		changeling = src.mind.changeling
 	if(!changeling)
 		return 0
 

code/game/gamemodes/changeling/modularchangling.dm

@@ -81,7 +81,7 @@ var/list/datum/power/changeling/powerinstances = list()
 /datum/power/changeling/mimicvoice
 	name = "Mimic Voice"
 	desc = "We shape our vocal glands to sound like a desired voice."
-	helptext = "Will turn your voice into the name that you enter."
+	helptext = "Will turn your voice into the name that you enter. We must constantly expend chemicals to maintain our form like this"
 	genomecost = 3
 	verbpath = /mob/proc/changeling_mimicvoice
 
@@ -494,7 +494,7 @@ var/list/datum/power/changeling/powerinstances = list()
 	purchasedpowers += Thepower
 
 	if(!Thepower.isVerb && Thepower.verbpath)
-		call(Thepower.verbpath)()
+		call(M.current, Thepower.verbpath)()
 	else if(remake_verbs)
 		M.current.make_changeling()
 

code/game/gamemodes/cult/ritual.dm

@@ -654,24 +654,3 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 					R.word3=cultwords["technology"]
 					R.loc = user.loc
 					R.check_icon()
-
-
-/obj/item/weapon/paperscrap
-	name = "scrap of paper"
-	icon_state = "scrap"
-	throw_speed = 1
-	throw_range = 2
-	w_class = 1.0
-	flags = FPRINT | TABLEPASS
-
-	var/data
-
-	attack_self(mob/user as mob)
-		view_scrap(user)
-
-	examine()
-		set src in usr
-		view_scrap(usr)
-
-	proc/view_scrap(var/viewer)
-		viewer << browse(data)

code/game/gamemodes/cult/runes.dm

@@ -377,10 +377,14 @@ var/list/sacrificed = list()
 			"\red A shape forms in the center of the rune. A shape of... a man.", \
 			"\red You hear liquid flowing.")
 			D.real_name = "Unknown"
+			var/chose_name = 0
 			for(var/obj/item/weapon/paper/P in this_rune.loc)
 				if(P.info)
 					D.real_name = copytext(P.info, 1, MAX_NAME_LEN)
+					chose_name = 1
 					break
+			if(!chose_name)
+				D.real_name = "[pick(first_names_male)] [pick(last_names)]"
 			D.universal_speak = 1
 			D.status_flags &= ~GODMODE
 

code/game/gamemodes/events.dm

@@ -8,12 +8,14 @@
 			/*if(prob(50))//Every 120 seconds and prob 50 2-4 weak spacedusts will hit the station
 				spawn(1)
 					dust_swarm("weak")*/
-			if (!event)
+			if(!event)
 				//CARN: checks to see if random events are enabled.
 				if(config.allow_random_events)
-					hadevent = event()
-				else
-					Holiday_Random_Event()
+					if(prob(eventchance))
+						event()
+						hadevent = 1
+					else
+						Holiday_Random_Event()
 			else
 				event = 0
 			sleep(2400)
@@ -77,15 +79,52 @@
 	switch(picked_event)
 		if("Meteor")
 			command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert")
-			world << sound('sound/AI/meteors.ogg')
+			for(var/mob/M in player_list)
+				if(!istype(M,/mob/new_player))
+					M << sound('sound/AI/meteors.ogg')
 			spawn(100)
 				meteor_wave()
 				spawn_meteors()
 			spawn(700)
 				meteor_wave()
 				spawn_meteors()
-		if("Blob")
-			mini_blob_event()
+
+		if(2)
+			command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
+			for(var/mob/M in player_list)
+				if(!istype(M,/mob/new_player))
+					M << sound('sound/AI/granomalies.ogg')
+			var/turf/T = pick(blobstart)
+			var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
+			spawn(rand(50, 300))
+				del(bh)
+		/*
+		if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO
+			command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
+			world << sound('sound/AI/spanomalies.ogg')
+			var/list/turfs = new
+			var/turf/picked
+			for(var/turf/simulated/floor/T in world)
+				if(T.z == 1)
+					turfs += T
+			for(var/turf/simulated/floor/T in turfs)
+				if(prob(20))
+					spawn(50+rand(0,3000))
+						picked = pick(turfs)
+						var/obj/effect/portal/P = new /obj/effect/portal( T )
+						P.target = picked
+						P.creator = null
+						P.icon = 'icons/obj/objects.dmi'
+						P.failchance = 0
+						P.icon_state = "anom"
+						P.name = "wormhole"
+						spawn(rand(300,600))
+							del(P)
+		*/
+		if(3)
+			if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round.
+				space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.
+		if(4)			mini_blob_event()
 		if("Space Ninja")
 			//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.
 			space_ninja_arrival()
@@ -118,13 +157,16 @@
 		command_alert("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT")
 	else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms
 		for(var/mob/living/silicon/ai/A in player_list)
-			A << "<span class='warning'>Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT</span>"
+			A << "<br>"
+			A << "<span class='warning'><b>Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT<b></span>"
+			A << "<br>"
 	for(var/obj/machinery/telecomms/T in telecomms_list)
 		T.emp_act(1)
 
 /proc/power_failure()
 	command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure")
-	world << sound('sound/AI/poweroff.ogg')
+	for(var/mob/M in player_list)
+		M << sound('sound/AI/poweroff.ogg')
 	for(var/obj/machinery/power/smes/S in world)
 		if(istype(get_area(S), /area/turret_protected) || S.z != 1)
 			continue
@@ -172,7 +214,8 @@
 /proc/power_restore()
 
 	command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal")
-	world << sound('sound/AI/poweron.ogg')
+	for(var/mob/M in player_list)
+		M << sound('sound/AI/poweron.ogg')
 	for(var/obj/machinery/power/apc/C in world)
 		if(C.cell && C.z == 1)
 			C.cell.charge = C.cell.maxcharge
@@ -194,7 +237,8 @@
 /proc/power_restore_quick()
 
 	command_alert("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal")
-	world << sound('sound/AI/poweron.ogg')
+	for(var/mob/M in player_list)
+		M << sound('sound/AI/poweron.ogg')
 	for(var/obj/machinery/power/smes/S in world)
 		if(S.z != 1)
 			continue
@@ -250,6 +294,8 @@
 
 		var/foundAlready = 0 // don't infect someone that already has the virus
 		var/turf/T = get_turf(H)
+		if(!T)
+			continue
 		if(T.z != 1)
 			continue
 		for(var/datum/disease/D in H.viruses)
@@ -278,7 +324,8 @@
 			break
 	spawn(rand(1500, 3000)) //Delayed announcements to keep the crew on their toes.
 		command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
-		world << sound('sound/AI/outbreak7.ogg')
+		for(var/mob/M in player_list)
+			M << sound('sound/AI/outbreak7.ogg')
 
 /proc/alien_infestation(var/spawncount = 1) // -- TLE
 	//command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")
@@ -306,7 +353,8 @@
 
 	spawn(rand(5000, 6000)) //Delayed announcements to keep the crew on their toes.
 		command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")
-		world << sound('sound/AI/aliens.ogg')
+		for(var/mob/M in player_list)
+			M << sound('sound/AI/aliens.ogg')
 
 /proc/high_radiation_event()
 
@@ -321,6 +369,8 @@
 	sleep(600)
 	for(var/mob/living/carbon/human/H in living_mob_list)
 		var/turf/T = get_turf(H)
+		if(!T)
+			continue
 		if(T.z != 1)
 			continue
 		if(istype(H,/mob/living/carbon/human))
@@ -329,12 +379,15 @@
 				H.apply_effect((rand(90,150)),IRRADIATE,0)
 	for(var/mob/living/carbon/monkey/M in living_mob_list)
 		var/turf/T = get_turf(M)
+		if(!T)
+			continue
 		if(T.z != 1)
 			continue
 		M.apply_effect((rand(15,75)),IRRADIATE,0)
 	sleep(100)
 	command_alert("Radiation levels are within standard parameters again.", "Anomaly Alert")
-	world << sound('sound/AI/radiation.ogg')
+	for(var/mob/M in player_list)
+		M << sound('sound/AI/radiation.ogg')
 
 
 
@@ -384,7 +437,8 @@
 	//sleep(100)
 	spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes.
 		command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
-		world << sound('sound/AI/commandreport.ogg')
+		for(var/mob/M in player_list)
+			M << sound('sound/AI/commandreport.ogg')
 
 /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights
 	if(isEvent)
@@ -451,46 +505,74 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 				crew = "Any Human"
 			switch(rand(1,14))
 				if(1)
+					M << "<br>"
 					M << "\red THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("THERE ARE [amount] [who2] ON THE STATION")
 				if(2)
+					M << "<br>"
 					M << "\red [what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("[what2] ARE DANGEROUS TO HUMANS")
 				if(3)
+					M << "<br>"
 					M << "\red THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION")
 				if(4)
+					M << "<br>"
 					M << "\red HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE")
 				if(5)
+					M << "<br>"
 					M << "\red THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("THE CAPTAIN, HOP AND HOS ARE [who2]")
 				if(6)
+					M << "<br>"
 					M << "\red THE STATION IS BUILT FOR [who2]...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("THE STATION IS BUILT FOR [who2]")
 				if(7)
+					M << "<br>"
 					M << "\red YOU ARE [amount] [who2]...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("YOU ARE [amount] [who2]")
 				if(8)
+					M << "<br>"
 					M << "\red YOU MUST ALWAYS [aimust]...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("YOU MUST ALWAYS [aimust]")
 				if(9)
+					M << "<br>"
 					M << "\red [area] [area2] [amount] [what2]...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("[area] [area2] [amount] [what2]")
 				if(10)
+					M << "<br>"
 					M << "\red [crew] is [target]...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("[crew] is [target]")
 				if(11)
+					M << "<br>"
 					M << "\red [define] IS A FORM OF HARM...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("[define] IS A FORM OF HARM")
 				if(12)
+					M << "<br>"
 					M << "\red YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS")
 				if(13)
+					M << "<br>"
 					M << "\red [crew] is [allergysev] to [allergy]...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("[crew] is [allergysev] to [allergy]")
 				if(14)
+					M << "<br>"
 					M << "\red THE STATION IS [who2pref] [who2]...LAWS UPDATED"
+					M << "<br>"
 					M.add_ion_law("THE STATION IS [who2pref] [who2]")
 
 	if(botEmagChance)

code/game/gamemodes/events/dust.dm

@@ -100,7 +100,7 @@ The "dust" will damage the hull of the station causin minor hull breaches.
 
 				if(ismob(A))
 					A.meteorhit(src)//This should work for now I guess
-				else if(!istype(A,/obj/machinery/emitter) && !istype(A,/obj/machinery/field_generator)) //Protect the singularity from getting released every round!
+				else if(!istype(A,/obj/machinery/power/emitter) && !istype(A,/obj/machinery/field_generator)) //Protect the singularity from getting released every round!
 					A.ex_act(strength) //Changing emitter/field gen ex_act would make it immune to bombs and C4
 
 				life--

code/game/gamemodes/events/holidays/Christmas.dm

@@ -1 +1,63 @@
-//placeholder for holiday stuff
+/proc/Christmas_Game_Start()
+	for(var/obj/structure/flora/tree/pine/xmas in world)
+		if(xmas.z != 1)	continue
+		for(var/turf/simulated/floor/T in orange(1,xmas))
+			for(var/i=1,i<=rand(1,5),i++)
+				new /obj/item/weapon/a_gift(T)
+	for(var/mob/living/simple_animal/corgi/Ian/Ian in mob_list)
+		Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
+
+/proc/ChristmasEvent()
+	for(var/obj/structure/flora/tree/pine/xmas in world)
+		var/mob/living/simple_animal/hostile/tree/evil_tree = new /mob/living/simple_animal/hostile/tree(xmas.loc)
+		evil_tree.icon_state = xmas.icon_state
+		evil_tree.icon_living = evil_tree.icon_state
+		evil_tree.icon_dead = evil_tree.icon_state
+		evil_tree.icon_gib = evil_tree.icon_state
+		del(xmas)
+
+/obj/item/weapon/toy/xmas_cracker
+	name = "xmas cracker"
+	icon = 'icons/obj/christmas.dmi'
+	icon_state = "cracker"
+	desc = "Directions for use: Requires two people, one to pull each end."
+	var/cracked = 0
+
+/obj/item/weapon/toy/xmas_cracker/New()
+	..()
+
+/obj/item/weapon/toy/xmas_cracker/attack(mob/target, mob/user)
+	if( !cracked && istype(target,/mob/living/carbon/human) && (target.stat == CONSCIOUS) && !target.get_active_hand() )
+		target.visible_message("<span class='notice'>[user] and [target] pop \an [src]! *pop*</span>", "<span class='notice'>You pull \an [src] with [target]! *pop*</span>", "<span class='notice'>You hear a *pop*.</span>")
+		var/obj/item/weapon/paper/Joke = new /obj/item/weapon/paper(user.loc)
+		Joke.name = "[pick("awful","terrible","unfunny")] joke"
+		Joke.info = pick("What did one snowman say to the other?\n\n<i>'Is it me or can you smell carrots?'</i>",
+			"Why couldn't the snowman get laid?\n\n<i>He was frigid!</i>",
+			"Where are santa's helpers educated?\n\n<i>Nowhere, they're ELF-taught.</i>",
+			"What happened to the man who stole advent calanders?\n\n<i>He got 25 days.</i>",
+			"What does Santa get when he gets stuck in a chimney?\n\n<i>Claus-trophobia.</i>",
+			"Where do you find chili beans?\n\n<i>The north pole.</i>",
+			"What do you get from eating tree decorations?\n\n<i>Tinsilitis!</i>",
+			"What do snowmen wear on their heads?\n\n<i>Ice caps!</i>",
+			"Why is Christmas just like life on ss13?\n\n<i>You do all the work and the fat guy gets all the credit.</i>",
+			"Why doesn’t Santa have any children?\n\n<i>Because he only comes down the chimney.</i>")
+		new /obj/item/clothing/head/festive(target.loc)
+		user.update_icons()
+		cracked = 1
+		icon_state = "cracker1"
+		var/obj/item/weapon/toy/xmas_cracker/other_half = new /obj/item/weapon/toy/xmas_cracker(target)
+		other_half.cracked = 1
+		other_half.icon_state = "cracker2"
+		target.put_in_active_hand(other_half)
+		playsound(user, 'sound/effects/snap.ogg', 50, 1)
+		return 1
+	return ..()
+
+/obj/item/clothing/head/festive
+	name = "festive paper hat"
+	icon_state = "xmashat"
+	desc = "A crappy paper hat that you are REQUIRED to wear."
+	flags_inv = 0
+	flags = FPRINT|TABLEPASS
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+

code/game/gamemodes/events/holidays/Holidays.dm

@@ -101,6 +101,7 @@ var/global/Holiday = null
 			switch(DD)
 				if(10)							Holiday = "Human-Rights Day"
 				if(14)							Holiday = "Monkey Day"
+				if(21)							if(YY==12)	Holiday = "End of the World"
 				if(22)							Holiday = "Orgasming Day"		//lol. These all actually exist
 				if(24)							Holiday = "Christmas Eve"
 				if(25)							Holiday = "Christmas"
@@ -120,14 +121,13 @@ var/global/Holiday = null
 	set desc = "Force-set the Holiday variable to make the game think it's a certain day."
 	if(!check_rights(R_SERVER))	return
 
-	if(!T)	return
 	Holiday = T
 	//get a new station name
 	station_name = null
 	station_name()
 	//update our hub status
 	world.update_status()
-//	Holiday_Game_Start()
+	Holiday_Game_Start()
 
 	message_admins("\blue ADMIN: Event: [key_name(src)] force-set Holiday to \"[Holiday]\"")
 	log_admin("[key_name(src)] force-set Holiday to \"[Holiday]\"")
@@ -141,10 +141,9 @@ var/global/Holiday = null
 		switch(Holiday)			//special holidays
 			if("Easter")
 				//do easter stuff
-			if("Christmas ")
-				//do christmas stuff
-			else
-				//etc. you get what I'm getting at
+			if("Christmas Eve","Christmas")
+				Christmas_Game_Start()
+
 	return
 
 //Nested in the random events loop. Will be triggered every 2 minutes
@@ -171,4 +170,9 @@ var/global/Holiday = null
 				if(S.z != 1)	continue
 				containers += S
 
-			message_admins("\blue DEBUG: Event: Egg spawned at [Egg.loc] ([Egg.x],[Egg.y],[Egg.z])")*/
+			message_admins("\blue DEBUG: Event: Egg spawned at [Egg.loc] ([Egg.x],[Egg.y],[Egg.z])")*/
+		if("End of the World")
+			if(prob(eventchance))	GameOver()
+
+		if("Christmas","Christmas Eve")
+			if(prob(eventchance))	ChristmasEvent()

code/game/gamemodes/events/holidays/Other.dm

@@ -0,0 +1,10 @@
+/proc/GameOver()
+	if(!hadevent)
+		hadevent = 1
+		message_admins("The apocalypse has begun! (this holiday event can be disabled by toggling events off within 60 seconds)")
+		spawn(600)
+			if(!config.allow_random_events)	return
+			Show2Group4Delay(ScreenText(null,"<center><font color='red' size='8'>GAME OVER</font></center>"),null,150)
+			for(var/i=1,i<=4,i++)
+				event()
+				sleep(50)

code/game/gamemodes/events/miniblob.dm

@@ -9,11 +9,13 @@
 	blobevent = 1
 	spawn(0)
 		dotheblobbaby()
-	spawn(12000) // blob event can last up to 20 minutes
+	spawn(3000)
 		blobevent = 0
 	spawn(rand(1000, 2000)) //Delayed announcements to keep the crew on their toes.
 		command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
-		world << sound('sound/AI/outbreak5.ogg')
+		for(var/mob/M in player_list)
+			if(!istype(M,/mob/new_player))
+				M << sound('sound/AI/outbreak5.ogg')
 
 /proc/dotheblobbaby()
 	if (blobevent)
@@ -25,5 +27,5 @@
 				if(B.z != 1)
 					continue
 				B.Life()
-		spawn(280) // advance 1 tile every 30 seconds
-			dotheblobbaby()
+		spawn(30)
+			dotheblobbaby()

code/game/gamemodes/events/ninja_equipment.dm

@@ -540,7 +540,7 @@ ________________________________________________________________________________
 				playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1)
 				for (var/mob/O in hearers(3, P.loc))
 					O.show_message(text("\icon[P] *[P.ttone]*"))
-			P.overlays = null
+			P.overlays.Cut()
 			P.overlays += image('icons/obj/pda.dmi', "pda-r")
 
 		if("Inject")
@@ -976,7 +976,7 @@ ________________________________________________________________________________
 					flick("apc-spark", src)
 					A.emagged = 1
 					A.locked = 0
-					A.updateicon()
+					A.update_icon()
 			else
 				U << "\red This APC has run dry of power. You must find another source."
 

code/game/gamemodes/events/wormholes.dm

@@ -8,7 +8,9 @@
 		if(pick_turfs.len)
 			//All ready. Announce that bad juju is afoot.
 			command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			world << sound('sound/AI/spanomalies.ogg')
+			for(var/mob/M in player_list)
+				if(!istype(M,/mob/new_player))
+					M << sound('sound/AI/spanomalies.ogg')
 
 			//prob(20) can be approximated to 1 wormhole every 5 turfs!
 			//admittedly less random but totally worth it >_<

code/game/gamemodes/factions.dm

@@ -124,7 +124,7 @@
 /obj/item/weapon/gun/energy/crossbow:5:Energy Crossbow;
 /obj/item/weapon/melee/energy/sword:4:Energy Sword;
 /obj/item/weapon/storage/box/syndicate:10:Syndicate Bundle;
-/obj/item/weapon/storage/emp_kit:3:5 EMP Grenades;
+/obj/item/weapon/storage/box/emps:3:5 EMP Grenades;
 Whitespace:Seperator;
 Stealthy and Inconspicuous Weapons;
 /obj/item/weapon/pen/paralysis:3:Paralysis Pen;
@@ -141,7 +141,7 @@ Whitespace:Seperator;
 Devices and Tools;
 /obj/item/weapon/card/emag:3:Cryptographic Sequencer;
 /obj/item/weapon/storage/toolbox/syndicate:1:Fully Loaded Toolbox;
-/obj/item/weapon/storage/syndie_kit/space:3:Space Suit;
+/obj/item/weapon/storage/box/syndie_kit/space:3:Space Suit;
 /obj/item/clothing/glasses/thermal/syndi:3:Thermal Imaging Glasses;
 /obj/item/device/encryptionkey/binary:3:Binary Translator Key;
 /obj/item/weapon/aiModule/syndicate:7:Hacked AI Upload Module;
@@ -151,8 +151,8 @@ Devices and Tools;
 /obj/item/weapon/circuitboard/teleporter:20:Teleporter Circuit Board;
 Whitespace:Seperator;
 Implants;
-/obj/item/weapon/storage/syndie_kit/imp_freedom:3:Freedom Implant;
-/obj/item/weapon/storage/syndie_kit/imp_uplink:10:Uplink Implant (Contains 5 Telecrystals);
+/obj/item/weapon/storage/box/syndie_kit/imp_freedom:3:Freedom Implant;
+/obj/item/weapon/storage/box/syndie_kit/imp_uplink:10:Uplink Implant (Contains 5 Telecrystals);
 Whitespace:Seperator;
 (Pointless) Badassery;
 /obj/item/toy/syndicateballoon:10:For showing that You Are The BOSS (Useless Balloon);"}

code/game/gamemodes/game_mode.dm

@@ -34,7 +34,7 @@
 /obj/item/weapon/gun/energy/crossbow:5:Energy Crossbow;
 /obj/item/weapon/melee/energy/sword:4:Energy Sword;
 /obj/item/weapon/storage/box/syndicate:10:Syndicate Bundle;
-/obj/item/weapon/storage/emp_kit:3:5 EMP Grenades;
+/obj/item/weapon/storage/box/emps:3:5 EMP Grenades;
 Whitespace:Seperator;
 Stealthy and Inconspicuous Weapons;
 /obj/item/weapon/pen/paralysis:3:Paralysis Pen;
@@ -51,7 +51,7 @@ Whitespace:Seperator;
 Devices and Tools;
 /obj/item/weapon/card/emag:3:Cryptographic Sequencer;
 /obj/item/weapon/storage/toolbox/syndicate:1:Fully Loaded Toolbox;
-/obj/item/weapon/storage/syndie_kit/space:3:Space Suit;
+/obj/item/weapon/storage/box/syndie_kit/space:3:Space Suit;
 /obj/item/clothing/glasses/thermal/syndi:3:Thermal Imaging Glasses;
 /obj/item/device/encryptionkey/binary:3:Binary Translator Key;
 /obj/item/weapon/aiModule/syndicate:7:Hacked AI Upload Module;
@@ -61,11 +61,10 @@ Devices and Tools;
 /obj/item/weapon/circuitboard/teleporter:20:Teleporter Circuit Board;
 Whitespace:Seperator;
 Implants;
-/obj/item/weapon/storage/syndie_kit/imp_freedom:3:Freedom Implant;
+/obj/item/weapon/storage/box/syndie_kit/imp_freedom:3:Freedom Implant;
+/obj/item/weapon/storage/box/syndie_kit/imp_uplink:10:Uplink Implant (Contains 5 Telecrystals);
 /obj/item/weapon/implant/explosive:6:Explosive Implant (DANGER!);
-/obj/item/weapon/implant/compressed:4:Compressed Matter Implant;
-/obj/item/weapon/storage/syndie_kit/imp_uplink:10:Uplink Implant (Contains 5 Telecrystals);
-Whitespace:Seperator;
+/obj/item/weapon/implant/compressed:4:Compressed Matter Implant;Whitespace:Seperator;
 (Pointless) Badassery;
 /obj/item/toy/syndicateballoon:10:For showing that You Are The BOSS (Useless Balloon);"}
 
@@ -233,7 +232,9 @@ Whitespace:Seperator;
 	world << sound('commandreport.ogg')
 
 /*	command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.")
-	world << sound('sound/AI/intercept.ogg')
+	for(var/mob/M in player_list)
+		if(!istype(M,/mob/new_player))
+			M << sound('sound/AI/intercept.ogg')
 	if(security_level < SEC_LEVEL_BLUE)
 		set_security_level(SEC_LEVEL_BLUE)*/
 
@@ -320,7 +321,6 @@ Whitespace:Seperator;
 			if(applicant)
 				candidates += applicant
 				drafted.Remove(applicant)
-				log_admin("[applicant.key] drafted into antagonist role against their preferences.")
 				message_admins("[applicant.key] drafted into antagonist role against their preferences.")
 
 		else												// Not enough scrubs, ABORT ABORT ABORT

code/game/gamemodes/gameticker.dm

@@ -37,9 +37,9 @@ var/global/datum/controller/gameticker/ticker
 	var/triai = 0//Global holder for Triumvirate
 
 /datum/controller/gameticker/proc/pregame()
-	login_music = pick('sound/ambience/title1.ogg','sound/ambience/title2.ogg','sound/ambience/b12_combined_start.ogg') // choose title music!
-/*	for(var/mob/new_player/M in mob_list)
-		if(M.client)	M.client.playtitlemusic()*/
+	login_music = pick('sound/ambience/title2.ogg','sound/ambience/title1.ogg','sound/ambience/b12_combined_start.ogg') // choose title music!
+	for(var/mob/new_player/M in mob_list)
+		if(M.client)	M.client.playtitlemusic()
 	do
 		pregame_timeleft = 180
 		world << "<B><FONT color='blue'>Welcome to the pre-game lobby!</FONT></B>"
@@ -123,7 +123,8 @@ var/global/datum/controller/gameticker/ticker
 		//Holiday Round-start stuff	~Carn
 		Holiday_Game_Start()
 
-	start_events() //handles random events and space dust.
+//	start_events() //handles random events and space dust.
+//new random event system is handled from the MC.
 
 	var/admins_number = 0
 	for(var/client/C)
@@ -274,7 +275,9 @@ var/global/datum/controller/gameticker/ticker
 					job_master.EquipRank(player, player.mind.assigned_role, 0)
 					EquipCustomItems(player)
 		if(captainless)
-			world << "Captainship not forced on anyone."
+			for(var/mob/M in player_list)
+				if(!istype(M,/mob/new_player))
+					M << "Captainship not forced on anyone."
 
 
 	proc/process()

code/game/gamemodes/intercept_report.dm

@@ -1,5 +1,6 @@
 /datum/intercept_text
 	var/text
+	/*
 	var/prob_correct_person_lower = 20
 	var/prob_correct_person_higher = 80
 	var/prob_correct_job_lower = 20
@@ -8,6 +9,7 @@
 	var/prob_correct_print_higher = 80
 	var/prob_correct_objective_lower = 20
 	var/prob_correct_objective_higher = 80
+	*/
 	var/list/org_names_1 = list(
 		"Blighted",
 		"Defiled",
@@ -48,7 +50,8 @@
 		"Booga",
 		"The Goatee of Wrath",
 		"Tam Lin",
-		"Species 3157"
+		"Species 3157",
+		"Small Prick"
 	)
 
 
@@ -85,7 +88,9 @@
 		else
 			return null
 
+// NOTE: Commentted out was the code which showed the chance of someone being an antag. If you want to re-add it, just uncomment the code.
 
+/*
 /datum/intercept_text/proc/pick_mob()
 	var/list/dudes = list()
 	for(var/mob/living/carbon/human/man in player_list)
@@ -104,11 +109,13 @@
 		return num2text(md5(dude.dna.uni_identity))
 	else
 		return num2text(md5(num2text(rand(1,10000))))
-
+*/
 
 /datum/intercept_text/proc/build_traitor(datum/mind/correct_person)
 	var/name_1 = pick(src.org_names_1)
 	var/name_2 = pick(src.org_names_2)
+
+	/*
 	var/fingerprints
 	var/traitor_name
 	var/prob_right_dude = rand(prob_correct_person_lower, prob_correct_person_higher)
@@ -121,8 +128,11 @@
 		traitor_name = pick_mob()
 	else
 		fingerprints = pick_fingerprints()
+	*/
 
-	src.text += "<BR><BR>The <B>[name_1] [name_2]</B> implied an undercover operative was acting on their behalf on the station currently.<BR>"
+	src.text += "<BR><BR>The <B>[name_1] [name_2]</B> implied an undercover operative was acting on their behalf on the station currently."
+	src.text += "It would be in your best interests to suspect everybody, as these undercover operatives could have implants which trigger them to have their memories removed until they are needed. He, or she, could even be a high ranking officer."
+	/*
 	src.text += "After some investigation, we "
 	if(traitor_name)
 		src.text += "are [prob_right_dude]% sure that [traitor_name] may have been involved, and should be closely observed."
@@ -130,11 +140,13 @@
 	else
 		src.text += "discovered the following set of fingerprints ([fingerprints]) on sensitive materials, and their owner should be closely observed."
 		src.text += "However, these could also belong to a current Cent. Com employee, so do not act on this without reason."
+	*/
 
 
 /datum/intercept_text/proc/build_cult(datum/mind/correct_person)
 	var/name_1 = pick(src.org_names_1)
 	var/name_2 = pick(src.org_names_2)
+	/*
 	var/traitor_name
 	var/traitor_job
 	var/prob_right_dude = rand(prob_correct_person_lower, prob_correct_person_higher)
@@ -156,19 +168,23 @@
 			traitor_name = correct_person:current
 	else
 		traitor_name = pick_mob()
-
-	src.text += "<BR><BR>It has been brought to our attention that the [name_1] [name_2] have stumbled upon some dark secrets. They apparently want to spread the dangerous knowledge on as many stations as they can.<BR>"
+	*/
+	src.text += "<BR><BR>It has been brought to our attention that the [name_1] [name_2] have stumbled upon some dark secrets. They apparently want to spread the dangerous knowledge onto as many stations as they can."
+	src.text += "Watch out for the following: praying to an unfamilar god, preaching the word of \[REDACTED\], sacrifices, magical dark power, living constructs of evil and a portal to the dimension of the underworld."
+	/*
 	src.text += "Based on our intelligence, we are [prob_right_job]% sure that if true, someone doing the job of [traitor_job] on your station may have been converted "
 	src.text += "and instilled with the idea of the flimsiness of the real world, seeking to destroy it. "
 	if(prob(prob_right_dude))
 		src.text += "<BR> In addition, we are [prob_right_dude]% sure that [traitor_name] may have also some in to contact with this "
 		src.text += "organisation."
 	src.text += "<BR>However, if this information is acted on without substantial evidence, those responsible will face severe repercussions."
+	*/
 
 
 /datum/intercept_text/proc/build_rev(datum/mind/correct_person)
 	var/name_1 = pick(src.org_names_1)
 	var/name_2 = pick(src.org_names_2)
+	/*
 	var/traitor_name
 	var/traitor_job
 	var/prob_right_dude = rand(prob_correct_person_lower, prob_correct_person_higher)
@@ -192,14 +208,17 @@
 			traitor_name = correct_person.current
 	else
 		traitor_name = src.pick_mob()
-
-	src.text += "<BR><BR>It has been brought to our attention that the [name_1] [name_2] are attempting to stir unrest on one of our stations in your sector. <BR>"
+	*/
+	src.text += "<BR><BR>It has been brought to our attention that the [name_1] [name_2] are attempting to stir unrest on one of our stations in your sector."
+	src.text += "Watch out for suspicious activity among the crew and make sure that all heads of staff report in periodically."
+	/*
 	src.text += "Based on our intelligence, we are [prob_right_job]% sure that if true, someone doing the job of [traitor_job] on your station may have been brainwashed "
 	src.text += "at a recent conference, and their department should be closely monitored for signs of mutiny. "
 	if(prob(prob_right_dude))
 		src.text += "<BR> In addition, we are [prob_right_dude]% sure that [traitor_name] may have also some in to contact with this "
 		src.text += "organisation."
 	src.text += "<BR>However, if this information is acted on without substantial evidence, those responsible will face severe repercussions."
+	*/
 
 
 /datum/intercept_text/proc/build_wizard(datum/mind/correct_person)
@@ -211,7 +230,7 @@
 	src.text += "Known attributes include: Brown sandals, a large blue hat, a voluptous white beard, and an inclination to cast spells."
 
 /datum/intercept_text/proc/build_nuke(datum/mind/correct_person)
-	src.text += "<BR><BR>Cent. Com recently recieved a report of a plot to destory one of our stations in your area. We believe the Nuclear Authentication Disc "
+	src.text += "<BR><BR>Cent. Com recently recieved a report of a plot to destroy one of our stations in your area. We believe the Nuclear Authentication Disc "
 	src.text += "that is standard issue aboard your vessel may be a target. We recommend removal of this object, and it's storage in a safe "
 	src.text += "environment. As this may cause panic among the crew, all efforts should be made to keep this information a secret from all but "
 	src.text += "the most trusted crew-members."
@@ -226,6 +245,7 @@
 	var/cname = pick(src.changeling_names)
 	var/orgname1 = pick(src.org_names_1)
 	var/orgname2 = pick(src.org_names_2)
+	/*
 	var/changeling_name
 	var/changeling_job
 	var/prob_right_dude = rand(prob_correct_person_lower, prob_correct_person_higher)
@@ -245,9 +265,12 @@
 			changeling_name = src.pick_mob()
 	else
 		changeling_name = src.pick_mob()
+	*/
 
 	src.text += "<BR><BR>We have received a report that a dangerous alien lifeform known only as \"[cname]\" may have infiltrated your crew.  "
+	/*
 	src.text += "Our intelligence suggests a [prob_right_job]% chance that a [changeling_job] on board your station has been replaced by the alien.  "
 	src.text += "Additionally, the report indicates a [prob_right_dude]% chance that [changeling_name] may have been in contact with the lifeform at a recent social gathering.  "
+	*/
 	src.text += "These lifeforms are assosciated with the [orgname1] [orgname2] and may be attempting to acquire sensitive materials on their behalf.  "
-	src.text += "Please take care not to alarm the crew, as [cname] may take advantage of a panic situation."
+	src.text += "Please take care not to alarm the crew, as [cname] may take advantage of a panic situation. Remember, they can be anybody, suspect everybody!"

code/game/gamemodes/malfunction/malfunction.dm

@@ -65,6 +65,8 @@
 			if(alert(AI_mind.current,"Do you want to use an alternative sprite for your real core?",,"Yes","No")=="Yes")
 				AI_mind.current.icon_state = "ai-malf2"
 */
+	if(emergency_shuttle)
+		emergency_shuttle.always_fake_recall = 1
 	spawn (rand(waittime_l, waittime_h))
 		send_intercept()
 	..()
@@ -131,7 +133,11 @@
 	if (station_captured && !to_nuke_or_not_to_nuke)
 		return 1
 	if (is_malf_ai_dead())
-		return 1
+		if(config.continous_rounds)
+			if(emergency_shuttle)
+				emergency_shuttle.always_fake_recall = 0
+		else
+			return 1
 	return ..() //check for shuttle and nuke
 
 
@@ -165,7 +171,9 @@
 	ticker.mode:malf_mode_declared = 1
 	for(var/datum/mind/AI_mind in ticker.mode:malf_ai)
 		AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/takeover
-	world << sound('sound/AI/aimalf.ogg')
+	for(var/mob/M in player_list)
+		if(!istype(M,/mob/new_player))
+			M << sound('sound/AI/aimalf.ogg')
 
 
 /datum/game_mode/malfunction/proc/ai_win()

code/game/gamemodes/meteor/meteors.dm

@@ -114,7 +114,7 @@
 
 			//Prevent meteors from blowing up the singularity's containment.
 			//Changing emitter and generator ex_act would result in them being bomb and C4 proof.
-			if(!istype(A,/obj/machinery/emitter) && \
+			if(!istype(A,/obj/machinery/power/emitter) && \
 				!istype(A,/obj/machinery/field_generator) && \
 				prob(15))
 
@@ -141,7 +141,7 @@
 		spawn(0)
 			//Prevent meteors from blowing up the singularity's containment.
 			//Changing emitter and generator ex_act would result in them being bomb and C4 proof
-			if(!istype(A,/obj/machinery/emitter) && \
+			if(!istype(A,/obj/machinery/power/emitter) && \
 				!istype(A,/obj/machinery/field_generator))
 				if(--src.hits <= 0)
 					del(src) //Dont blow up singularity containment if we get stuck there.

code/game/gamemodes/objective.dm

@@ -295,7 +295,7 @@ datum/objective/hijack
 
 
 datum/objective/block
-	explanation_text = "Do not allow any humans to escape on the shuttle alive."
+	explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive."
 
 
 	check_completion()
@@ -474,16 +474,26 @@ datum/objective/steal
 		"a hand teleporter" = /obj/item/weapon/hand_tele,
 		"an RCD" = /obj/item/weapon/rcd,
 		"a jetpack" = /obj/item/weapon/tank/jetpack,
-		"a captains jumpsuit" = /obj/item/clothing/under/rank/captain,
+		"a captain's jumpsuit" = /obj/item/clothing/under/rank/captain,
 		"a functional AI" = /obj/item/device/aicard,
 		"a pair of magboots" = /obj/item/clothing/shoes/magboots,
 		"the station blueprints" = /obj/item/blueprints,
 		"a nasa voidsuit" = /obj/item/clothing/suit/space/nasavoid,
 		"28 moles of plasma (full tank)" = /obj/item/weapon/tank,
+		"a sample of slime extract" = /obj/item/slime_extract,
+		"a piece of corgi meat" = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi,
+		"a research director's jumpsuit" = /obj/item/clothing/under/rank/research_director,
+		"a chief engineer's jumpsuit" = /obj/item/clothing/under/rank/chief_engineer,
+		"a chief medical officer's jumpsuit" = /obj/item/clothing/under/rank/chief_medical_officer,
+		"a head of security's jumpsuit" = /obj/item/clothing/under/rank/head_of_security,
+		"a head of personnel's jumpsuit" = /obj/item/clothing/under/rank/head_of_personnel,
+		"the hypospray" = /obj/item/weapon/reagent_containers/hypospray,
+		"the captain's pinpointer" = /obj/item/weapon/pinpointer,
+		"an ablative armor vest" = /obj/item/clothing/suit/armor/laserproof,
 	)
 
 	var/global/possible_items_special[] = list(
-		"nuclear authentication disk" = /obj/item/weapon/disk/nuclear,
+		/*"nuclear authentication disk" = /obj/item/weapon/disk/nuclear,*///Broken with the change to nuke disk making it respawn on z level change.
 		"nuclear gun" = /obj/item/weapon/gun/energy/gun/nuclear,
 		"diamond drill" = /obj/item/weapon/pickaxe/diamonddrill,
 		"bag of holding" = /obj/item/weapon/storage/backpack/holding,

code/game/gamemodes/revolution/revolution.dm

@@ -89,6 +89,8 @@
 	for(var/datum/mind/rev_mind in head_revolutionaries)
 		greet_revolutionary(rev_mind)
 	modePlayer += head_revolutionaries
+	if(emergency_shuttle)
+		emergency_shuttle.always_fake_recall = 1
 	spawn (rand(waittime_l, waittime_h))
 		send_intercept()
 	..()
@@ -165,6 +167,11 @@
 //Checks if the round is over//
 ///////////////////////////////
 /datum/game_mode/revolution/check_finished()
+	if(config.continous_rounds)
+		if(finished != 0)
+			if(emergency_shuttle)
+				emergency_shuttle.always_fake_recall = 0
+		return ..()
 	if(finished != 0)
 		return 1
 	else

code/game/gamemodes/sandbox/h_sandbox.dm

@@ -144,8 +144,6 @@ datum/hSB
 							continue
 						if(istype(O, /obj/item/weapon/melee/energy/sword))
 							continue
-						if(istype(O, /obj/effect/critter))
-							continue
 						if(istype(O, /obj/structure))
 							continue
 						selectable += O