Merge branch 'dev' into ofMechfabAndPanic

Conflicts: code/__defines/research.dm code/game/mecha/equipment/tools/tools.dm code/game/mecha/mecha_parts.dm code/modules/research/designs.dm maps/exodus-1.dmm
2026-08-27 07:08:22 +01:00 · 2015-08-21 16:59:57 +03:00
parent 8fcd18157e a3753126e6
commit 6ba41bbc2a
393 changed files with 13953 additions and 12053 deletions
@@ -5,7 +5,7 @@ sudo: false
 env:
  BYOND_MAJOR="508"
  BYOND_MINOR="1293"
-  MACRO_COUNT=1230
+  MACRO_COUNT=1210
  
 cache:
  directories:
@@ -31,6 +31,7 @@
 #include "code\__defines\mobs.dm"
 #include "code\__defines\research.dm"
 #include "code\__defines\species_languages.dm"
+#include "code\__defines\turfs.dm"
 #include "code\_helpers\atmospherics.dm"
 #include "code\_helpers\datum_pool.dm"
 #include "code\_helpers\files.dm"
@@ -222,7 +223,6 @@
 #include "code\defines\procs\dbcore.dm"
 #include "code\defines\procs\hud.dm"
 #include "code\defines\procs\radio.dm"
-#include "code\defines\procs\records.dm"
 #include "code\defines\procs\sd_Alert.dm"
 #include "code\defines\procs\statistics.dm"
 #include "code\game\asteroid.dm"
@@ -372,6 +372,7 @@
 #include "code\game\machinery\doppler_array.dm"
 #include "code\game\machinery\flasher.dm"
 #include "code\game\machinery\floodlight.dm"
+#include "code\game\machinery\floor_light.dm"
 #include "code\game\machinery\floorlayer.dm"
 #include "code\game\machinery\hologram.dm"
 #include "code\game\machinery\holosign.dm"
@@ -578,7 +579,6 @@
 #include "code\game\objects\effects\decals\posters\bs12.dm"
 #include "code\game\objects\effects\spawners\bombspawner.dm"
 #include "code\game\objects\effects\spawners\gibspawner.dm"
-#include "code\game\objects\effects\spawners\vaultspawner.dm"
 #include "code\game\objects\items\apc_frame.dm"
 #include "code\game\objects\items\blueprints.dm"
 #include "code\game\objects\items\bodybag.dm"
@@ -636,14 +636,12 @@
 #include "code\game\objects\items\stacks\rods.dm"
 #include "code\game\objects\items\stacks\stack.dm"
 #include "code\game\objects\items\stacks\sheets\leather.dm"
-#include "code\game\objects\items\stacks\sheets\light.dm"
-#include "code\game\objects\items\stacks\tiles\light.dm"
-#include "code\game\objects\items\stacks\tiles\plasteel.dm"
 #include "code\game\objects\items\stacks\tiles\tile_types.dm"
 #include "code\game\objects\items\weapons\AI_modules.dm"
 #include "code\game\objects\items\weapons\autopsy.dm"
 #include "code\game\objects\items\weapons\candle.dm"
 #include "code\game\objects\items\weapons\cards_ids.dm"
+#include "code\game\objects\items\weapons\cards_ids_syndicate.dm"
 #include "code\game\objects\items\weapons\cigs_lighters.dm"
 #include "code\game\objects\items\weapons\clown_items.dm"
 #include "code\game\objects\items\weapons\cosmetics.dm"
@@ -690,6 +688,7 @@
 #include "code\game\objects\items\weapons\circuitboards\machinery\biogenerator.dm"
 #include "code\game\objects\items\weapons\circuitboards\machinery\cloning.dm"
 #include "code\game\objects\items\weapons\circuitboards\machinery\commsantenna.dm"
+#include "code\game\objects\items\weapons\circuitboards\machinery\mech_recharger.dm"
 #include "code\game\objects\items\weapons\circuitboards\machinery\mining_drill.dm"
 #include "code\game\objects\items\weapons\circuitboards\machinery\pacman.dm"
 #include "code\game\objects\items\weapons\circuitboards\machinery\power.dm"
@@ -698,6 +697,7 @@
 #include "code\game\objects\items\weapons\circuitboards\machinery\shieldgen.dm"
 #include "code\game\objects\items\weapons\circuitboards\machinery\telecomms.dm"
 #include "code\game\objects\items\weapons\circuitboards\machinery\unary_atmos.dm"
+#include "code\game\objects\items\weapons\grenades\anti_photon_grenade.dm"
 #include "code\game\objects\items\weapons\grenades\chem_grenade.dm"
 #include "code\game\objects\items\weapons\grenades\emgrenade.dm"
 #include "code\game\objects\items\weapons\grenades\flashbang.dm"
@@ -810,9 +810,18 @@
 #include "code\game\objects\structures\stool_bed_chair_nest\wheelchair.dm"
 #include "code\game\turfs\simulated.dm"
 #include "code\game\turfs\turf.dm"
+#include "code\game\turfs\turf_changing.dm"
 #include "code\game\turfs\turf_flick_animations.dm"
 #include "code\game\turfs\unsimulated.dm"
+#include "code\game\turfs\flooring\flooring.dm"
+#include "code\game\turfs\flooring\flooring_decals.dm"
+#include "code\game\turfs\flooring\flooring_premade.dm"
 #include "code\game\turfs\simulated\floor.dm"
+#include "code\game\turfs\simulated\floor_acts.dm"
+#include "code\game\turfs\simulated\floor_attackby.dm"
+#include "code\game\turfs\simulated\floor_damage.dm"
+#include "code\game\turfs\simulated\floor_icon.dm"
+#include "code\game\turfs\simulated\floor_static.dm"
 #include "code\game\turfs\simulated\floor_types.dm"
 #include "code\game\turfs\simulated\wall_attacks.dm"
 #include "code\game\turfs\simulated\wall_icon.dm"
@@ -840,6 +849,7 @@
 #include "code\modules\admin\create_turf.dm"
 #include "code\modules\admin\holder2.dm"
 #include "code\modules\admin\IsBanned.dm"
+#include "code\modules\admin\map_capture.dm"
 #include "code\modules\admin\NewBan.dm"
 #include "code\modules\admin\player_notes.dm"
 #include "code\modules\admin\player_panel.dm"
@@ -912,6 +922,7 @@
 #include "code\modules\client\preferences_savefile.dm"
 #include "code\modules\client\preferences_spawnpoints.dm"
 #include "code\modules\client\preferences_toggles.dm"
+#include "code\modules\client\ui_style.dm"
 #include "code\modules\clothing\chameleon.dm"
 #include "code\modules\clothing\clothing.dm"
 #include "code\modules\clothing\ears\skrell.dm"
@@ -1428,7 +1439,6 @@
 #include "code\modules\power\cable.dm"
 #include "code\modules\power\cable_heavyduty.dm"
 #include "code\modules\power\cell.dm"
-#include "code\modules\power\engine.dm"
 #include "code\modules\power\fractal_reactor.dm"
 #include "code\modules\power\generator.dm"
 #include "code\modules\power\generator_type2.dm"
@@ -12,14 +12,14 @@
 #define	PIPE_COLOR_CYAN		"#00ffff"
 #define	PIPE_COLOR_GREEN	"#00ff00"
 #define	PIPE_COLOR_YELLOW	"#ffcc00"
-#define	PIPE_COLOR_PURPLE	"#5c1ec0"
+#define	PIPE_COLOR_BLACK	"#444444"

 #define CONNECT_TYPE_REGULAR	1
 #define CONNECT_TYPE_SUPPLY		2
 #define CONNECT_TYPE_SCRUBBER	4
 #define CONNECT_TYPE_HE			8

-var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE)
+var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "black" = PIPE_COLOR_BLACK)

 /proc/pipe_color_lookup(var/color)
 	for(var/C in pipe_colors)
@@ -49,7 +49,7 @@ Pipelines + Other Objects -> Pipe network

 /obj/machinery/atmospherics/proc/add_underlay(var/turf/T, var/obj/machinery/atmospherics/node, var/direction, var/icon_connect_type)
 	if(node)
-		if(T.intact && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+		if(!T.is_plating() && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
 			//underlays += icon_manager.get_atmos_icon("underlay_down", direction, color_cache_name(node))
 			underlays += icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "down" + icon_connect_type)
 		else
@@ -8,8 +8,6 @@
 #define PRESSURE_CHECK_INPUT 2
 #define PRESSURE_CHECK_OUTPUT 4

-#undefine
-
 /obj/machinery/atmospherics/binary/dp_vent_pump
 	icon = 'icons/atmos/vent_pump.dmi'
 	icon_state = "map_dp_vent"
@@ -69,7 +67,7 @@
 	if(!istype(T))
 		return

-	if(T.intact && node1 && node2 && node1.level == 1 && node2.level == 1 && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe))
+	if(!T.is_plating() && node1 && node2 && node1.level == 1 && node2.level == 1 && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe))
 		vent_icon += "h"

 	if(!powered())
@@ -85,7 +83,7 @@
 		var/turf/T = get_turf(src)
 		if(!istype(T))
 			return
-		if(T.intact && node1 && node2 && node1.level == 1 && node2.level == 1 && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe))
+		if(!T.is_plating() && node1 && node2 && node1.level == 1 && node2.level == 1 && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe))
 			return
 		else
 			if (node1)
@@ -258,4 +256,14 @@

 	spawn(2)
 		broadcast_status()
-	update_icon()
+	update_icon()
+
+#undef DEFAULT_PRESSURE_DELTA
+
+#undef EXTERNAL_PRESSURE_BOUND
+#undef INTERNAL_PRESSURE_BOUND
+#undef PRESSURE_CHECKS
+
+#undef PRESSURE_CHECK_EXTERNAL
+#undef PRESSURE_CHECK_INPUT
+#undef PRESSURE_CHECK_OUTPUT
@@ -2,8 +2,6 @@
 #define REGULATE_INPUT	1	//shuts off when input side is below the target pressure
 #define REGULATE_OUTPUT	2	//shuts off when output side is above the target pressure

-#undefine
-
 /obj/machinery/atmospherics/binary/passive_gate
 	icon = 'icons/atmos/passive_gate.dmi'
 	icon_state = "map"
@@ -259,3 +257,7 @@
 			"You hear ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
 		qdel(src)
+
+#undef REGULATE_NONE
+#undef REGULATE_INPUT
+#undef REGULATE_OUTPUT
@@ -189,7 +189,7 @@
 		var/turf/T = get_turf(src)
 		if(!istype(T))
 			return
-		if(T.intact && istype(P.node, /obj/machinery/atmospherics/pipe) && P.node.level == 1 )
+		if(!T.is_plating() && istype(P.node, /obj/machinery/atmospherics/pipe) && P.node.level == 1 )
 			//pipe_state = icon_manager.get_atmos_icon("underlay_down", P.dir, color_cache_name(P.node))
 			pipe_state = icon_manager.get_atmos_icon("underlay", P.dir, color_cache_name(P.node), "down")
 		else
@@ -69,7 +69,7 @@
 		if (!istype(W, /obj/item/weapon/wrench))
 			return ..()
 		var/turf/T = src.loc
-		if (level==1 && isturf(T) && T.intact)
+		if (level==1 && isturf(T) && !T.is_plating())
 			user << "<span class='warning'>You must remove the plating first.</span>"
 			return 1
 		var/datum/gas_mixture/int_air = return_air()
@@ -7,8 +7,6 @@
 #define PRESSURE_CHECK_EXTERNAL 1
 #define PRESSURE_CHECK_INTERNAL 2

-#undefine
-
 /obj/machinery/atmospherics/unary/vent_pump
 	icon = 'icons/atmos/vent_pump.dmi'
 	icon_state = "map_vent"
@@ -118,7 +116,7 @@
 	if(!istype(T))
 		return

-	if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+	if(!T.is_plating() && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
 		vent_icon += "h"

 	if(welded)
@@ -136,7 +134,7 @@
 		var/turf/T = get_turf(src)
 		if(!istype(T))
 			return
-		if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+		if(!T.is_plating() && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
 			return
 		else
 			if(node)
@@ -399,7 +397,7 @@
 		user << "<span class='warning'>You cannot unwrench \the [src], turn it off first.</span>"
 		return 1
 	var/turf/T = src.loc
-	if (node && node.level==1 && isturf(T) && T.intact)
+	if (node && node.level==1 && isturf(T) && !T.is_plating())
 		user << "<span class='warning'>You must remove the plating first.</span>"
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
@@ -424,3 +422,12 @@
 		initial_loc.air_vent_names -= id_tag
 	..()
 	return
+
+#undef DEFAULT_PRESSURE_DELTA
+
+#undef EXTERNAL_PRESSURE_BOUND
+#undef INTERNAL_PRESSURE_BOUND
+#undef PRESSURE_CHECKS
+
+#undef PRESSURE_CHECK_EXTERNAL
+#undef PRESSURE_CHECK_INTERNAL
@@ -72,7 +72,7 @@
 		var/turf/T = get_turf(src)
 		if(!istype(T))
 			return
-		if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+		if(!T.is_plating() && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
 			return
 		else
 			if(node)
@@ -261,7 +261,7 @@
 		user << "<span class='warning'>You cannot unwrench \the [src], turn it off first.</span>"
 		return 1
 	var/turf/T = src.loc
-	if (node && node.level==1 && isturf(T) && T.intact)
+	if (node && node.level==1 && isturf(T) && !T.is_plating())
 		user << "<span class='warning'>You must remove the plating first.</span>"
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
@@ -181,7 +181,7 @@ obj/machinery/atmospherics/mains_pipe/simple
 		..() // initialize internal pipes

 		var/turf/T = src.loc			// hide if turf is not intact
-		hide(T.intact)
+		if(level == 1 && !T.is_plating()) hide(1)
 		update_icon()

 	hidden
@@ -243,7 +243,7 @@ obj/machinery/atmospherics/mains_pipe/manifold
 		..() // initialize internal pipes

 		var/turf/T = src.loc			// hide if turf is not intact
-		hide(T.intact)
+		if(level == 1 && !T.is_plating()) hide(1)
 		update_icon()

 	update_icon()
@@ -293,7 +293,7 @@ obj/machinery/atmospherics/mains_pipe/manifold4w
 		..() // initialize internal pipes

 		var/turf/T = src.loc			// hide if turf is not intact
-		hide(T.intact)
+		if(level == 1 && !T.is_plating()) hide(1)
 		update_icon()

 	update_icon()
@@ -354,7 +354,7 @@ obj/machinery/atmospherics/mains_pipe/split
 					N1.merge(N2)

 		var/turf/T = src.loc			// hide if turf is not intact
-		hide(T.intact)
+		if(level == 1 && !T.is_plating()) hide(1)
 		update_icon()

 	update_icon()
@@ -475,7 +475,7 @@ obj/machinery/atmospherics/mains_pipe/split3
 					N1.merge(N2)

 		var/turf/T = src.loc			// hide if turf is not intact
-		hide(T.intact)
+		if(level == 1 && !T.is_plating()) hide(1)
 		update_icon()

 	update_icon()
@@ -525,7 +525,7 @@ obj/machinery/atmospherics/mains_pipe/cap
 		..()

 		var/turf/T = src.loc	// hide if turf is not intact
-		hide(T.intact)
+		if(level == 1 && !T.is_plating()) hide(1)
 		update_icon()

 	hidden
@@ -1,8 +1,7 @@
 /obj/machinery/atmospherics/pipe

-	var/datum/gas_mixture/air_temporary //used when reconstructing a pipeline that broke
+	var/datum/gas_mixture/air_temporary // used when reconstructing a pipeline that broke
 	var/datum/pipeline/parent
-
 	var/volume = 0
 	force = 20

@@ -20,10 +19,12 @@
 	return -1

 /obj/machinery/atmospherics/pipe/New()
-	..()
-	//so pipes under walls are hidden
 	if(istype(get_turf(src), /turf/simulated/wall) || istype(get_turf(src), /turf/simulated/shuttle/wall) || istype(get_turf(src), /turf/unsimulated/wall))
 		level = 1
+	..()
+
+/obj/machinery/atmospherics/pipe/hides_under_flooring()
+	return level != 2

 /obj/machinery/atmospherics/pipe/proc/pipeline_expansion()
 	return null
@@ -81,7 +82,7 @@
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	var/turf/T = src.loc
-	if (level==1 && isturf(T) && T.intact)
+	if (level==1 && isturf(T) && !T.is_plating())
 		user << "<span class='warning'>You must remove the plating first.</span>"
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
@@ -188,7 +189,7 @@
 			initialize_directions = SOUTH|WEST

 /obj/machinery/atmospherics/pipe/simple/hide(var/i)
-	if(level == 1 && istype(loc, /turf/simulated))
+	if(istype(loc, /turf/simulated))
 		invisibility = i ? 101 : 0
 	update_icon()

@@ -297,9 +298,8 @@
 		qdel(src)
 		return

-	var/turf/T = get_turf(src)
-	if(istype(T))
-		hide(T.intact)
+	var/turf/T = loc
+	if(level == 1 && !T.is_plating()) hide(1)
 	update_icon()

 /obj/machinery/atmospherics/pipe/simple/disconnect(obj/machinery/atmospherics/reference)
@@ -348,8 +348,8 @@
 /obj/machinery/atmospherics/pipe/simple/visible/green
 	color = PIPE_COLOR_GREEN

-/obj/machinery/atmospherics/pipe/simple/visible/purple
-	color = PIPE_COLOR_PURPLE
+/obj/machinery/atmospherics/pipe/simple/visible/black
+	color = PIPE_COLOR_BLACK

 /obj/machinery/atmospherics/pipe/simple/visible/red
 	color = PIPE_COLOR_RED
@@ -390,8 +390,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/green
 	color = PIPE_COLOR_GREEN

-/obj/machinery/atmospherics/pipe/simple/hidden/purple
-	color = PIPE_COLOR_PURPLE
+/obj/machinery/atmospherics/pipe/simple/hidden/black
+	color = PIPE_COLOR_BLACK

 /obj/machinery/atmospherics/pipe/simple/hidden/red
 	color = PIPE_COLOR_RED
@@ -446,7 +446,7 @@
 			initialize_directions = NORTH|EAST|SOUTH

 /obj/machinery/atmospherics/pipe/manifold/hide(var/i)
-	if(level == 1 && istype(loc, /turf/simulated))
+	if(istype(loc, /turf/simulated))
 		invisibility = i ? 101 : 0
 	update_icon()

@@ -582,8 +582,7 @@
 		return

 	var/turf/T = get_turf(src)
-	if(istype(T))
-		hide(T.intact)
+	if(level == 1 && !T.is_plating()) hide(1)
 	update_icon()

 /obj/machinery/atmospherics/pipe/manifold/visible
@@ -617,8 +616,8 @@
 /obj/machinery/atmospherics/pipe/manifold/visible/green
 	color = PIPE_COLOR_GREEN

-/obj/machinery/atmospherics/pipe/manifold/visible/purple
-	color = PIPE_COLOR_PURPLE
+/obj/machinery/atmospherics/pipe/manifold/visible/black
+	color = PIPE_COLOR_BLACK

 /obj/machinery/atmospherics/pipe/manifold/visible/red
 	color = PIPE_COLOR_RED
@@ -659,8 +658,8 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/green
 	color = PIPE_COLOR_GREEN

-/obj/machinery/atmospherics/pipe/manifold/hidden/purple
-	color = PIPE_COLOR_PURPLE
+/obj/machinery/atmospherics/pipe/manifold/hidden/black
+	color = PIPE_COLOR_BLACK

 /obj/machinery/atmospherics/pipe/manifold/hidden/red
 	color = PIPE_COLOR_RED
@@ -806,7 +805,7 @@
 	update_icon()

 /obj/machinery/atmospherics/pipe/manifold4w/hide(var/i)
-	if(level == 1 && istype(loc, /turf/simulated))
+	if(istype(loc, /turf/simulated))
 		invisibility = i ? 101 : 0
 	update_icon()

@@ -841,8 +840,7 @@
 		return

 	var/turf/T = get_turf(src)
-	if(istype(T))
-		hide(T.intact)
+	if(level == 1 && !T.is_plating()) hide(1)
 	update_icon()

 /obj/machinery/atmospherics/pipe/manifold4w/visible
@@ -876,8 +874,8 @@
 /obj/machinery/atmospherics/pipe/manifold4w/visible/green
 	color = PIPE_COLOR_GREEN

-/obj/machinery/atmospherics/pipe/manifold4w/visible/purple
-	color = PIPE_COLOR_PURPLE
+/obj/machinery/atmospherics/pipe/manifold4w/visible/black
+	color = PIPE_COLOR_BLACK

 /obj/machinery/atmospherics/pipe/manifold4w/visible/red
 	color = PIPE_COLOR_RED
@@ -917,8 +915,8 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/green
 	color = PIPE_COLOR_GREEN

-/obj/machinery/atmospherics/pipe/manifold4w/hidden/purple
-	color = PIPE_COLOR_PURPLE
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/black
+	color = PIPE_COLOR_BLACK

 /obj/machinery/atmospherics/pipe/manifold4w/hidden/red
 	color = PIPE_COLOR_RED
@@ -946,7 +944,7 @@
 	initialize_directions = dir

 /obj/machinery/atmospherics/pipe/cap/hide(var/i)
-	if(level == 1 && istype(loc, /turf/simulated))
+	if(istype(loc, /turf/simulated))
 		invisibility = i ? 101 : 0
 	update_icon()

@@ -997,7 +995,7 @@
 				break

 	var/turf/T = src.loc			// hide if turf is not intact
-	hide(T.intact)
+	if(level == 1 && !T.is_plating()) hide(1)
 	update_icon()

 /obj/machinery/atmospherics/pipe/cap/visible
@@ -1386,7 +1384,7 @@

 /obj/machinery/atmospherics/proc/add_underlay_adapter(var/turf/T, var/obj/machinery/atmospherics/node, var/direction, var/icon_connect_type) //modified from add_underlay, does not make exposed underlays
 	if(node)
-		if(T.intact && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
+		if(!T.is_plating() && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
 			underlays += icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "down" + icon_connect_type)
 		else
 			underlays += icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type)
@@ -46,8 +46,8 @@ obj/machinery/atmospherics/pipe/zpipe/New()
 		if(SOUTHWEST)
 			initialize_directions = SOUTH

-obj/machinery/atmospherics/pipe/zpipe/hide(var/i)
-	if(level == 1 && istype(loc, /turf/simulated))
+/obj/machinery/atmospherics/pipe/zpipe/hide(var/i)
+	if(istype(loc, /turf/simulated))
 		invisibility = i ? 101 : 0
 	update_icon()

@@ -149,7 +149,7 @@ obj/machinery/atmospherics/pipe/zpipe/up/initialize()


 	var/turf/T = src.loc			// hide if turf is not intact
-	hide(T.intact)
+	hide(!T.is_plating())

 ///////////////////////
 // and the down pipe //
@@ -190,7 +190,7 @@ obj/machinery/atmospherics/pipe/zpipe/down/initialize()


 	var/turf/T = src.loc			// hide if turf is not intact
-	hide(T.intact)
+	hide(!T.is_plating())

 ///////////////////////
 // supply/scrubbers  //
@@ -1,6 +1,5 @@
 /turf/simulated/floor/open
 	name = "open space"
-	intact = 0
 	density = 0
 	icon_state = "black"
 	pathweight = 100000 //Seriously, don't try and path over this one numbnuts
@@ -81,8 +80,7 @@
 // override to make sure nothing is hidden
 /turf/simulated/floor/open/levelupdate()
 	for(var/obj/O in src)
-		if(O.level == 1)
-			O.hide(0)
+		O.hide(0)

 //overwrite the attackby of space to transform it to openspace if necessary
 /turf/space/attackby(obj/item/C as obj, mob/user as mob)
@@ -114,16 +112,16 @@
 			ReplaceWithLattice()
 		return

-	if (istype(C, /obj/item/stack/tile/steel))
+	if (istype(C, /obj/item/stack/tile/floor))
 		var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
 		if(L)
-			var/obj/item/stack/tile/steel/S = C
+			var/obj/item/stack/tile/floor/S = C
 			if (S.get_amount() < 1)
 				return
 			qdel(L)
 			playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1)
-			S.build(src)
 			S.use(1)
+			ChangeTurf(/turf/simulated/floor/airless)
 			return
 		else
 			user << "<span class='warning'>The plating is going to need some support.</span>"
@@ -19,12 +19,12 @@ mob/proc/airflow_stun()
 mob/living/silicon/airflow_stun()
 	return

-mob/living/carbon/metroid/airflow_stun()
+mob/living/carbon/slime/airflow_stun()
 	return

 mob/living/carbon/human/airflow_stun()
 	if(shoes)
-		if(shoes.flags & NOSLIP) return 0
+		if(shoes.item_flags & NOSLIP) return 0
 	..()

 atom/movable/proc/check_airflow_movable(n)
@@ -62,6 +62,19 @@ obj/item/check_airflow_movable(n)
 /atom/movable/var/tmp/airflow_time = 0
 /atom/movable/var/tmp/last_airflow = 0

+/atom/movable/proc/AirflowCanMove(n)
+	return 1
+
+/mob/AirflowCanMove(n)
+	if(status_flags & GODMODE)
+		return 0
+	if(buckled)
+		return 0
+	var/obj/item/shoes = get_equipped_item(slot_shoes)
+	if(istype(shoes) && (shoes.item_flags & NOSLIP))
+		return 0
+	return 1
+
 /atom/movable/proc/GotoAirflowDest(n)
 	if(!airflow_dest) return
 	if(airflow_speed < 0) return
@@ -69,18 +82,13 @@ obj/item/check_airflow_movable(n)
 	if(airflow_speed)
 		airflow_speed = n/max(get_dist(src,airflow_dest),1)
 		return
-	last_airflow = world.time
 	if(airflow_dest == loc)
 		step_away(src,loc)
+	if(!src.AirflowCanMove(n))
+		return
 	if(ismob(src))
-		if(src:status_flags & GODMODE)
-			return
-		if(istype(src, /mob/living/carbon/human))
-			if(src:buckled)
-				return
-			if(src:shoes && src:shoes.flags & NOSLIP)
-				return
 		src << "<span class='danger'>You are sucked away by airflow!</span>"
+	last_airflow = world.time
 	var/airflow_falloff = 9 - sqrt((x - airflow_dest.x) ** 2 + (y - airflow_dest.y) ** 2)
 	if(airflow_falloff < 1)
 		airflow_dest = null
@@ -116,8 +124,9 @@ obj/item/check_airflow_movable(n)
 		if(!istype(loc, /turf))
 			break
 		step_towards(src, src.airflow_dest)
-		if(ismob(src) && src:client)
-			src:client:move_delay = world.time + vsc.airflow_mob_slowdown
+		var/mob/M = src
+		if(istype(M) && M.client)
+			M.client.move_delay = world.time + vsc.airflow_mob_slowdown
 	airflow_dest = null
 	airflow_speed = 0
 	airflow_time = 0
@@ -134,18 +143,11 @@ obj/item/check_airflow_movable(n)
 		return
 	if(airflow_dest == loc)
 		step_away(src,loc)
+	if(!src.AirflowCanMove(n))
+		return
 	if(ismob(src))
-		if(src:status_flags & GODMODE)
-			return
-		if(istype(src, /mob/living/carbon/human))
-			if(src:buckled)
-				return
-			if(src:shoes)
-				if(istype(src:shoes, /obj/item/clothing/shoes/magboots))
-					if(src:shoes.flags & NOSLIP)
-						return
 		src << "<span clas='danger'>You are pushed away by airflow!</span>"
-		last_airflow = world.time
+	last_airflow = world.time
 	var/airflow_falloff = 9 - sqrt((x - airflow_dest.x) ** 2 + (y - airflow_dest.y) ** 2)
 	if(airflow_falloff < 1)
 		airflow_dest = null
@@ -242,6 +244,6 @@ zone/proc/movables()
 	. = list()
 	for(var/turf/T in contents)
 		for(var/atom/movable/A in T)
-			if(!A.simulated || A.anchored || istype(A, /obj/effect) || istype(A, /mob/aiEye))
+			if(!A.simulated || A.anchored || istype(A, /obj/effect) || istype(A, /mob/eye))
 				continue
 			. += A
@@ -97,14 +97,14 @@ obj/var/contaminated = 0
 			if(!wear_mask)
 				burn_eyes()
 			else
-				if(!(wear_mask.flags & MASKCOVERSEYES))
+				if(!(wear_mask.body_parts_covered & EYES))
 					burn_eyes()
 		else
-			if(!(head.flags & HEADCOVERSEYES))
+			if(!(head.body_parts_covered & EYES))
 				if(!wear_mask)
 					burn_eyes()
 				else
-					if(!(wear_mask.flags & MASKCOVERSEYES))
+					if(!(wear_mask.body_parts_covered & EYES))
 						burn_eyes()

 	//Genetic Corruption
@@ -135,19 +135,24 @@ obj/var/contaminated = 0
 		if(vsc.plc.PHORONGUARD_ONLY)
 			if(head.flags & PHORONGUARD)
 				return 1
-		else if(head.flags & HEADCOVERSEYES)
+		else if(head.body_parts_covered & EYES)
 			return 1
 	return 0

 /mob/living/carbon/human/proc/pl_suit_protected()
 	//Checks if the suit is adequately sealed.
-	if(wear_suit)
-		if(vsc.plc.PHORONGUARD_ONLY)
-			if(wear_suit.flags & PHORONGUARD) return 1
-		else
-			if(wear_suit.flags_inv & HIDEJUMPSUIT) return 1
-		//should check HIDETAIL as well, but for the moment tails are not a part that can be damaged separately
-	return 0
+	var/coverage = 0
+	for(var/obj/item/protection in list(wear_suit, gloves, shoes))
+		if(!protection) 
+			continue
+		if(vsc.plc.PHORONGUARD_ONLY && !(protection.flags & PHORONGUARD))
+			return 0
+		coverage |= protection.body_parts_covered
+	
+	if(vsc.plc.PHORONGUARD_ONLY)
+		return 1
+	
+	return BIT_TEST_ALL(coverage, UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS)

 /mob/living/carbon/human/proc/suit_contamination()
 	//Runs over the things that can be contaminated and does so.
@@ -1,12 +1,12 @@
 // A set of constants used to determine which type of mute an admin wishes to apply.
 // Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO, etc. = (MUTE_IC << 1)
 // Therefore there needs to be a gap between the flags for the automute flags.
-#define MUTE_IC        1
-#define MUTE_OOC       2
-#define MUTE_PRAY      4
-#define MUTE_ADMINHELP 8
-#define MUTE_DEADCHAT  16
-#define MUTE_ALL       31
+#define MUTE_IC        0x1
+#define MUTE_OOC       0x2
+#define MUTE_PRAY      0x4
+#define MUTE_ADMINHELP 0x8
+#define MUTE_DEADCHAT  0x10
+#define MUTE_ALL       0xFFFF

 // Number of identical messages required to get the spam-prevention auto-mute thing to trigger warnings and automutes.
 #define SPAM_TRIGGER_WARNING  5
@@ -21,22 +21,22 @@

 #define ROUNDSTART_LOGOUT_REPORT_TIME 6000 // Amount of time (in deciseconds) after the rounds starts, that the player disconnect report is issued.

-// Admin permissions. Please don't edit these values without speaking to Errorage first. ~Carn
-#define R_BUILDMODE     1
-#define R_ADMIN         2
-#define R_BAN           4
-#define R_FUN           8
-#define R_SERVER        16
-#define R_DEBUG         32
-#define R_POSSESS       64
-#define R_PERMISSIONS   128
-#define R_STEALTH       256
-#define R_REJUVINATE    512
-#define R_VAREDIT       1024
-#define R_SOUNDS        2048
-#define R_SPAWN         4096
-#define R_MOD           8192
-#define R_MENTOR        16384
-#define R_HOST          32768
+// Admin permissions.
+#define R_BUILDMODE     0x1
+#define R_ADMIN         0x2
+#define R_BAN           0x4
+#define R_FUN           0x8
+#define R_SERVER        0x10
+#define R_DEBUG         0x20
+#define R_POSSESS       0x40
+#define R_PERMISSIONS   0x80
+#define R_STEALTH       0x100
+#define R_REJUVINATE    0x200
+#define R_VAREDIT       0x400
+#define R_SOUNDS        0x800
+#define R_SPAWN         0x1000
+#define R_MOD           0x2000
+#define R_MENTOR        0x4000
+#define R_HOST          0x8000 //higher than this will overflow

-#define R_MAXPERMISSION 32768 // This holds the maximum value for a permission. It is used in iteration, so keep it updated.
+#define R_MAXPERMISSION 0x8000 // This holds the maximum value for a permission. It is used in iteration, so keep it updated.
@@ -8,6 +8,8 @@
 #define MOLES_PHORON_VISIBLE 0.7 // Moles in a standard cell after which phoron is visible.
 #define MOLES_O2STANDARD     (MOLES_CELLSTANDARD * O2STANDARD) // O2 standard value (21%)
 #define MOLES_N2STANDARD     (MOLES_CELLSTANDARD * N2STANDARD) // N2 standard value (79%)
+#define MOLES_O2ATMOS (MOLES_O2STANDARD*50)
+#define MOLES_N2ATMOS (MOLES_N2STANDARD*50)

 // These are for when a mob breathes poisonous air.
 #define MIN_TOXIN_DAMAGE 1
@@ -83,4 +85,4 @@

 //Flags for zone sleeping
 #define ZONE_ACTIVE   1
-#define ZONE_SLEEPING 0
+#define ZONE_SLEEPING 0
@@ -21,10 +21,10 @@
 #define DROWSY    "drowsy"

 // I hate adding defines like this but I'd much rather deal with bitflags than lists and string searches.
-#define BRUTELOSS 1
-#define FIRELOSS  2
-#define TOXLOSS   4
-#define OXYLOSS   8
+#define BRUTELOSS 0x1
+#define FIRELOSS  0x2
+#define TOXLOSS   0x4
+#define OXYLOSS   0x8

 #define FIRE_DAMAGE_MODIFIER 0.0215 // Higher values result in more external fire damage to the skin. (default 0.0215)
 #define  AIR_DAMAGE_MODIFIER 2.025  // More means less damage from hot air scalding lungs, less = more damage. (default 2.025)
@@ -53,4 +53,4 @@

 #define INFECTION_LEVEL_ONE   100
 #define INFECTION_LEVEL_TWO   500
-#define INFECTION_LEVEL_THREE 1000
+#define INFECTION_LEVEL_THREE 1000
@@ -31,16 +31,16 @@
 #define mSmallsize     110 // Table climbing.

 // disabilities
-#define NEARSIGHTED 1
-#define EPILEPSY    2
-#define COUGHING    4
-#define TOURETTES   8
-#define NERVOUS     16
+#define NEARSIGHTED 0x1
+#define EPILEPSY    0x2
+#define COUGHING    0x4
+#define TOURETTES   0x8
+#define NERVOUS     0x10

 // sdisabilities
-#define BLIND 1
-#define MUTE  2
-#define DEAF  4
+#define BLIND 0x1
+#define MUTE  0x2
+#define DEAF  0x4

 // The way blocks are handled badly needs a rewrite, this is horrible.
 // Too much of a project to handle at the moment, TODO for later.
@@ -9,21 +9,21 @@
 #define SEC_LEVEL_RED   2
 #define SEC_LEVEL_DELTA 3

-#define BE_TRAITOR    1
-#define BE_OPERATIVE  2
-#define BE_CHANGELING 4
-#define BE_WIZARD     8
-#define BE_MALF       16
-#define BE_REV        32
-#define BE_ALIEN      64
-#define BE_AI         128
-#define BE_CULTIST    256
-#define BE_MONKEY     512
-#define BE_NINJA      1024
-#define BE_RAIDER     2048
-#define BE_PLANT      4096
-#define BE_MUTINEER   8192
-#define BE_PAI        16384
+#define BE_TRAITOR    0x1
+#define BE_OPERATIVE  0x2
+#define BE_CHANGELING 0x4
+#define BE_WIZARD     0x8
+#define BE_MALF       0x10
+#define BE_REV        0x20
+#define BE_ALIEN      0x40
+#define BE_AI         0x80
+#define BE_CULTIST    0x100
+#define BE_MONKEY     0x200
+#define BE_NINJA      0x400
+#define BE_RAIDER     0x800
+#define BE_PLANT      0x1000
+#define BE_MUTINEER   0x2000
+#define BE_PAI        0x4000

 var/list/be_special_flags = list(
 	"Traitor"          = BE_TRAITOR,
@@ -47,17 +47,17 @@ var/list/be_special_flags = list(


 // Antagonist datum flags.
-#define ANTAG_OVERRIDE_JOB        1 // Assigned job is set to MODE when spawning.
-#define ANTAG_OVERRIDE_MOB        2 // Mob is recreated from datum mob_type var when spawning.
-#define ANTAG_CLEAR_EQUIPMENT     4 // All preexisting equipment is purged.
-#define ANTAG_CHOOSE_NAME         8 // Antagonists are prompted to enter a name.
-#define ANTAG_IMPLANT_IMMUNE     16 // Cannot be loyalty implanted.
-#define ANTAG_SUSPICIOUS         32 // Shows up on roundstart report.
-#define ANTAG_HAS_LEADER         64 // Generates a leader antagonist.
-#define ANTAG_HAS_NUKE          128 // Will spawn a nuke at supplied location.
-#define ANTAG_RANDSPAWN         256 // Potentially randomly spawns due to events.
-#define ANTAG_VOTABLE           512 // Can be voted as an additional antagonist before roundstart.
-#define ANTAG_SET_APPEARANCE   1024 // Causes antagonists to use an appearance modifier on spawn.
+#define ANTAG_OVERRIDE_JOB        0x1 // Assigned job is set to MODE when spawning.
+#define ANTAG_OVERRIDE_MOB        0x2 // Mob is recreated from datum mob_type var when spawning.
+#define ANTAG_CLEAR_EQUIPMENT     0x4 // All preexisting equipment is purged.
+#define ANTAG_CHOOSE_NAME         0x8 // Antagonists are prompted to enter a name.
+#define ANTAG_IMPLANT_IMMUNE     0x10 // Cannot be loyalty implanted.
+#define ANTAG_SUSPICIOUS         0x20 // Shows up on roundstart report.
+#define ANTAG_HAS_LEADER         0x40 // Generates a leader antagonist.
+#define ANTAG_HAS_NUKE           0x80 // Will spawn a nuke at supplied location.
+#define ANTAG_RANDSPAWN         0x100 // Potentially randomly spawns due to events.
+#define ANTAG_VOTABLE           0x200 // Can be voted as an additional antagonist before roundstart.
+#define ANTAG_SET_APPEARANCE    0x400 // Causes antagonists to use an appearance modifier on spawn.

 // Mode/antag template macros.
 #define MODE_BORER "borer"
@@ -87,22 +87,22 @@ var/list/be_special_flags = list(
 /////////////////

 /*		WIZARD SPELL FLAGS		*/
-#define GHOSTCAST		1	//can a ghost cast it?
-#define NEEDSCLOTHES	2	//does it need the wizard garb to cast? Nonwizard spells should not have this
-#define NEEDSHUMAN		4	//does it require the caster to be human?
-#define Z2NOCAST		8	//if this is added, the spell can't be cast at centcomm
-#define STATALLOWED		16	//if set, the user doesn't have to be conscious to cast. Required for ghost spells
-#define IGNOREPREV		32	//if set, each new target does not overlap with the previous one
+#define GHOSTCAST		0x1		//can a ghost cast it?
+#define NEEDSCLOTHES	0x2		//does it need the wizard garb to cast? Nonwizard spells should not have this
+#define NEEDSHUMAN		0x4		//does it require the caster to be human?
+#define Z2NOCAST		0x8		//if this is added, the spell can't be cast at centcomm
+#define STATALLOWED		0x10	//if set, the user doesn't have to be conscious to cast. Required for ghost spells
+#define IGNOREPREV		0x20	//if set, each new target does not overlap with the previous one
 //The following flags only affect different types of spell, and therefore overlap
 //Targeted spells
-#define INCLUDEUSER		64	//does the spell include the caster in its target selection?
-#define SELECTABLE		128	//can you select each target for the spell?
+#define INCLUDEUSER		0x40	//does the spell include the caster in its target selection?
+#define SELECTABLE		0x80	//can you select each target for the spell?
 //AOE spells
-#define IGNOREDENSE		64	//are dense turfs ignored in selection?
-#define IGNORESPACE		128	//are space turfs ignored in selection?
+#define IGNOREDENSE		0x40	//are dense turfs ignored in selection?
+#define IGNORESPACE		0x80	//are space turfs ignored in selection?
 //End split flags
-#define CONSTRUCT_CHECK	256	//used by construct spells - checks for nullrods
-#define NO_BUTTON		512	//spell won't show up in the HUD with this
+#define CONSTRUCT_CHECK	0x100	//used by construct spells - checks for nullrods
+#define NO_BUTTON		0x200	//spell won't show up in the HUD with this

 //invocation
 #define SpI_SHOUT	"shout"
@@ -5,71 +5,65 @@
 #define CANDLE_LUM 3 // For how bright candles are.

 // Item inventory slot bitmasks.
-#define SLOT_OCLOTHING  1
-#define SLOT_ICLOTHING  2
-#define SLOT_GLOVES     4
-#define SLOT_EYES       8
-#define SLOT_EARS       16
-#define SLOT_MASK       32
-#define SLOT_HEAD       64
-#define SLOT_FEET       128
-#define SLOT_ID         256
-#define SLOT_BELT       512
-#define SLOT_BACK       1024
-#define SLOT_POCKET     2048  // This is to allow items with a w_class of 3 or 4 to fit in pockets.
-#define SLOT_DENYPOCKET 4096  // This is to  deny items with a w_class of 2 or 1 from fitting in pockets.
-#define SLOT_TWOEARS    8192
-#define SLOT_TIE        16384
-#define SLOT_HOLSTER	32768 //16th bit
+#define SLOT_OCLOTHING  0x1
+#define SLOT_ICLOTHING  0x2
+#define SLOT_GLOVES     0x4
+#define SLOT_EYES       0x8
+#define SLOT_EARS       0x10
+#define SLOT_MASK       0x20
+#define SLOT_HEAD       0x40
+#define SLOT_FEET       0x80
+#define SLOT_ID         0x100
+#define SLOT_BELT       0x200
+#define SLOT_BACK       0x400
+#define SLOT_POCKET     0x800  // This is to allow items with a w_class of 3 or 4 to fit in pockets.
+#define SLOT_DENYPOCKET 0x1000  // This is to  deny items with a w_class of 2 or 1 from fitting in pockets.
+#define SLOT_TWOEARS    0x2000
+#define SLOT_TIE        0x4000
+#define SLOT_HOLSTER	0x8000 //16th bit - higher than this will overflow

 // Flags bitmasks.
-#define STOPPRESSUREDAMAGE 1 // This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_BACK) if you see it anywhere
-                             // To successfully stop you taking all pressure damage you must have both a suit and head item with this flag.
-#define NOBLUDGEON         2    // When an item has this it produces no "X has been hit by Y with Z" message with the default handler.
-#define AIRTIGHT           4    // Functions with internals.
-#define USEDELAY           8    // 1 second extra delay on use. (Can be used once every 2s)
-#define NOSHIELD           16   // Weapon not affected by shield.
-#define CONDUCT            32   // Conducts electricity. (metal etc.)
-#define ON_BORDER          64   // Item has priority to check when entering or leaving.
-#define NOBLOODY           512  // Used for items if they don't want to get a blood overlay.
-#define NODELAY            8192 // 1 second attack-by delay skipped (Can be used once every 0.2s). Most objects have a 1s attack-by delay, which doesn't require a flag.
+#define NOBLUDGEON         0x1    // When an item has this it produces no "X has been hit by Y with Z" message with the default handler.
+#define USEDELAY           0x2    // 1 second extra delay on use. (Can be used once every 2s)
+#define CONDUCT            0x4   // Conducts electricity. (metal etc.)
+#define ON_BORDER          0x8   // Item has priority to check when entering or leaving.
+#define NOBLOODY           0x10   // Used for items if they don't want to get a blood overlay.
+#define NODELAY            0x20   // 1 second attack-by delay skipped (Can be used once every 0.2s). Most objects have a 1s attack-by delay, which doesn't require a flag.
+#define OPENCONTAINER      0x40 // Is an open container for chemistry purposes.
+#define PHORONGUARD        0x80 // Does not get contaminated by phoron.
+#define	NOREACT            0x100 // Reagents don't react inside this container.
+#define PROXMOVE           0x200  // Does this object require proximity checking in Enter()?

-//Use these flags to indicate if an item obscures the specified slots from view, whereas body_parts_covered seems to be used to indicate what body parts the item protects.
-#define GLASSESCOVERSEYES 256
-#define    MASKCOVERSEYES 256 // Get rid of some of the other retardation in these flags.
-#define    HEADCOVERSEYES 256 // Feel free to reallocate these numbers for other purposes.
-#define   MASKCOVERSMOUTH 512 // On other items, these are just for mask/head.
-#define   HEADCOVERSMOUTH 512
-
-#define THICKMATERIAL          256  // From /tg/station: prevents syringes, parapens and hyposprays if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. (NOTE: flag shared with NOSLIP for shoes)
-#define NOSLIP                 256  // Prevents from slipping on wet floors, in space, etc.
-#define OPENCONTAINER          1024 // Is an open container for chemistry purposes.
-#define BLOCK_GAS_SMOKE_EFFECT 2048 // Blocks the effect that chemical clouds would have on a mob -- glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL)
-#define ONESIZEFITSALL         2048
-#define PHORONGUARD            4096 // Does not get contaminated by phoron.
-#define	NOREACT                4096 // Reagents don't react inside this container.
-#define BLOCKHEADHAIR          4    // Temporarily removes the user's hair overlay. Leaves facial hair.
-#define BLOCKHAIR              8192 // Temporarily removes the user's hair, facial and otherwise.
+//Flags for items (equipment)
+#define THICKMATERIAL          0x1  // Prevents syringes, parapens and hyposprays if equiped to slot_suit or slot_head.
+#define STOPPRESSUREDAMAGE     0x2  // Counts towards pressure protection. Note that like temperature protection, body_parts_covered is considered here as well.
+#define AIRTIGHT               0x4  // Functions with internals.
+#define NOSLIP                 0x8  // Prevents from slipping on wet floors, in space, etc.
+#define BLOCK_GAS_SMOKE_EFFECT 0x10 // Blocks the effect that chemical clouds would have on a mob -- glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL)
+#define FLEXIBLEMATERIAL       0x20 // At the moment, masks with this flag will not prevent eating even if they are covering your face.

 // Flags for pass_flags.
-#define PASSTABLE  1
-#define PASSGLASS  2
-#define PASSGRILLE 4
-#define PASSBLOB   8
+#define PASSTABLE  0x1
+#define PASSGLASS  0x2
+#define PASSGRILLE 0x4
+#define PASSBLOB   0x8

 // Bitmasks for the flags_inv variable. These determine when a piece of clothing hides another, i.e. a helmet hiding glasses.
 // WARNING: The following flags apply only to the external suit!
-#define HIDEGLOVES      1
-#define HIDESUITSTORAGE 2
-#define HIDEJUMPSUIT    4
-#define HIDESHOES       8
-#define HIDETAIL        16
+#define HIDEGLOVES      0x1
+#define HIDESUITSTORAGE 0x2
+#define HIDEJUMPSUIT    0x4
+#define HIDESHOES       0x8
+#define HIDETAIL        0x10

 // WARNING: The following flags apply only to the helmets and masks!
-#define HIDEMASK 1
-#define HIDEEARS 2 // Headsets and such.
-#define HIDEEYES 4 // Glasses.
-#define HIDEFACE 8 // Dictates whether we appear as "Unknown".
+#define HIDEMASK 0x1
+#define HIDEEARS 0x2 // Headsets and such.
+#define HIDEEYES 0x4 // Glasses.
+#define HIDEFACE 0x8 // Dictates whether we appear as "Unknown".
+
+#define BLOCKHEADHAIR   0x20    // Hides the user's hair overlay. Leaves facial hair.
+#define BLOCKHAIR       0x40    // Hides the user's hair, facial and otherwise.

 // Slots.
 #define slot_back        1
@@ -106,24 +100,24 @@
 #define slot_wear_suit_str	"slot_suit"

 // Bitflags for clothing parts.
-#define HEAD        1
-#define FACE        2
-#define EYES        4
-#define UPPER_TORSO 8
-#define LOWER_TORSO 16
-#define LEG_LEFT    32
-#define LEG_RIGHT   64
-#define LEGS        96   //  LEG_LEFT | LEG_RIGHT
-#define FOOT_LEFT   128
-#define FOOT_RIGHT  256
-#define FEET        384  // FOOT_LEFT | FOOT_RIGHT
-#define ARM_LEFT    512
-#define ARM_RIGHT   1024
-#define ARMS        1536 //  ARM_LEFT | ARM_RIGHT
-#define HAND_LEFT   2048
-#define HAND_RIGHT  4096
-#define HANDS       6144 // HAND_LEFT | HAND_RIGHT
-#define FULL_BODY   8191
+#define HEAD        0x1
+#define FACE        0x2
+#define EYES        0x4
+#define UPPER_TORSO 0x8
+#define LOWER_TORSO 0x10
+#define LEG_LEFT    0x20
+#define LEG_RIGHT   0x40
+#define LEGS        0x60   //  LEG_LEFT | LEG_RIGHT
+#define FOOT_LEFT   0x80
+#define FOOT_RIGHT  0x100
+#define FEET        0x180  // FOOT_LEFT | FOOT_RIGHT
+#define ARM_LEFT    0x200
+#define ARM_RIGHT   0x400
+#define ARMS        0x600 //  ARM_LEFT | ARM_RIGHT
+#define HAND_LEFT   0x800
+#define HAND_RIGHT  0x1000
+#define HANDS       0x1800 // HAND_LEFT | HAND_RIGHT
+#define FULL_BODY   0xFFFF

 // Bitflags for the percentual amount of protection a piece of clothing which covers the body part offers.
 // Used with human/proc/get_heat_protection() and human/proc/get_cold_protection().
@@ -185,4 +179,4 @@
 #define SUIT_SENSOR_OFF      0
 #define SUIT_SENSOR_BINARY   1
 #define SUIT_SENSOR_VITAL    2
-#define SUIT_SENSOR_TRACKING 3
+#define SUIT_SENSOR_TRACKING 3
@@ -1,8 +1,7 @@
 var/global/defer_powernet_rebuild = 0      // True if net rebuild will be called manually after an event.

-var/CELLRATE = 0.002 // Multiplier for watts per tick <> cell storage (e.g., 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)
-                    // It's a conversion constant. power_used*CELLRATE = charge_provided, or charge_used/CELLRATE = power_provided
-var/CHARGELEVEL = 0.0005 // Cap for how fast cells charge, as a percentage-per-tick (0.01 means cellcharge is capped to 1% per second)
+#define CELLRATE 0.002 // Multiplier for watts per tick <> cell storage (e.g., 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)
+                       // It's a conversion constant. power_used*CELLRATE = charge_provided, or charge_used/CELLRATE = power_provided

 // Doors!
 #define DOOR_CRUSH_DAMAGE 10
@@ -15,18 +14,15 @@ var/CHARGELEVEL = 0.0005 // Cap for how fast cells charge, as a percentage-per-t
 #define TOTAL   4 // For total power used only.

 // Bitflags for machine stat variable.
-#define BROKEN   1
-#define NOPOWER  2
-#define POWEROFF 4  // TBD.
-#define MAINT    8  // Under maintenance.
-#define EMPED    16 // Temporary broken by EMP pulse.
+#define BROKEN   0x1
+#define NOPOWER  0x2
+#define POWEROFF 0x4  // TBD.
+#define MAINT    0x8  // Under maintenance.
+#define EMPED    0x10 // Temporary broken by EMP pulse.

-// Bitmasks for door switches.
-#define OPEN   1
-#define IDSCAN 2
-#define BOLTS  4
-#define SHOCK  8
-#define SAFE   16
+// Used by firelocks
+#define FIREDOOR_OPEN 1
+#define FIREDOOR_CLOSED 2

 #define AI_CAMERA_LUMINOSITY 6

@@ -63,12 +59,12 @@ var/list/restricted_camera_networks = list("thunder","ERT","NUKE","Secret")
 #define STAGE_SUPER	11

 // computer3 error codes, move lower in the file when it passes dev -Sayu
-#define PROG_CRASH          1  // Generic crash.
-#define MISSING_PERIPHERAL  2  // Missing hardware.
-#define BUSTED_ASS_COMPUTER 4  // Self-perpetuating error.  BAC will continue to crash forever.
-#define MISSING_PROGRAM     8  // Some files try to automatically launch a program. This is that failing.
-#define FILE_DRM            16 // Some files want to not be copied/moved. This is them complaining that you tried.
-#define NETWORK_FAILURE     32
+#define PROG_CRASH          0x1  // Generic crash.
+#define MISSING_PERIPHERAL  0x2  // Missing hardware.
+#define BUSTED_ASS_COMPUTER 0x4  // Self-perpetuating error.  BAC will continue to crash forever.
+#define MISSING_PROGRAM     0x8  // Some files try to automatically launch a program. This is that failing.
+#define FILE_DRM            0x10 // Some files want to not be copied/moved. This is them complaining that you tried.
+#define NETWORK_FAILURE     0x20

 // NanoUI flags
 #define STATUS_INTERACTIVE 2 // GREEN Visability
@@ -97,4 +93,4 @@ var/list/restricted_camera_networks = list("thunder","ERT","NUKE","Secret")
 #define ATMOS_DEFAULT_VOLUME_PUMP   200 // Liters.
 #define ATMOS_DEFAULT_VOLUME_FILTER 200 // L.
 #define ATMOS_DEFAULT_VOLUME_MIXER  200 // L.
-#define ATMOS_DEFAULT_VOLUME_PIPE   70  // L.
+#define ATMOS_DEFAULT_VOLUME_PIPE   70  // L.
@@ -31,22 +31,22 @@
 #define MAX_GEAR_COST 5 // Used in chargen for accessory loadout limit.

 // Preference toggles.
-#define SOUND_ADMINHELP 1
-#define SOUND_MIDI      2
-#define SOUND_AMBIENCE  4
-#define SOUND_LOBBY     8
-#define CHAT_OOC        16
-#define CHAT_DEAD       32
-#define CHAT_GHOSTEARS  64
-#define CHAT_GHOSTSIGHT 128
-#define CHAT_PRAYER     256
-#define CHAT_RADIO      512
-#define CHAT_ATTACKLOGS 1024
-#define CHAT_DEBUGLOGS  2048
-#define CHAT_LOOC       4096
-#define CHAT_GHOSTRADIO 8192
-#define SHOW_TYPING     16384
-#define CHAT_NOICONS    32768
+#define SOUND_ADMINHELP 0x1
+#define SOUND_MIDI      0x2
+#define SOUND_AMBIENCE  0x4
+#define SOUND_LOBBY     0x8
+#define CHAT_OOC        0x10
+#define CHAT_DEAD       0x20
+#define CHAT_GHOSTEARS  0x40
+#define CHAT_GHOSTSIGHT 0x80
+#define CHAT_PRAYER     0x100
+#define CHAT_RADIO      0x200
+#define CHAT_ATTACKLOGS 0x400
+#define CHAT_DEBUGLOGS  0x800
+#define CHAT_LOOC       0x1000
+#define CHAT_GHOSTRADIO 0x2000
+#define SHOW_TYPING     0x4000
+#define CHAT_NOICONS    0x8000

 #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC)

@@ -63,15 +63,23 @@
 #define 	  LIFE_HUD 10 // STATUS_HUD that only reports dead or alive

 //some colors
-#define COLOR_RED    "#FF0000"
-#define COLOR_GREEN  "#00FF00"
-#define COLOR_BLUE   "#0000FF"
-#define COLOR_CYAN   "#00FFFF"
-#define COLOR_PINK   "#FF00FF"
-#define COLOR_YELLOW "#FFFF00"
-#define COLOR_ORANGE "#FF9900"
 #define COLOR_WHITE  "#FFFFFF"
+#define COLOR_SILVER "#C0C0C0"
+#define COLOR_GRAY   "#808080"
 #define COLOR_BLACK  "#000000"
+#define COLOR_RED    "#FF0000"
+#define COLOR_MAROON "#800000"
+#define COLOR_YELLOW "#FFFF00"
+#define COLOR_OLIVE  "#808000"
+#define COLOR_LIME   "#00FF00"
+#define COLOR_GREEN  "#008000"
+#define COLOR_CYAN   "#00FFFF"
+#define COLOR_TEAL   "#008080"
+#define COLOR_BLUE   "#0000FF"
+#define COLOR_NAVY   "#000080"
+#define COLOR_PINK   "#FF00FF"
+#define COLOR_PURPLE "#800080"
+#define COLOR_ORANGE "#FF9900"

 //	Shuttles.

@@ -145,9 +153,9 @@
 #define SHARD_SPLINTER "splinters"
 #define SHARD_NONE ""

-#define MATERIAL_UNMELTABLE 1
-#define MATERIAL_BRITTLE 2
-#define MATERIAL_PADDING 4
+#define MATERIAL_UNMELTABLE 0x1
+#define MATERIAL_BRITTLE    0x2
+#define MATERIAL_PADDING    0x4

 #define TABLE_BRITTLE_MATERIAL_MULTIPLIER 4 // Amount table damage is multiplied by if it is made of a brittle material (e.g. glass)

@@ -4,16 +4,16 @@
 #define DEAD        2

 // Bitflags defining which status effects could be or are inflicted on a mob.
-#define CANSTUN     1
-#define CANWEAKEN   2
-#define CANPARALYSE 4
-#define CANPUSH     8
-#define LEAPING     16
-#define PASSEMOTES  32    // Mob has a cortical borer or holders inside of it that need to see emotes.
-#define GODMODE     4096
-#define FAKEDEATH   8192  // Replaces stuff like changeling.changeling_fakedeath.
-#define DISFIGURED  16384 // I'll probably move this elsewhere if I ever get wround to writing a bitflag mob-damage system.
-#define XENO_HOST   32768 // Tracks whether we're gonna be a baby alien's mummy.
+#define CANSTUN     0x1
+#define CANWEAKEN   0x2
+#define CANPARALYSE 0x4
+#define CANPUSH     0x8
+#define LEAPING     0x10
+#define PASSEMOTES  0x32    // Mob has a cortical borer or holders inside of it that need to see emotes.
+#define GODMODE     0x1000
+#define FAKEDEATH   0x2000  // Replaces stuff like changeling.changeling_fakedeath.
+#define DISFIGURED  0x4000  // Set but never checked. Remove this sometime and replace occurences with the appropriate organ code
+#define XENO_HOST   0x8000  // Tracks whether we're gonna be a baby alien's mummy.

 // Grab levels.
 #define GRAB_PASSIVE    1
@@ -22,9 +22,9 @@
 #define GRAB_UPGRADING  4
 #define GRAB_KILL       5

-#define BORGMESON 1
-#define BORGTHERM 2
-#define BORGXRAY  4
+#define BORGMESON 0x1
+#define BORGTHERM 0x2
+#define BORGXRAY  0x4

 #define HOSTILE_STANCE_IDLE      1
 #define HOSTILE_STANCE_ALERT     2
@@ -49,7 +49,7 @@
 #define I_HELP		"help"
 #define I_DISARM	"disarm"
 #define I_GRAB		"grab"
-#define I_HURT		"hurt"
+#define I_HURT		"harm"

 //These are used Bump() code for living mobs, in the mob_bump_flag, mob_swap_flags, and mob_push_flags vars to determine whom can bump/swap with whom.
 #define HUMAN 1
@@ -58,7 +58,8 @@
 #define ROBOT 8
 #define SLIME 16
 #define SIMPLE_ANIMAL 32
-#define ALLMOBS (HUMAN|MONKEY|ALIEN|ROBOT|SLIME|SIMPLE_ANIMAL)
+#define HEAVY 64
+#define ALLMOBS (HUMAN|MONKEY|ALIEN|ROBOT|SLIME|SIMPLE_ANIMAL|HEAVY)

 #define NEXT_MOVE_DELAY 8

@@ -69,17 +70,17 @@
 #define ROBOT_NOTIFICATION_MODULE_RESET 4

 // Appearance change flags
-#define APPEARANCE_UPDATE_DNA 1
-#define APPEARANCE_RACE	(2|APPEARANCE_UPDATE_DNA)
-#define APPEARANCE_GENDER (4|APPEARANCE_UPDATE_DNA)
-#define APPEARANCE_SKIN 8
-#define APPEARANCE_HAIR 16
-#define APPEARANCE_HAIR_COLOR 32
-#define APPEARANCE_FACIAL_HAIR 64
-#define APPEARANCE_FACIAL_HAIR_COLOR 128
-#define APPEARANCE_EYE_COLOR 256
+#define APPEARANCE_UPDATE_DNA  0x1
+#define APPEARANCE_RACE       (0x2|APPEARANCE_UPDATE_DNA)
+#define APPEARANCE_GENDER     (0x4|APPEARANCE_UPDATE_DNA)
+#define APPEARANCE_SKIN        0x8
+#define APPEARANCE_HAIR        0x10
+#define APPEARANCE_HAIR_COLOR  0x20
+#define APPEARANCE_FACIAL_HAIR 0x40
+#define APPEARANCE_FACIAL_HAIR_COLOR 0x80
+#define APPEARANCE_EYE_COLOR 0x100
 #define APPEARANCE_ALL_HAIR (APPEARANCE_HAIR|APPEARANCE_HAIR_COLOR|APPEARANCE_FACIAL_HAIR|APPEARANCE_FACIAL_HAIR_COLOR)
-#define APPEARANCE_ALL 511
+#define APPEARANCE_ALL       0xFFFF


 #define MIN_SUPPLIED_LAW_NUMBER 15
@@ -104,3 +105,4 @@
 #define COMPANY_OPPOSED			"Opposed"

 #define COMPANY_ALIGNMENTS		list(COMPANY_LOYAL,COMPANY_SUPPORTATIVE,COMPANY_NEUTRAL,COMPANY_SKEPTICAL,COMPANY_OPPOSED)
+
@@ -1,7 +1,7 @@
 #define SHEET_MATERIAL_AMOUNT 2000

 #define TECH_MATERIAL "materials"
-#define TECH_ENGINERING "engineering"
+#define TECH_ENGINEERING "engineering"
 #define TECH_PHORON "phorontech"
 #define TECH_POWER "powerstorage"
 #define TECH_BLUESPACE "bluespace"
@@ -12,7 +12,7 @@
 #define TECH_ILLEGAL "syndicate"
 #define TECH_ARCANE "arcane"

-#define IMPRINTER	1	//For circuits. Uses glass/chemicals.
-#define PROTOLATHE	2	//New stuff. Uses glass/metal/chemicals
-#define MECHFAB		4	//Mechfab
-#define CHASSIS		8	//For protolathe, but differently
+#define IMPRINTER	0x1	//For circuits. Uses glass/chemicals.
+#define PROTOLATHE	0x2	//New stuff. Uses glass/metal/chemicals
+#define MECHFAB		0x4	//Mechfab
+#define CHASSIS		0x8	//For protolathe, but differently
@@ -1,31 +1,27 @@
 // Species flags.
-#define NO_BLOOD          1     // Vessel var is not filled with blood, cannot bleed out.
-#define NO_BREATHE        2     // Cannot suffocate or take oxygen loss.
-#define NO_SCAN           4     // Cannot be scanned in a DNA machine/genome-stolen.
-#define NO_PAIN           8     // Cannot suffer halloss/recieves deceptive health indicator.
-#define NO_SLIP           16    // Cannot fall over.
-#define NO_POISON         32    // Cannot not suffer toxloss.
-#define HAS_SKIN_TONE     64    // Skin tone selectable in chargen. (0-255)
-#define HAS_SKIN_COLOR    128   // Skin colour selectable in chargen. (RGB)
-#define HAS_LIPS          256   // Lips are drawn onto the mob icon. (lipstick)
-#define HAS_UNDERWEAR     512   // Underwear is drawn onto the mob icon.
-#define IS_PLANT          1024  // Is a treeperson.
-#define IS_WHITELISTED    2048  // Must be whitelisted to play.
-#define HAS_EYE_COLOR     4096  // Eye colour selectable in chargen. (RGB)
-#define CAN_JOIN          8192  // Species is selectable in chargen.
-#define IS_RESTRICTED     16384 // Is not a core/normally playable species. (castes, mutantraces)
-// unused: 32768 - higher than this will overflow
+#define NO_BLOOD          0x1    // Vessel var is not filled with blood, cannot bleed out.
+#define NO_BREATHE        0x2    // Cannot suffocate or take oxygen loss.
+#define NO_SCAN           0x4    // Cannot be scanned in a DNA machine/genome-stolen.
+#define NO_PAIN           0x8    // Cannot suffer halloss/recieves deceptive health indicator.
+#define NO_SLIP           0x10   // Cannot fall over.
+#define NO_POISON         0x20   // Cannot not suffer toxloss.
+#define IS_PLANT          0x40   // Is a treeperson.
+#define NO_MINOR_CUT      0x80   // Can step on broken glass with no ill-effects. Either thick skin (diona/vox), cut resistant (slimes) or incorporeal (shadows)
+// unused: 0x8000 - higher than this will overflow
+
+// Species spawn flags
+#define IS_WHITELISTED    0x1    // Must be whitelisted to play.
+#define CAN_JOIN          0x2    // Species is selectable in chargen.
+#define IS_RESTRICTED     0x4    // Is not a core/normally playable species. (castes, mutantraces)
+
+// Species appearance flags
+#define HAS_SKIN_TONE     0x1    // Skin tone selectable in chargen. (0-255)
+#define HAS_SKIN_COLOR    0x2    // Skin colour selectable in chargen. (RGB)
+#define HAS_LIPS          0x4    // Lips are drawn onto the mob icon. (lipstick)
+#define HAS_UNDERWEAR     0x8    // Underwear is drawn onto the mob icon.
+#define HAS_EYE_COLOR     0x10   // Eye colour selectable in chargen. (RGB)

 // Languages.
-#define LANGUAGE_HUMAN  1
-#define LANGUAGE_ALIEN  2
-#define LANGUAGE_DOG    4
-#define LANGUAGE_CAT    8
-#define LANGUAGE_BINARY 16
-#define LANGUAGE_OTHER  32768
-
-#define LANGUAGE_UNIVERSAL 65535
-
 #define LANGUAGE_SOL_COMMON "Sol Common"
 #define LANGUAGE_UNATHI "Sinta'unathi"
 #define LANGUAGE_SIIK_MAAS "Siik'maas"
@@ -36,13 +32,14 @@
 #define LANGUAGE_GUTTER "Gutter"

 // Language flags.
-#define WHITELISTED 1   // Language is available if the speaker is whitelisted.
-#define RESTRICTED  2   // Language can only be accquired by spawning or an admin.
-#define NONVERBAL   4   // Language has a significant non-verbal component. Speech is garbled without line-of-sight.
-#define SIGNLANG    8   // Language is completely non-verbal. Speech is displayed through emotes for those who can understand.
-#define HIVEMIND    16  // Broadcast to all mobs with this language.
-#define NONGLOBAL   32  // Do not add to general languages list.
-#define INNATE      64  // All mobs can be assumed to speak and understand this language. (audible emotes)
-#define NO_TALK_MSG 128 // Do not show the "\The [speaker] talks into \the [radio]" message
-#define NO_STUTTER 256	// No stuttering, slurring, or other speech problems
+#define WHITELISTED  1   // Language is available if the speaker is whitelisted.
+#define RESTRICTED   2   // Language can only be acquired by spawning or an admin.
+#define NONVERBAL    4   // Language has a significant non-verbal component. Speech is garbled without line-of-sight.
+#define SIGNLANG     8   // Language is completely non-verbal. Speech is displayed through emotes for those who can understand.
+#define HIVEMIND     16  // Broadcast to all mobs with this language.
+#define NONGLOBAL    32  // Do not add to general languages list.
+#define INNATE       64  // All mobs can be assumed to speak and understand this language. (audible emotes)
+#define NO_TALK_MSG  128 // Do not show the "\The [speaker] talks into \the [radio]" message
+#define NO_STUTTER   256 // No stuttering, slurring, or other speech problems
 #define COMMON_VERBS 512 // Robots will apply regular verbs to this
+
@@ -0,0 +1,10 @@
+#define TURF_REMOVE_CROWBAR     1
+#define TURF_REMOVE_SCREWDRIVER 2
+#define TURF_REMOVE_SHOVEL      4
+#define TURF_REMOVE_WRENCH      8
+#define TURF_CAN_BREAK          16
+#define TURF_CAN_BURN           32
+#define TURF_HAS_EDGES          64
+#define TURF_HAS_CORNERS        128
+#define TURF_IS_FRAGILE         256
+#define TURF_ACID_IMMUNE        512
@@ -130,9 +130,9 @@ var/global/list/endgame_safespawns = list()
 		S.race_key = rkey //Used in mob icon caching.
 		all_species[S.name] = S

-		if(!(S.flags & IS_RESTRICTED))
+		if(!(S.spawn_flags & IS_RESTRICTED))
 			playable_species += S.name
-		if(S.flags & IS_WHITELISTED)
+		if(S.spawn_flags & IS_WHITELISTED)
 			whitelisted_species += S.name

 	//Posters
@@ -635,7 +635,7 @@ The _flatIcons list is a cache for generated icon files.
 */

 proc // Creates a single icon from a given /atom or /image.  Only the first argument is required.
-	getFlatIcon(image/A, defdir=2, deficon=null, defstate="", defblend=BLEND_DEFAULT)
+	getFlatIcon(image/A, defdir=2, deficon=null, defstate="", defblend=BLEND_DEFAULT, always_use_defdir = 0)
 		// We start with a blank canvas, otherwise some icon procs crash silently
 		var/icon/flat = icon('icons/effects/effects.dmi', "icon_state"="nothing") // Final flattened icon
 		if(!A)
@@ -666,7 +666,7 @@ proc // Creates a single icon from a given /atom or /image.  Only the first argu
 				noIcon = TRUE // Do not render this object.

 		var/curdir
-		if(A.dir != 2)
+		if(A.dir != 2 && !always_use_defdir)
 			curdir = A.dir
 		else
 			curdir = defdir
@@ -604,10 +604,13 @@ datum/proc/dd_SortValue()
 /datum/alarm/dd_SortValue()
 	return "[sanitize_old(last_name)]"

+/proc/subtypes(prototype)
+	return (typesof(prototype) - prototype)
+
 //creates every subtype of prototype (excluding prototype) and adds it to list L.
 //if no list/L is provided, one is created.
 /proc/init_subtypes(prototype, list/L)
 	if(!istype(L))	L = list()
-	for(var/path in (typesof(prototype) - prototype))
+	for(var/path in subtypes(prototype))
 		L += new path()
 	return L
@@ -109,6 +109,12 @@
 		M = whom
 		C = M.client
 		key = M.key
+	else if(istype(whom, /datum/mind))
+		var/datum/mind/D = whom
+		key = D.key
+		M = D.current
+		if(D.current)
+			C = D.current.client
 	else if(istype(whom, /datum))
 		var/datum/D = whom
 		return "*invalid:[D.type]*"
@@ -116,7 +116,7 @@
 	if(last_char_group == 1)
 		output = copytext(output,1,length(output))	//removes the last character (in this case a space)

-	for(var/bad_name in list("space","floor","wall","r-wall","monkey","unknown","inactive ai"))	//prevents these common metagamey names
+	for(var/bad_name in list("space","floor","wall","r-wall","monkey","unknown","inactive ai","plating"))	//prevents these common metagamey names
 		if(cmptext(output,bad_name))	return	//(not case sensitive)

 	return output
@@ -27,3 +27,18 @@ proc/isDay(var/month, var/day)
 		// Uncomment this out when debugging!
 		//else
 			//return 1
+
+var/next_duration_update = 0
+var/last_round_duration = 0
+proc/round_duration()
+	if(last_round_duration && world.time < next_duration_update)
+		return last_round_duration
+
+	var/mills = world.time // 1/10 of a second, not real milliseconds but whatever
+	//var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something
+	var/mins = (mills % 36000) / 600
+	var/hours = mills / 36000
+
+	last_round_duration = "[round(hours)]h [round(mins)]m"
+	next_duration_update = world.time + 1 MINUTES
+	return last_round_duration
@@ -38,7 +38,7 @@
 // Returns the hex value of a number given a value assumed to be a base-ten value
 /proc/num2hex(num, padlength)
 	var/global/list/hexdigits = list("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F")
-
+
 	. = ""
 	while(num > 0)
 		var/hexdigit = hexdigits[(num & 0xF) + 1]
@@ -46,7 +46,7 @@
 		num >>= 4 //go to the next half-byte

 	//pad with zeroes
-	var/left = padlength - length(.)
+	var/left = padlength - length(.)
 	while (left-- > 0)
 		. = "0[.]"

@@ -275,13 +275,6 @@ proc/tg_list2text(list/list, glue=",")
 	if (rights & R_MENTOR)      . += "[seperator]+MENTOR"
 	return .

-/proc/ui_style2icon(ui_style)
-	switch (ui_style)
-		if ("old")      return 'icons/mob/screen1_old.dmi'
-		if ("Orange")   return 'icons/mob/screen1_Orange.dmi'
-		if ("Midnight") return 'icons/mob/screen1_Midnight.dmi'
-		else            return 'icons/mob/screen1_White.dmi'
-
 // heat2color functions. Adapted from: http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/
 /proc/heat2color(temp)
 	return rgb(heat2color_r(temp), heat2color_g(temp), heat2color_b(temp))
@@ -4,6 +4,9 @@
 * A large number of misc global procs.
 */

+//Checks if all high bits in req_mask are set in bitfield
+#define BIT_TEST_ALL(bitfield, req_mask) ((~(bitfield) & (req_mask)) == 0)
+
 //Inverts the colour of an HTML string
 /proc/invertHTML(HTMLstring)

@@ -774,11 +777,15 @@ proc/GaussRandRound(var/sigma,var/roundto)
 					var/old_dir1 = T.dir
 					var/old_icon_state1 = T.icon_state
 					var/old_icon1 = T.icon
+					var/old_overlays = T.overlays.Copy()
+					var/old_underlays = T.underlays.Copy()

 					var/turf/X = B.ChangeTurf(T.type)
 					X.set_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
+					X.overlays = old_overlays
+					X.underlays = old_underlays

 					var/turf/simulated/ST = T
 					if(istype(ST) && ST.zone)
@@ -824,7 +831,7 @@ proc/GaussRandRound(var/sigma,var/roundto)
 						if(!istype(O,/obj)) continue
 						O.loc = X
 					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
+						if(!istype(M,/mob) || istype(M, /mob/eye)) continue // If we need to check for more mobs, I'll add a variable
 						M.loc = X

 //					var/area/AR = X.loc
@@ -921,6 +928,8 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
 					var/old_dir1 = T.dir
 					var/old_icon_state1 = T.icon_state
 					var/old_icon1 = T.icon
+					var/old_overlays = T.overlays.Copy()
+					var/old_underlays = T.underlays.Copy()

 					if(platingRequired)
 						if(istype(B, get_base_turf(B.z)))
@@ -931,7 +940,8 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
 					X.set_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
-
+					X.overlays = old_overlays
+					X.underlays = old_underlays

 					var/list/objs = new/list()
 					var/list/newobjs = new/list()
@@ -955,7 +965,7 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)

 					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
+						if(!istype(M,/mob) || istype(M, /mob/eye)) continue // If we need to check for more mobs, I'll add a variable
 						mobs += M

 					for(var/mob/M in mobs)
@@ -256,7 +256,7 @@ datum/hud/New(mob/owner)
 	if(ishuman(mymob))
 		human_hud(ui_style, ui_color, ui_alpha, mymob) // Pass the player the UI style chosen in preferences
 	else if(issmall(mymob))
-		monkey_hud(ui_style)
+		monkey_hud(ui_style, ui_color, ui_alpha)
 	else if(isbrain(mymob))
 		brain_hud(ui_style)
 	else if(isalien(mymob))
@@ -58,7 +58,6 @@

 		using = new /obj/screen()
 		using.name = "act_intent"
-		using.set_dir(SOUTHWEST)
 		using.icon = ui_style
 		using.icon_state = "intent_"+mymob.a_intent
 		using.screen_loc = ui_acti
@@ -125,7 +124,6 @@
 	if(hud_data.has_m_intent)
 		using = new /obj/screen()
 		using.name = "mov_intent"
-		using.set_dir(SOUTHWEST)
 		using.icon = ui_style
 		using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
 		using.screen_loc = ui_movi
@@ -160,11 +158,10 @@

 		inv_box = new /obj/screen/inventory()
 		inv_box.name = "r_hand"
-		inv_box.set_dir(WEST)
 		inv_box.icon = ui_style
-		inv_box.icon_state = "hand_inactive"
+		inv_box.icon_state = "r_hand_inactive"
 		if(mymob && !mymob.hand)	//This being 0 or null means the right hand is in use
-			inv_box.icon_state = "hand_active"
+			inv_box.icon_state = "r_hand_active"
 		inv_box.screen_loc = ui_rhand
 		inv_box.slot_id = slot_r_hand
 		inv_box.layer = 19
@@ -176,11 +173,10 @@

 		inv_box = new /obj/screen/inventory()
 		inv_box.name = "l_hand"
-		inv_box.set_dir(EAST)
 		inv_box.icon = ui_style
-		inv_box.icon_state = "hand_inactive"
+		inv_box.icon_state = "l_hand_inactive"
 		if(mymob && mymob.hand)	//This being 1 means the left hand is in use
-			inv_box.icon_state = "hand_active"
+			inv_box.icon_state = "l_hand_active"
 		inv_box.screen_loc = ui_lhand
 		inv_box.slot_id = slot_l_hand
 		inv_box.layer = 19
@@ -191,7 +187,6 @@

 		using = new /obj/screen/inventory()
 		using.name = "hand"
-		using.set_dir(SOUTH)
 		using.icon = ui_style
 		using.icon_state = "hand1"
 		using.screen_loc = ui_swaphand1
@@ -202,7 +197,6 @@

 		using = new /obj/screen/inventory()
 		using.name = "hand"
-		using.set_dir(SOUTH)
 		using.icon = ui_style
 		using.icon_state = "hand2"
 		using.screen_loc = ui_swaphand2
@@ -340,29 +334,31 @@

 	//Handle the gun settings buttons
 	mymob.gun_setting_icon = new /obj/screen/gun/mode(null)
-	//mymob.gun_setting_icon.color = ui_color
+	mymob.gun_setting_icon.icon = ui_style
+	mymob.gun_setting_icon.color = ui_color
 	mymob.gun_setting_icon.alpha = ui_alpha
 	hud_elements |= mymob.gun_setting_icon

 	mymob.item_use_icon = new /obj/screen/gun/item(null)
-	//mymob.item_use_icon.color = ui_color
+	mymob.item_use_icon.icon = ui_style
+	mymob.item_use_icon.color = ui_color
 	mymob.item_use_icon.alpha = ui_alpha

 	mymob.gun_move_icon = new /obj/screen/gun/move(null)
-	//mymob.gun_move_icon.color = ui_color
+	mymob.gun_move_icon.icon = ui_style
+	mymob.gun_move_icon.color = ui_color
 	mymob.gun_move_icon.alpha = ui_alpha

 	mymob.gun_run_icon = new /obj/screen/gun/run(null)
-	//mymob.gun_run_icon.color = ui_color
+	mymob.gun_run_icon.icon = ui_style
+	mymob.gun_run_icon.color = ui_color
 	mymob.gun_run_icon.alpha = ui_alpha

 	mymob.radio_use_icon = new /obj/screen/gun/radio(null)
+	mymob.radio_use_icon.icon = ui_style
+	mymob.radio_use_icon.color = ui_color
 	mymob.radio_use_icon.alpha = ui_alpha

-	if (mymob.client)
-		if (mymob.client.gun_mode) // If in aim mode, correct the sprite
-			mymob.gun_setting_icon.set_dir(2)
-

 	mymob.client.screen = null

@@ -1,4 +1,4 @@
-/datum/hud/proc/monkey_hud(var/ui_style='icons/mob/screen1_old.dmi')
+/datum/hud/proc/monkey_hud(var/ui_style='icons/mob/screen1_old.dmi', var/ui_color = "#ffffff", var/ui_alpha = 255)

 	src.adding = list()
 	src.other = list()
@@ -8,9 +8,10 @@

 	using = new /obj/screen()
 	using.name = "act_intent"
-	using.set_dir(SOUTHWEST)
 	using.icon = ui_style
-	using.icon_state = (mymob.a_intent == I_HURT ? I_HURT : mymob.a_intent)
+	using.color = ui_color
+	using.alpha = ui_alpha
+	using.icon_state = mymob.a_intent
 	using.screen_loc = ui_acti
 	using.layer = 20
 	src.adding += using
@@ -23,7 +24,7 @@
 	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 	ico.DrawBox(rgb(255,255,255,1),1,ico.Height()/2,ico.Width()/2,ico.Height())
 	using = new /obj/screen( src )
-	using.name = "help"
+	using.name = I_HELP
 	using.icon = ico
 	using.screen_loc = ui_acti
 	using.layer = 21
@@ -34,7 +35,7 @@
 	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,ico.Height()/2,ico.Width(),ico.Height())
 	using = new /obj/screen( src )
-	using.name = "disarm"
+	using.name = I_DISARM
 	using.icon = ico
 	using.screen_loc = ui_acti
 	using.layer = 21
@@ -45,7 +46,7 @@
 	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,1,ico.Width(),ico.Height()/2)
 	using = new /obj/screen( src )
-	using.name = "grab"
+	using.name = I_GRAB
 	using.icon = ico
 	using.screen_loc = ui_acti
 	using.layer = 21
@@ -56,7 +57,7 @@
 	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
 	ico.DrawBox(rgb(255,255,255,1),1,1,ico.Width()/2,ico.Height()/2)
 	using = new /obj/screen( src )
-	using.name = "harm"
+	using.name = I_HURT
 	using.icon = ico
 	using.screen_loc = ui_acti
 	using.layer = 21
@@ -67,8 +68,9 @@

 	using = new /obj/screen()
 	using.name = "mov_intent"
-	using.set_dir(SOUTHWEST)
 	using.icon = ui_style
+	using.color = ui_color
+	using.alpha = ui_alpha
 	using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
 	using.screen_loc = ui_movi
 	using.layer = 20
@@ -78,6 +80,8 @@
 	using = new /obj/screen()
 	using.name = "drop"
 	using.icon = ui_style
+	using.color = ui_color
+	using.alpha = ui_alpha
 	using.icon_state = "act_drop"
 	using.screen_loc = ui_drop_throw
 	using.layer = 19
@@ -85,9 +89,10 @@

 	inv_box = new /obj/screen/inventory()
 	inv_box.name = "r_hand"
-	inv_box.set_dir(WEST)
 	inv_box.icon = ui_style
-	inv_box.icon_state = "hand_inactive"
+	using.color = ui_color
+	using.alpha = ui_alpha
+	inv_box.icon_state = "r_hand_inactive"
 	if(mymob && !mymob.hand)	//This being 0 or null means the right hand is in use
 		inv_box.icon_state = "hand_active"
 	inv_box.screen_loc = ui_rhand
@@ -98,9 +103,10 @@

 	inv_box = new /obj/screen/inventory()
 	inv_box.name = "l_hand"
-	inv_box.set_dir(EAST)
 	inv_box.icon = ui_style
-	inv_box.icon_state = "hand_inactive"
+	using.color = ui_color
+	using.alpha = ui_alpha
+	inv_box.icon_state = "l_hand_inactive"
 	if(mymob && mymob.hand)	//This being 1 means the left hand is in use
 		inv_box.icon_state = "hand_active"
 	inv_box.screen_loc = ui_lhand
@@ -111,8 +117,9 @@

 	using = new /obj/screen/inventory()
 	using.name = "hand"
-	using.set_dir(SOUTH)
 	using.icon = ui_style
+	using.color = ui_color
+	using.alpha = ui_alpha
 	using.icon_state = "hand1"
 	using.screen_loc = ui_swaphand1
 	using.layer = 19
@@ -120,8 +127,9 @@

 	using = new /obj/screen/inventory()
 	using.name = "hand"
-	using.set_dir(SOUTH)
 	using.icon = ui_style
+	using.color = ui_color
+	using.alpha = ui_alpha
 	using.icon_state = "hand2"
 	using.screen_loc = ui_swaphand2
 	using.layer = 19
@@ -129,8 +137,9 @@

 	inv_box = new /obj/screen/inventory()
 	inv_box.name = "mask"
-	inv_box.set_dir(NORTH)
 	inv_box.icon = ui_style
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	inv_box.icon_state = "equip"
 	inv_box.screen_loc = ui_monkey_mask
 	inv_box.slot_id = slot_wear_mask
@@ -139,8 +148,9 @@

 	inv_box = new /obj/screen/inventory()
 	inv_box.name = "back"
-	inv_box.set_dir(NORTHEAST)
 	inv_box.icon = ui_style
+	inv_box.color = ui_color
+	inv_box.alpha = ui_alpha
 	inv_box.icon_state = "equip"
 	inv_box.screen_loc = ui_back
 	inv_box.slot_id = slot_back
@@ -149,54 +159,72 @@

 	mymob.throw_icon = new /obj/screen()
 	mymob.throw_icon.icon = ui_style
+	mymob.throw_icon.color = ui_color
+	mymob.throw_icon.alpha = ui_alpha
 	mymob.throw_icon.icon_state = "act_throw_off"
 	mymob.throw_icon.name = "throw"
 	mymob.throw_icon.screen_loc = ui_drop_throw

 	mymob.oxygen = new /obj/screen()
 	mymob.oxygen.icon = ui_style
+	mymob.oxygen.color = ui_color
+	mymob.oxygen.alpha = ui_alpha
 	mymob.oxygen.icon_state = "oxy0"
 	mymob.oxygen.name = "oxygen"
 	mymob.oxygen.screen_loc = ui_oxygen

 	mymob.pressure = new /obj/screen()
 	mymob.pressure.icon = ui_style
+	mymob.pressure.color = ui_color
+	mymob.pressure.alpha = ui_alpha
 	mymob.pressure.icon_state = "pressure0"
 	mymob.pressure.name = "pressure"
 	mymob.pressure.screen_loc = ui_pressure

 	mymob.toxin = new /obj/screen()
 	mymob.toxin.icon = ui_style
+	mymob.toxin.color = ui_color
+	mymob.toxin.alpha = ui_alpha
 	mymob.toxin.icon_state = "tox0"
 	mymob.toxin.name = "toxin"
 	mymob.toxin.screen_loc = ui_toxin

 	mymob.internals = new /obj/screen()
 	mymob.internals.icon = ui_style
+	mymob.internals.color = ui_color
+	mymob.internals.alpha = ui_alpha
 	mymob.internals.icon_state = "internal0"
 	mymob.internals.name = "internal"
 	mymob.internals.screen_loc = ui_internal

 	mymob.fire = new /obj/screen()
 	mymob.fire.icon = ui_style
+	mymob.fire.color = ui_color
+	mymob.fire.alpha = ui_alpha
 	mymob.fire.icon_state = "fire0"
 	mymob.fire.name = "fire"
 	mymob.fire.screen_loc = ui_fire

 	mymob.bodytemp = new /obj/screen()
 	mymob.bodytemp.icon = ui_style
+	mymob.bodytemp.color = ui_color
+	mymob.bodytemp.alpha = ui_alpha
 	mymob.bodytemp.icon_state = "temp1"
 	mymob.bodytemp.name = "body temperature"
 	mymob.bodytemp.screen_loc = ui_temp

 	mymob.healths = new /obj/screen()
 	mymob.healths.icon = ui_style
+	mymob.healths.color = ui_color
+	mymob.healths.alpha = ui_alpha
 	mymob.healths.icon_state = "health0"
 	mymob.healths.name = "health"
 	mymob.healths.screen_loc = ui_health

 	mymob.pullin = new /obj/screen()
 	mymob.pullin.icon = ui_style
+	mymob.pullin.color = ui_color
+	mymob.pullin.alpha = ui_alpha
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
 	mymob.pullin.screen_loc = ui_pull_resist
@@ -217,6 +245,8 @@

 	mymob.zone_sel = new /obj/screen/zone_sel()
 	mymob.zone_sel.icon = ui_style
+	mymob.zone_sel.color = ui_color
+	mymob.zone_sel.alpha = ui_alpha
 	mymob.zone_sel.overlays.Cut()
 	mymob.zone_sel.overlays += image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]")

@@ -57,7 +57,7 @@ var/obj/screen/robot_inventory
 	using.name = "act_intent"
 	using.set_dir(SOUTHWEST)
 	using.icon = 'icons/mob/screen1_robot.dmi'
-	using.icon_state = (mymob.a_intent == I_HURT ? I_HURT : mymob.a_intent)
+	using.icon_state = mymob.a_intent
 	using.screen_loc = ui_acti
 	using.layer = 20
 	src.adding += using
@@ -278,7 +278,7 @@
 						var/no_mask
 						if(!(C.wear_mask && C.wear_mask.flags & AIRTIGHT))
 							var/mob/living/carbon/human/H = C
-							if(!(H.head && H.head.flags & AIRTIGHT))
+							if(!(H.head && H.head.item_flags & AIRTIGHT))
 								no_mask = 1

 						if(no_mask)
@@ -372,7 +372,7 @@
 			usr.hud_used.action_intent.icon_state = "intent_help"
 		if(I_HURT)
 			usr.a_intent = I_HURT
-			usr.hud_used.action_intent.icon_state = "intent_hurt"
+			usr.hud_used.action_intent.icon_state = "intent_harm"
 		if(I_GRAB)
 			usr.a_intent = I_GRAB
 			usr.hud_used.action_intent.icon_state = "intent_grab"
@@ -97,20 +97,21 @@ On the map:
 1455 for AI access
 */

+var/const/BOT_FREQ = 1447
 var/const/COMM_FREQ = 1353
-var/const/SYND_FREQ = 1213
 var/const/ERT_FREQ = 1345
+var/const/AI_FREQ = 1343
 var/const/DTH_FREQ = 1341
-var/const/AI_FREQ = 1447
+var/const/SYND_FREQ = 1213

 // department channels
 var/const/PUB_FREQ = 1459
 var/const/SEC_FREQ = 1359
 var/const/ENG_FREQ = 1357
-var/const/SCI_FREQ = 1351
 var/const/MED_FREQ = 1355
-var/const/SUP_FREQ = 1347
+var/const/SCI_FREQ = 1351
 var/const/SRV_FREQ = 1349
+var/const/SUP_FREQ = 1347

 var/list/radiochannels = list(
 	"Common"		= PUB_FREQ,
@@ -203,7 +203,7 @@ var/global/datum/shuttle_controller/shuttle_controller

 	//Skipjack.
 	var/datum/shuttle/multi_shuttle/VS = new/datum/shuttle/multi_shuttle()
-	VS.origin = locate(/area/shuttle/skipjack/station)
+	VS.origin = locate(/area/skipjack_station/start)

 	VS.destinations = list(
 		"Fore Starboard Solars" = locate(/area/skipjack_station/northeast_solars),
@@ -1,16 +1,136 @@
 /hook/startup/proc/createDatacore()
-	data_core = new /obj/effect/datacore()
+	data_core = new /datum/datacore()
 	return 1

-/obj/effect/datacore/proc/manifest()
+/datum/datacore
+	var/name = "datacore"
+	var/medical[] = list()
+	var/general[] = list()
+	var/security[] = list()
+	//This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character().
+	var/locked[] = list()
+
+
+/datum/datacore/proc/get_manifest(monochrome, OOC)
+	var/list/heads = new()
+	var/list/sec = new()
+	var/list/eng = new()
+	var/list/med = new()
+	var/list/sci = new()
+	var/list/civ = new()
+	var/list/bot = new()
+	var/list/misc = new()
+	var/list/isactive = new()
+	var/dat = {"
+	<head><style>
+		.manifest {border-collapse:collapse;}
+		.manifest td, th {border:1px solid [monochrome?"black":"#DEF; background-color:white; color:black"]; padding:.25em}
+		.manifest th {height: 2em; [monochrome?"border-top-width: 3px":"background-color: #48C; color:white"]}
+		.manifest tr.head th { [monochrome?"border-top-width: 1px":"background-color: #488;"] }
+		.manifest td:first-child {text-align:right}
+		.manifest tr.alt td {[monochrome?"border-top-width: 2px":"background-color: #DEF"]}
+	</style></head>
+	<table class="manifest" width='350px'>
+	<tr class='head'><th>Name</th><th>Rank</th><th>Activity</th></tr>
+	"}
+	var/even = 0
+	// sort mobs
+	for(var/datum/data/record/t in data_core.general)
+		var/name = t.fields["name"]
+		var/rank = t.fields["rank"]
+		var/real_rank = make_list_rank(t.fields["real_rank"])
+
+		if(OOC)
+			var/active = 0
+			for(var/mob/M in player_list)
+				if(M.real_name == name && M.client && M.client.inactivity <= 10 * 60 * 10)
+					active = 1
+					break
+			isactive[name] = active ? "Active" : "Inactive"
+		else
+			isactive[name] = t.fields["p_stat"]
+			//world << "[name]: [rank]"
+			//cael - to prevent multiple appearances of a player/job combination, add a continue after each line
+		var/department = 0
+		if(real_rank in command_positions)
+			heads[name] = rank
+			department = 1
+		if(real_rank in security_positions)
+			sec[name] = rank
+			department = 1
+		if(real_rank in engineering_positions)
+			eng[name] = rank
+			department = 1
+		if(real_rank in medical_positions)
+			med[name] = rank
+			department = 1
+		if(real_rank in science_positions)
+			sci[name] = rank
+			department = 1
+		if(real_rank in civilian_positions)
+			civ[name] = rank
+			department = 1
+		if(real_rank in nonhuman_positions)
+			bot[name] = rank
+			department = 1
+		if(!department && !(name in heads))
+			misc[name] = rank
+	if(heads.len > 0)
+		dat += "<tr><th colspan=3>Heads</th></tr>"
+		for(name in heads)
+			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[heads[name]]</td><td>[isactive[name]]</td></tr>"
+			even = !even
+	if(sec.len > 0)
+		dat += "<tr><th colspan=3>Security</th></tr>"
+		for(name in sec)
+			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[sec[name]]</td><td>[isactive[name]]</td></tr>"
+			even = !even
+	if(eng.len > 0)
+		dat += "<tr><th colspan=3>Engineering</th></tr>"
+		for(name in eng)
+			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[eng[name]]</td><td>[isactive[name]]</td></tr>"
+			even = !even
+	if(med.len > 0)
+		dat += "<tr><th colspan=3>Medical</th></tr>"
+		for(name in med)
+			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[med[name]]</td><td>[isactive[name]]</td></tr>"
+			even = !even
+	if(sci.len > 0)
+		dat += "<tr><th colspan=3>Science</th></tr>"
+		for(name in sci)
+			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[sci[name]]</td><td>[isactive[name]]</td></tr>"
+			even = !even
+	if(civ.len > 0)
+		dat += "<tr><th colspan=3>Civilian</th></tr>"
+		for(name in civ)
+			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[civ[name]]</td><td>[isactive[name]]</td></tr>"
+			even = !even
+	// in case somebody is insane and added them to the manifest, why not
+	if(bot.len > 0)
+		dat += "<tr><th colspan=3>Silicon</th></tr>"
+		for(name in bot)
+			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[bot[name]]</td><td>[isactive[name]]</td></tr>"
+			even = !even
+	// misc guys
+	if(misc.len > 0)
+		dat += "<tr><th colspan=3>Miscellaneous</th></tr>"
+		for(name in misc)
+			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[misc[name]]</td><td>[isactive[name]]</td></tr>"
+			even = !even
+
+	dat += "</table>"
+	dat = replacetext(dat, "\n", "") // so it can be placed on paper correctly
+	dat = replacetext(dat, "\t", "")
+	return dat
+
+/datum/datacore/proc/manifest()
 	spawn()
 		for(var/mob/living/carbon/human/H in player_list)
 			manifest_inject(H)
 		return

-/obj/effect/datacore/proc/manifest_modify(var/name, var/assignment)
-	if(PDA_Manifest.len)
-		PDA_Manifest.Cut()
+/datum/datacore/proc/manifest_modify(var/name, var/assignment)
+	ResetPDAManifest()
 	var/datum/data/record/foundrecord
 	var/real_title = assignment

@@ -33,27 +153,13 @@
 		foundrecord.fields["rank"] = assignment
 		foundrecord.fields["real_rank"] = real_title

-/obj/effect/datacore/proc/manifest_inject(var/mob/living/carbon/human/H)
-	if(PDA_Manifest.len)
-		PDA_Manifest.Cut()
-
+/datum/datacore/proc/manifest_inject(var/mob/living/carbon/human/H)
 	if(H.mind && !player_is_antag(H.mind, only_offstation_roles = 1))
-		var/assignment
-		if(H.mind.role_alt_title)
-			assignment = H.mind.role_alt_title
-		else if(H.mind.assigned_role)
-			assignment = H.mind.assigned_role
-		else if(H.job)
-			assignment = H.job
-		else
-			assignment = "Unassigned"
+		var/assignment = GetAssignment(H)

 		var/id = add_zero(num2hex(rand(1, 1.6777215E7)), 6)	//this was the best they could come up with? A large random number? *sigh*
-		var/icon/front = new(get_id_photo(H), dir = SOUTH)
-		var/icon/side = new(get_id_photo(H), dir = WEST)
 		//General Record
-		var/datum/data/record/G = new()
-		G.fields["id"]			= id
+		var/datum/data/record/G = CreateGeneralRecord(H, id)
 		G.fields["name"]		= H.real_name
 		G.fields["real_rank"]	= H.mind.assigned_role
 		G.fields["rank"]		= assignment
@@ -67,49 +173,20 @@
 		G.fields["citizenship"]	= H.citizenship
 		G.fields["faction"]		= H.personal_faction
 		G.fields["religion"]	= H.religion
-		G.fields["photo_front"]	= front
-		G.fields["photo_side"]	= side
 		if(H.gen_record && !jobban_isbanned(H, "Records"))
 			G.fields["notes"] = H.gen_record
-		else
-			G.fields["notes"] = "No notes found."
-		general += G

 		//Medical Record
-		var/datum/data/record/M = new()
-		M.fields["id"]			= id
-		M.fields["name"]		= H.real_name
+		var/datum/data/record/M = CreateMedicalRecord(H.real_name, id)
 		M.fields["b_type"]		= H.b_type
 		M.fields["b_dna"]		= H.dna.unique_enzymes
-		M.fields["mi_dis"]		= "None"
-		M.fields["mi_dis_d"]	= "No minor disabilities have been declared."
-		M.fields["ma_dis"]		= "None"
-		M.fields["ma_dis_d"]	= "No major disabilities have been diagnosed."
-		M.fields["alg"]			= "None"
-		M.fields["alg_d"]		= "No allergies have been detected in this patient."
-		M.fields["cdi"]			= "None"
-		M.fields["cdi_d"]		= "No diseases have been diagnosed at the moment."
 		if(H.med_record && !jobban_isbanned(H, "Records"))
 			M.fields["notes"] = H.med_record
-		else
-			M.fields["notes"] = "No notes found."
-		medical += M

 		//Security Record
-		var/datum/data/record/S = new()
-		S.fields["id"]			= id
-		S.fields["name"]		= H.real_name
-		S.fields["criminal"]	= "None"
-		S.fields["mi_crim"]		= "None"
-		S.fields["mi_crim_d"]	= "No minor crime convictions."
-		S.fields["ma_crim"]		= "None"
-		S.fields["ma_crim_d"]	= "No major crime convictions."
-		S.fields["notes"]		= "No notes."
+		var/datum/data/record/S = CreateSecurityRecord(H.real_name, id)
 		if(H.sec_record && !jobban_isbanned(H, "Records"))
 			S.fields["notes"] = H.sec_record
-		else
-			S.fields["notes"] = "No notes."
-		security += S

 		//Locked Record
 		var/datum/data/record/L = new()
@@ -136,8 +213,7 @@
 		locked += L
 	return

-
-proc/get_id_photo(var/mob/living/carbon/human/H)
+proc/get_id_photo(var/mob/living/carbon/human/H, var/assigned_role)
 	var/icon/preview_icon = null

 	var/g = "m"
@@ -191,7 +267,8 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 		eyes_s.Blend(facial_s, ICON_OVERLAY)

 	var/icon/clothes_s = null
-	switch(H.mind.assigned_role)
+	if(!assigned_role) assigned_role = H.mind.assigned_role
+	switch(assigned_role)
 		if("Head of Personnel")
 			clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
@@ -295,3 +372,106 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	qdel(clothes_s)

 	return preview_icon
+
+/datum/datacore/proc/CreateGeneralRecord(var/mob/living/carbon/human/H, var/id)
+	ResetPDAManifest()
+	var/icon/front
+	var/icon/side
+	if(H)
+		front = getFlatIcon(H, SOUTH, always_use_defdir = 1)
+		side = getFlatIcon(H, WEST, always_use_defdir = 1)
+	else
+		var/mob/living/carbon/human/dummy = new()
+		front = new(get_id_photo(dummy), dir = SOUTH)
+		side = new(get_id_photo(dummy), dir = WEST)
+		qdel(dummy)
+
+	if(!id) id = text("[]", add_zero(num2hex(rand(1, 1.6777215E7)), 6))
+	var/datum/data/record/G = new /datum/data/record()
+	G.name = "Employee Record #[id]"
+	G.fields["name"] = "New Record"
+	G.fields["id"] = id
+	G.fields["rank"] = "Unassigned"
+	G.fields["real_rank"] = "Unassigned"
+	G.fields["sex"] = "Male"
+	G.fields["age"] = "Unknown"
+	G.fields["fingerprint"] = "Unknown"
+	G.fields["p_stat"] = "Active"
+	G.fields["m_stat"] = "Stable"
+	G.fields["species"] = "Human"
+	G.fields["home_system"]	= "Unknown"
+	G.fields["citizenship"]	= "Unknown"
+	G.fields["faction"]		= "Unknown"
+	G.fields["religion"]	= "Unknown"
+	G.fields["photo_front"]	= front
+	G.fields["photo_side"]	= side
+	G.fields["notes"] = "No notes found."
+	general += G
+
+	return G
+
+/datum/datacore/proc/CreateSecurityRecord(var/name, var/id)
+	ResetPDAManifest()
+	var/datum/data/record/R = new /datum/data/record()
+	R.name = "Security Record #[id]"
+	R.fields["name"] = name
+	R.fields["id"] = id
+	R.fields["criminal"]	= "None"
+	R.fields["mi_crim"]		= "None"
+	R.fields["mi_crim_d"]	= "No minor crime convictions."
+	R.fields["ma_crim"]		= "None"
+	R.fields["ma_crim_d"]	= "No major crime convictions."
+	R.fields["notes"]		= "No notes."
+	R.fields["notes"] = "No notes."
+	data_core.security += R
+
+	return R
+
+/datum/datacore/proc/CreateMedicalRecord(var/name, var/id)
+	ResetPDAManifest()
+	var/datum/data/record/M = new()
+	M.name = "Medical Record #[id]"
+	M.fields["id"]			= id
+	M.fields["name"]		= name
+	M.fields["b_type"]		= "AB+"
+	M.fields["b_dna"]		= md5(name)
+	M.fields["mi_dis"]		= "None"
+	M.fields["mi_dis_d"]	= "No minor disabilities have been declared."
+	M.fields["ma_dis"]		= "None"
+	M.fields["ma_dis_d"]	= "No major disabilities have been diagnosed."
+	M.fields["alg"]			= "None"
+	M.fields["alg_d"]		= "No allergies have been detected in this patient."
+	M.fields["cdi"]			= "None"
+	M.fields["cdi_d"]		= "No diseases have been diagnosed at the moment."
+	M.fields["notes"] = "No notes found."
+	data_core.medical += M
+
+	return M
+
+/datum/datacore/proc/ResetPDAManifest()
+	if(PDA_Manifest.len)
+		PDA_Manifest.Cut()
+
+/proc/find_general_record(field, value)
+	return find_record(field, value, data_core.general)
+
+/proc/find_medical_record(field, value)
+	return find_record(field, value, data_core.medical)
+
+/proc/find_security_record(field, value)
+	return find_record(field, value, data_core.security)
+
+/proc/find_record(field, value, list/L)
+	for(var/datum/data/record/R in L)
+		if(R.fields[field] == value)
+			return R
+
+/proc/GetAssignment(var/mob/living/carbon/human/H)
+	if(H.mind.role_alt_title)
+		return H.mind.role_alt_title
+	else if(H.mind.assigned_role)
+		return H.mind.assigned_role
+	else if(H.job)
+		return H.job
+	else
+		return "Unassigned"
@@ -143,7 +143,11 @@

 	if(href_list["add_antagonist"])
 		var/datum/antagonist/antag = all_antag_types[href_list["add_antagonist"]]
-		if(antag) antag.add_antagonist(src, 1, 1, 0, 1, 1) // Ignore equipment and role type for this.
+		if(antag) 
+			if(antag.add_antagonist(src, 1, 1, 0, 1, 1)) // Ignore equipment and role type for this.
+				log_admin("[key_name_admin(usr)] made [key_name(src)] into a [antag.role_text].")
+			else
+				usr << "<span class='warning'>[src] could not be made into a [antag.role_text]!</span>"

 	else if(href_list["remove_antagonist"])
 		var/datum/antagonist/antag = all_antag_types[href_list["remove_antagonist"]]
@@ -27,8 +27,10 @@

 /obj/effect/beam
 	name = "beam"
+	density = 0
 	unacidable = 1//Just to be sure.
 	var/def_zone
+	flags = PROXMOVE
 	pass_flags = PASSTABLE


@@ -43,129 +45,6 @@
 * This item is completely unused, but removing it will break something in R&D and Radio code causing PDA and Ninja code to fail on compile
 */

-/obj/effect/datacore
-	name = "datacore"
-	var/medical[] = list()
-	var/general[] = list()
-	var/security[] = list()
-	//This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character().
-	var/locked[] = list()
-
-
-
-/obj/effect/datacore/proc/get_manifest(monochrome, OOC)
-	var/list/heads = new()
-	var/list/sec = new()
-	var/list/eng = new()
-	var/list/med = new()
-	var/list/sci = new()
-	var/list/civ = new()
-	var/list/bot = new()
-	var/list/misc = new()
-	var/list/isactive = new()
-	var/dat = {"
-	<head><style>
-		.manifest {border-collapse:collapse;}
-		.manifest td, th {border:1px solid [monochrome?"black":"#DEF; background-color:white; color:black"]; padding:.25em}
-		.manifest th {height: 2em; [monochrome?"border-top-width: 3px":"background-color: #48C; color:white"]}
-		.manifest tr.head th { [monochrome?"border-top-width: 1px":"background-color: #488;"] }
-		.manifest td:first-child {text-align:right}
-		.manifest tr.alt td {[monochrome?"border-top-width: 2px":"background-color: #DEF"]}
-	</style></head>
-	<table class="manifest" width='350px'>
-	<tr class='head'><th>Name</th><th>Rank</th><th>Activity</th></tr>
-	"}
-	var/even = 0
-	// sort mobs
-	for(var/datum/data/record/t in data_core.general)
-		var/name = t.fields["name"]
-		var/rank = t.fields["rank"]
-		var/real_rank = make_list_rank(t.fields["real_rank"])
-
-		if(OOC)
-			var/active = 0
-			for(var/mob/M in player_list)
-				if(M.real_name == name && M.client && M.client.inactivity <= 10 * 60 * 10)
-					active = 1
-					break
-			isactive[name] = active ? "Active" : "Inactive"
-		else
-			isactive[name] = t.fields["p_stat"]
-			//world << "[name]: [rank]"
-			//cael - to prevent multiple appearances of a player/job combination, add a continue after each line
-		var/department = 0
-		if(real_rank in command_positions)
-			heads[name] = rank
-			department = 1
-		if(real_rank in security_positions)
-			sec[name] = rank
-			department = 1
-		if(real_rank in engineering_positions)
-			eng[name] = rank
-			department = 1
-		if(real_rank in medical_positions)
-			med[name] = rank
-			department = 1
-		if(real_rank in science_positions)
-			sci[name] = rank
-			department = 1
-		if(real_rank in civilian_positions)
-			civ[name] = rank
-			department = 1
-		if(real_rank in nonhuman_positions)
-			bot[name] = rank
-			department = 1
-		if(!department && !(name in heads))
-			misc[name] = rank
-	if(heads.len > 0)
-		dat += "<tr><th colspan=3>Heads</th></tr>"
-		for(name in heads)
-			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[heads[name]]</td><td>[isactive[name]]</td></tr>"
-			even = !even
-	if(sec.len > 0)
-		dat += "<tr><th colspan=3>Security</th></tr>"
-		for(name in sec)
-			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[sec[name]]</td><td>[isactive[name]]</td></tr>"
-			even = !even
-	if(eng.len > 0)
-		dat += "<tr><th colspan=3>Engineering</th></tr>"
-		for(name in eng)
-			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[eng[name]]</td><td>[isactive[name]]</td></tr>"
-			even = !even
-	if(med.len > 0)
-		dat += "<tr><th colspan=3>Medical</th></tr>"
-		for(name in med)
-			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[med[name]]</td><td>[isactive[name]]</td></tr>"
-			even = !even
-	if(sci.len > 0)
-		dat += "<tr><th colspan=3>Science</th></tr>"
-		for(name in sci)
-			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[sci[name]]</td><td>[isactive[name]]</td></tr>"
-			even = !even
-	if(civ.len > 0)
-		dat += "<tr><th colspan=3>Civilian</th></tr>"
-		for(name in civ)
-			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[civ[name]]</td><td>[isactive[name]]</td></tr>"
-			even = !even
-	// in case somebody is insane and added them to the manifest, why not
-	if(bot.len > 0)
-		dat += "<tr><th colspan=3>Silicon</th></tr>"
-		for(name in bot)
-			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[bot[name]]</td><td>[isactive[name]]</td></tr>"
-			even = !even
-	// misc guys
-	if(misc.len > 0)
-		dat += "<tr><th colspan=3>Miscellaneous</th></tr>"
-		for(name in misc)
-			dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[misc[name]]</td><td>[isactive[name]]</td></tr>"
-			even = !even
-
-	dat += "</table>"
-	dat = replacetext(dat, "\n", "") // so it can be placed on paper correctly
-	dat = replacetext(dat, "\t", "")
-	return dat
-
-
 /var/list/acting_rank_prefixes = list("acting", "temporary", "interim", "provisional")

 /proc/make_list_rank(rank)
@@ -179,13 +58,13 @@
 We can't just insert in HTML into the nanoUI so we need the raw data to play with.
 Instead of creating this list over and over when someone leaves their PDA open to the page
 we'll only update it when it changes.  The PDA_Manifest global list is zeroed out upon any change
-using /obj/effect/datacore/proc/manifest_inject( ), or manifest_insert( )
+using /datum/datacore/proc/manifest_inject( ), or manifest_insert( )
 */

 var/global/list/PDA_Manifest = list()
 var/global/ManifestJSON

-/obj/effect/datacore/proc/get_manifest_json()
+/datum/datacore/proc/get_manifest_json()
 	if(PDA_Manifest.len)
 		return
 	var/heads[0]
@@ -241,7 +241,6 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2.0
-	flags = NOSHIELD
 	attack_verb = list("bludgeoned", "whacked", "disciplined")

 /obj/item/weapon/staff/broom
@@ -268,7 +267,6 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2.0
-	flags = NOSHIELD

 /obj/item/weapon/wire
 	desc = "This is just a simple piece of regular insulated wire."
@@ -599,4 +597,4 @@
 	desc = "Instant research tool. For testing purposes only."
 	icon = 'icons/obj/stock_parts.dmi'
 	icon_state = "smes_coil"
-	origin_tech = list(TECH_MATERIAL = 19, TECH_ENGINERING = 19, TECH_PHORON = 19, TECH_POWER = 19, TECH_BLUESPACE = 19, TECH_BIO = 19, TECH_COMBAT = 19, TECH_MAGNET = 19, TECH_DATA = 19, TECH_ILLEGAL = 19, TECH_ARCANE = 19)
+	origin_tech = list(TECH_MATERIAL = 19, TECH_ENGINEERING = 19, TECH_PHORON = 19, TECH_POWER = 19, TECH_BLUESPACE = 19, TECH_BIO = 19, TECH_COMBAT = 19, TECH_MAGNET = 19, TECH_DATA = 19, TECH_ILLEGAL = 19, TECH_ARCANE = 19)
@@ -117,3 +117,18 @@ datum/announcement/proc/Log(message as text, message_title as text)
 /proc/GetNameAndAssignmentFromId(var/obj/item/weapon/card/id/I)
 	// Format currently matches that of newscaster feeds: Registered Name (Assigned Rank)
 	return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name
+
+/proc/level_seven_announcement()
+	command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
+
+/proc/ion_storm_announcement()
+	command_announcement.Announce("It has come to our attention that the station passed through an ion storm.  Please monitor all electronic equipment for malfunctions.", "Anomaly Alert")
+
+/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank, var/join_message)
+	if (ticker.current_state == GAME_STATE_PLAYING)
+		if(character.mind.role_alt_title)
+			rank = character.mind.role_alt_title
+		AnnounceArrivalSimple(character.real_name, rank, join_message)
+
+/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "has arrived on the station")
+	global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer")
@@ -72,7 +72,7 @@ mob/proc/handle_regular_hud_updates() //Used in the life.dm of mobs that can use
 mob/proc/in_view(var/turf/T)
 	return view(T)

-/mob/aiEye/in_view(var/turf/T)
+/mob/eye/in_view(var/turf/T)
 	var/list/viewed = new
 	for(var/mob/living/carbon/human/H in mob_list)
 		if(get_dist(H, T) <= 7)
@@ -1,48 +0,0 @@
-/proc/CreateGeneralRecord()
-	var/mob/living/carbon/human/dummy = new()
-	dummy.mind = new()
-	var/icon/front = new(get_id_photo(dummy), dir = SOUTH)
-	var/icon/side = new(get_id_photo(dummy), dir = WEST)
-	var/datum/data/record/G = new /datum/data/record()
-	G.fields["name"] = "New Record"
-	G.fields["id"] = text("[]", add_zero(num2hex(rand(1, 1.6777215E7)), 6))
-	G.fields["rank"] = "Unassigned"
-	G.fields["real_rank"] = "Unassigned"
-	G.fields["sex"] = "Male"
-	G.fields["age"] = "Unknown"
-	G.fields["fingerprint"] = "Unknown"
-	G.fields["p_stat"] = "Active"
-	G.fields["m_stat"] = "Stable"
-	G.fields["species"] = "Human"
-	G.fields["home_system"]	= "Unknown"
-	G.fields["citizenship"]	= "Unknown"
-	G.fields["faction"]		= "Unknown"
-	G.fields["religion"]	= "Unknown"
-	G.fields["photo_front"]	= front
-	G.fields["photo_side"]	= side
-	data_core.general += G
-
-	qdel(dummy)
-	return G
-
-/proc/CreateSecurityRecord(var/name as text, var/id as text)
-	var/datum/data/record/R = new /datum/data/record()
-	R.fields["name"] = name
-	R.fields["id"] = id
-	R.name = text("Security Record #[id]")
-	R.fields["criminal"] = "None"
-	R.fields["mi_crim"] = "None"
-	R.fields["mi_crim_d"] = "No minor crime convictions."
-	R.fields["ma_crim"] = "None"
-	R.fields["ma_crim_d"] = "No major crime convictions."
-	R.fields["notes"] = "No notes."
-	data_core.security += R
-	return R
-
-/proc/find_security_record(field, value)
-	return find_record(field, value, data_core.security)
-
-/proc/find_record(field, value, list/L)
-	for(var/datum/data/record/R in L)
-		if(R.fields[field] == value)
-			return R
@@ -59,20 +59,23 @@

 /datum/antagonist/proc/get_candidates(var/ghosts_only)
 	candidates = list() // Clear.
-	candidates = ticker.mode.get_players_for_role(role_type, id)
+	
 	// Prune restricted status. Broke it up for readability.
 	// Note that this is done before jobs are handed out.
-	for(var/datum/mind/player in candidates)
+	for(var/datum/mind/player in ticker.mode.get_players_for_role(role_type, id))
 		if(ghosts_only && !istype(player.current, /mob/dead))
-			candidates -= player
+			log_debug("[key_name(player)] is not eligible to become a [role_text]: Only ghosts may join as this role!")
 		else if(player.special_role)
-			candidates -= player
+			log_debug("[key_name(player)] is not eligible to become a [role_text]: They already have a special role ([player.special_role])!")
 		else if (player in pending_antagonists)
-			candidates -= player
+			log_debug("[key_name(player)] is not eligible to become a [role_text]: They have already been selected for this role!")
 		else if(!can_become_antag(player))
-			candidates -= player
+			log_debug("[key_name(player)] is not eligible to become a [role_text]: They are blacklisted for this role!")
 		else if(player_is_antag(player))
-			candidates -= player
+			log_debug("[key_name(player)] is not eligible to become a [role_text]: They are already an antagonist!")
+		else
+			candidates += player
+
 	return candidates

 /datum/antagonist/proc/attempt_random_spawn()
@@ -108,6 +111,7 @@
 		return 0

 	//Grab candidates randomly until we have enough.
+	candidates = shuffle(candidates)
 	while(candidates.len && pending_antagonists.len < cur_max)
 		var/datum/mind/player = pick(candidates)
 		candidates -= player
@@ -118,6 +122,7 @@
 /datum/antagonist/proc/draft_antagonist(var/datum/mind/player)
 	//Check if the player can join in this antag role, or if the player has already been given an antag role.
 	if(!can_become_antag(player) || player.special_role)
+		log_debug("[player.key] was selected for [role_text] by lottery, but is not allowed to be that role.")
 		return 0

 	pending_antagonists |= player
@@ -34,10 +34,9 @@

 	var/obj/item/weapon/card/id/W = new id_type(player)
 	if(!W) return
-	W.name = "[player.real_name]'s ID Card"
 	W.access |= default_access
 	W.assignment = "[assignment]"
-	W.registered_name = player.real_name
+	W.set_owner_info(player)
 	if(equip) player.equip_to_slot_or_del(W, slot_wear_id)
 	return W

@@ -86,7 +85,7 @@
 			code_owner.store_memory("<B>Nuclear Bomb Code</B>: [code]", 0, 0)
 			code_owner.current << "The nuclear authorization code is: <B>[code]</B>"
 	else
-		world << "<span class='danger'>Could not spawn nuclear bomb. Contact a developer.</span>"
+		message_admins("<span class='danger'>Could not spawn nuclear bomb. Contact a developer.</span>")
 		return

 	spawned_nuke = code
@@ -2,9 +2,9 @@
 	if(player.current && jobban_isbanned(player.current, bantype))
 		return 0
 	if(!ignore_role)
-		if(player.assigned_role in protected_jobs)
+		if(player.assigned_role in restricted_jobs)
 			return 0
-		if(config.protect_roles_from_antagonist && (player.assigned_role in restricted_jobs))
+		if(config.protect_roles_from_antagonist && (player.assigned_role in protected_jobs))
 			return 0
 	return 1

@@ -6,6 +6,7 @@ var/datum/antagonist/deathsquad/mercenary/commandos
 	role_text = "Syndicate Commando"
 	role_text_plural = "Commandos"
 	welcome_text = "You are in the employ of a criminal syndicate hostile to NanoTrasen."
+	id_type = /obj/item/weapon/card/id/centcom/ERT

 /datum/antagonist/deathsquad/mercenary/New()
 	..(1)
@@ -24,7 +25,6 @@ var/datum/antagonist/deathsquad/mercenary/commandos
 	player.equip_to_slot_or_del(new /obj/item/weapon/rig/merc(player), slot_back)
 	player.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(player), slot_r_hand)

-	var/obj/item/weapon/card/id/id = create_id("Commando", player)
-	id.access |= get_all_station_access()
-	id.icon_state = "centcom"
-	create_radio(SYND_FREQ, player)
+	create_id("Commando", player)
+	create_radio(SYND_FREQ, player)
+	return 1
@@ -11,6 +11,7 @@ var/datum/antagonist/ert/ert
 	max_antags = 5
 	max_antags_round = 5 // ERT mode?
 	landmark_id = "Response Team"
+	id_type = /obj/item/weapon/card/id/centcom/ERT

 	flags = ANTAG_OVERRIDE_JOB | ANTAG_SET_APPEARANCE | ANTAG_HAS_LEADER | ANTAG_CHOOSE_NAME

@@ -36,10 +37,6 @@ var/datum/antagonist/ert/ert
 	player.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(src), slot_shoes)
 	player.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(src), slot_gloves)
 	player.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
-
-	var/obj/item/weapon/card/id/centcom/ERT/W = new(src)
-	W.registered_name = player.real_name
-	W.name = "[player.real_name]'s ID Card ([W.assignment])"
-	player.equip_to_slot_or_del(W, slot_wear_id)
-
+	
+	create_id(role_text, player)
 	return 1
@@ -184,7 +184,7 @@ var/datum/antagonist/raider/raiders
 		return 0

 	for(var/datum/mind/player in current_antagonists)
-		if(!player.current || get_area(player.current) != locate(/area/shuttle/skipjack/station))
+		if(!player.current || get_area(player.current) != locate(/area/skipjack_station/start))
 			return 0
 	return 1

@@ -135,10 +135,10 @@ datum/antagonist/revolutionary/finalize(var/datum/mind/target)
 	world << text

 // This is a total redefine because headrevs are greeted differently to subrevs.
-/datum/antagonist/revolutionary/add_antagonist(var/datum/mind/player)
+/datum/antagonist/revolutionary/add_antagonist(var/datum/mind/player, var/ignore_role)
 	if((player in current_antagonists) || (player in head_revolutionaries))
 		return 0
-	if(!can_become_antag(player))
+	if(!can_become_antag(player, ignore_role))
 		return 0
 	current_antagonists |= player
 	player.current << "<span class='danger'><font size=3>You are a Revolutionary!</font></span>"
@@ -168,11 +168,6 @@ datum/antagonist/revolutionary/finalize(var/datum/mind/target)
 		if(show_message)
 			player.current.visible_message("[player.current] looks like they just remembered their real allegiance!")

-/datum/antagonist/revolutionary/can_become_antag(var/datum/mind/player)
-	return ..() && istype(player) && \
-		istype(player.current, /mob/living/carbon/human) && \
-		!(player.assigned_role in command_positions)
-
 // Used by RP-rev.
 /mob/living/carbon/human/proc/convert_to_rev(mob/M as mob in oview(src))
 	set name = "Convert Bourgeoise"
@@ -52,7 +52,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	var/air_doors_activated = 0
 	var/list/ambience = list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg')
 	var/list/forced_ambience = null
-	var/sound_env = 2	//reverb preset for sounds played in this area, see sound datum reference for more
+	var/sound_env = STANDARD_STATION
 /*Adding a wizard area teleport list because motherfucking lag -- Urist*/
 /*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
 var/list/teleportlocs = list()
@@ -142,6 +142,7 @@ area/space/atmosalert()

 /area/shuttle
 	requires_power = 0
+	sound_env = SMALL_ENCLOSED

 /area/shuttle/arrival
 	name = "\improper Arrival Shuttle"
@@ -319,11 +320,6 @@ area/space/atmosalert()
 /area/shuttle/research/outpost
 	icon_state = "shuttle"

-/area/shuttle/skipjack/station
-	name = "\improper Skipjack"
-	icon_state = "yellow"
-	requires_power = 0
-
 /area/airtunnel1/      // referenced in airtunnel.dm:759

 /area/dummy/           // Referenced in engine.dm:261
@@ -402,15 +398,18 @@ area/space/atmosalert()
 	name = "\improper Moon"
 	icon_state = "asteroid"
 	requires_power = 0
+	sound_env = ASTEROID

 /area/asteroid/cave				// -- TLE
 	name = "\improper Moon - Underground"
 	icon_state = "cave"
 	requires_power = 0
+	sound_env = ASTEROID

 /area/asteroid/artifactroom
 	name = "\improper Moon - Artifact"
 	icon_state = "cave"
+	sound_env = SMALL_ENCLOSED



@@ -436,6 +435,7 @@ area/space/atmosalert()
 	icon_state = "thunder"
 	requires_power = 0
 	lighting_use_dynamic = 0
+	sound_env = ARENA

 /area/tdome/tdome1
 	name = "\improper Thunderdome (Team 1)"
@@ -516,8 +516,16 @@ area/space/atmosalert()
 	requires_power = 0
 	lighting_use_dynamic = 0

-/area/skipjack_station/transit
+/area/skipjack_station
+	name = "\improper Skipjack"
+	icon_state = "yellow"
+	requires_power = 0

+/area/skipjack_station/start
+	name = "\improper Skipjack"
+	icon_state = "yellow"
+
+/area/skipjack_station/transit
 	name = "\improper hyperspace"
 	icon_state = "shuttle"

@@ -632,6 +640,7 @@ area/space/atmosalert()

 /area/maintenance
 	flags = RAD_SHIELDED
+	sound_env = TUNNEL_ENCLOSED

 /area/maintenance/aft
 	name = "Aft Maintenance"
@@ -766,6 +775,7 @@ area/space/atmosalert()
 /area/maintenance/substation
 	name = "Substation"
 	icon_state = "substation"
+	sound_env = SMALL_ENCLOSED

 /area/maintenance/substation/engineering // Probably will be connected to engineering SMES room, as wires cannot be crossed properly without them sharing powernets.
 	name = "Engineering Substation"
@@ -798,7 +808,7 @@ area/space/atmosalert()
 //Hallway

 /area/hallway/primary/
-	sound_env = 12 //hallway
+	sound_env = LARGE_ENCLOSED

 /area/hallway/primary/fore
 	name = "\improper Fore Primary Hallway"
@@ -863,10 +873,12 @@ area/space/atmosalert()
 	name = "\improper Heads of Staff Meeting Room"
 	icon_state = "bridge"
 	music = null
+	sound_env = MEDIUM_SOFTFLOOR

 /area/crew_quarters/captain
 	name = "\improper Command - Captain's Office"
 	icon_state = "captain"
+	sound_env = MEDIUM_SOFTFLOOR

 /area/crew_quarters/heads/hop
 	name = "\improper Command - HoP's Office"
@@ -914,6 +926,7 @@ area/space/atmosalert()
 /area/crew_quarters/toilet
 	name = "\improper Dormitory Toilets"
 	icon_state = "toilet"
+	sound_env = SMALL_ENCLOSED

 /area/crew_quarters/sleep
 	name = "\improper Dormitories"
@@ -922,10 +935,12 @@ area/space/atmosalert()
 /area/crew_quarters/sleep/engi_wash
 	name = "\improper Engineering Washroom"
 	icon_state = "toilet"
+	sound_env = SMALL_ENCLOSED

 /area/crew_quarters/sleep/bedrooms
 	name = "\improper Dormitory Bedroom One"
 	icon_state = "Sleep"
+	sound_env = SMALL_SOFTFLOOR

 /area/crew_quarters/sleep/cryo
 	name = "\improper Cryogenic Storage"
@@ -938,6 +953,7 @@ area/space/atmosalert()
 /area/crew_quarters/sleep_male/toilet_male
 	name = "\improper Male Toilets"
 	icon_state = "toilet"
+	sound_env = SMALL_ENCLOSED

 /area/crew_quarters/sleep_female
 	name = "\improper Female Dorm"
@@ -946,6 +962,7 @@ area/space/atmosalert()
 /area/crew_quarters/sleep_female/toilet_female
 	name = "\improper Female Toilets"
 	icon_state = "toilet"
+	sound_env = SMALL_ENCLOSED

 /area/crew_quarters/locker
 	name = "\improper Locker Room"
@@ -954,6 +971,7 @@ area/space/atmosalert()
 /area/crew_quarters/locker/locker_toilet
 	name = "\improper Locker Toilets"
 	icon_state = "toilet"
+	sound_env = SMALL_ENCLOSED

 /area/crew_quarters/fitness
 	name = "\improper Fitness Room"
@@ -970,19 +988,23 @@ area/space/atmosalert()
 /area/crew_quarters/bar
 	name = "\improper Bar"
 	icon_state = "bar"
+	sound_env = LARGE_SOFTFLOOR

 /area/crew_quarters/theatre
 	name = "\improper Theatre"
 	icon_state = "Theatre"
+	sound_env = LARGE_SOFTFLOOR

 /area/library
 	name = "\improper Library"
 	icon_state = "library"
+ 	sound_env = LARGE_SOFTFLOOR

 /area/chapel/main
 	name = "\improper Chapel"
 	icon_state = "chapel"
 	ambience = list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg','sound/music/traitor.ogg')
+	sound_env = LARGE_ENCLOSED

 /area/chapel/office
 	name = "\improper Chapel Office"
@@ -999,6 +1021,7 @@ area/space/atmosalert()
 	name = "\improper Holodeck"
 	icon_state = "Holodeck"
 	lighting_use_dynamic = 0
+	sound_env = LARGE_ENCLOSED

 /area/holodeck/alphadeck
 	name = "\improper Holodeck Alpha"
@@ -1008,21 +1031,27 @@ area/space/atmosalert()

 /area/holodeck/source_emptycourt
 	name = "\improper Holodeck - Empty Court"
+	sound_env = ARENA

 /area/holodeck/source_boxingcourt
 	name = "\improper Holodeck - Boxing Court"
+	sound_env = ARENA

 /area/holodeck/source_basketball
 	name = "\improper Holodeck - Basketball Court"
+	sound_env = ARENA

 /area/holodeck/source_thunderdomecourt
 	name = "\improper Holodeck - Thunderdome Court"
+	sound_env = ARENA

 /area/holodeck/source_courtroom
 	name = "\improper Holodeck - Courtroom"
+	sound_env = AUDITORIUM

 /area/holodeck/source_beach
 	name = "\improper Holodeck - Beach"
+	sound_env = PLAIN

 /area/holodeck/source_burntest
 	name = "\improper Holodeck - Atmospheric Burn Test"
@@ -1032,22 +1061,28 @@ area/space/atmosalert()

 /area/holodeck/source_meetinghall
 	name = "\improper Holodeck - Meeting Hall"
+	sound_env = AUDITORIUM

 /area/holodeck/source_theatre
 	name = "\improper Holodeck - Theatre"
+	sound_env = CONCERT_HALL

 /area/holodeck/source_picnicarea
 	name = "\improper Holodeck - Picnic Area"
+	sound_env = PLAIN

 /area/holodeck/source_snowfield
 	name = "\improper Holodeck - Snow Field"
+	sound_env = FOREST

 /area/holodeck/source_desert
 	name = "\improper Holodeck - Desert"
+	sound_env = PLAIN

 /area/holodeck/source_space
 	name = "\improper Holodeck - Space"
 	has_gravity = 0
+	sound_env = SPACE

 //Engineering

@@ -1059,26 +1094,32 @@ area/space/atmosalert()
 /area/engineering/atmos
 	name = "\improper Atmospherics"
 	icon_state = "atmos"
+ 	sound_env = LARGE_ENCLOSED

 /area/engineering/atmos/monitoring
 	name = "\improper Atmospherics Monitoring Room"
 	icon_state = "atmos_monitoring"
+	sound_env = STANDARD_STATION

 /area/engineering/atmos/storage
 	name = "\improper Atmospherics Storage"
 	icon_state = "atmos_storage"
+	sound_env = SMALL_ENCLOSED

 /area/engineering/drone_fabrication
 	name = "\improper Engineering Drone Fabrication"
 	icon_state = "drone_fab"
+	sound_env = SMALL_ENCLOSED

 /area/engineering/engine_smes
 	name = "\improper Engineering SMES"
 	icon_state = "engine_smes"
+	sound_env = SMALL_ENCLOSED

 /area/engineering/engine_room
 	name = "\improper Engine Room"
 	icon_state = "engine"
+	sound_env = LARGE_ENCLOSED

 /area/engineering/engine_airlock
 	name = "\improper Engine Room Airlock"
@@ -1107,6 +1148,7 @@ area/space/atmosalert()
 /area/engineering/break_room
 	name = "\improper Engineering Break Room"
 	icon_state = "engineering_break"
+	sound_env = MEDIUM_SOFTFLOOR

 /area/engineering/engine_eva
 	name = "\improper Engine EVA"
@@ -1156,22 +1198,27 @@ area/space/atmosalert()
 /area/maintenance/auxsolarport
 	name = "Solar Maintenance - Fore Port"
 	icon_state = "SolarcontrolP"
+	sound_env = SMALL_ENCLOSED

 /area/maintenance/starboardsolar
 	name = "Solar Maintenance - Aft Starboard"
 	icon_state = "SolarcontrolS"
+	sound_env = SMALL_ENCLOSED

 /area/maintenance/portsolar
 	name = "Solar Maintenance - Aft Port"
 	icon_state = "SolarcontrolP"
+	sound_env = SMALL_ENCLOSED

 /area/maintenance/auxsolarstarboard
 	name = "Solar Maintenance - Fore Starboard"
 	icon_state = "SolarcontrolS"
+	sound_env = SMALL_ENCLOSED

 /area/maintenance/foresolar
 	name = "Solar Maintenance - Fore"
 	icon_state = "SolarcontrolA"
+	sound_env = SMALL_ENCLOSED

 /area/assembly/chargebay
 	name = "\improper Mech Bay"
@@ -1383,6 +1430,7 @@ area/space/atmosalert()
 /area/security/detectives_office
 	name = "\improper Security - Forensic Office"
 	icon_state = "detective"
+	sound_env = MEDIUM_SOFTFLOOR

 /area/security/range
 	name = "\improper Security - Firing Range"
@@ -1457,6 +1505,7 @@ area/space/atmosalert()
 /area/quartermaster/storage
 	name = "\improper Cargo Bay"
 	icon_state = "quartstorage"
+	sound_env = LARGE_ENCLOSED

 /area/quartermaster/qm
 	name = "\improper Cargo - Quartermaster's Office"
@@ -1807,10 +1856,12 @@ area/space/atmosalert()
 	name = "AI Upload Access"
 	icon_state = "ai_foyer"
 	ambience = list('sound/ambience/ambimalf.ogg')
+	sound_env = SMALL_ENCLOSED

 /area/turret_protected/ai_server_room
 	name = "Messaging Server Room"
 	icon_state = "ai_server"
+	sound_env = SMALL_ENCLOSED

 /area/turret_protected/ai
 	name = "\improper AI Chamber"
@@ -1820,6 +1871,7 @@ area/space/atmosalert()
 /area/turret_protected/ai_cyborg_station
 	name = "\improper Cyborg Station"
 	icon_state = "ai_cyborg"
+	sound_env = SMALL_ENCLOSED

 /area/turret_protected/aisat
 	name = "\improper AI Satellite"
@@ -67,7 +67,7 @@
 		for(var/obj/machinery/door/firedoor/E in all_doors)
 			if(!E.blocked)
 				if(E.operating)
-					E.nextstate = CLOSED
+					E.nextstate = FIREDOOR_CLOSED
 				else if(!E.density)
 					spawn(0)
 						E.close()
@@ -78,7 +78,7 @@
 		for(var/obj/machinery/door/firedoor/E in all_doors)
 			if(!E.blocked)
 				if(E.operating)
-					E.nextstate = OPEN
+					E.nextstate = FIREDOOR_OPEN
 				else if(E.density)
 					spawn(0)
 						E.open()
@@ -92,7 +92,7 @@
 		for(var/obj/machinery/door/firedoor/D in all_doors)
 			if(!D.blocked)
 				if(D.operating)
-					D.nextstate = CLOSED
+					D.nextstate = FIREDOOR_CLOSED
 				else if(!D.density)
 					spawn()
 						D.close()
@@ -105,7 +105,7 @@
 		for(var/obj/machinery/door/firedoor/D in all_doors)
 			if(!D.blocked)
 				if(D.operating)
-					D.nextstate = OPEN
+					D.nextstate = FIREDOOR_OPEN
 				else if(D.density)
 					spawn(0)
 					D.open()
@@ -137,7 +137,7 @@
 		for(var/obj/machinery/door/firedoor/D in src)
 			if(!D.blocked)
 				if(D.operating)
-					D.nextstate = OPEN
+					D.nextstate = FIREDOOR_OPEN
 				else if(D.density)
 					spawn(0)
 					D.open()
@@ -266,8 +266,8 @@ var/list/mob/living/forced_ambiance_list = new

 	for(var/mob/M in A)
 		if(has_gravity)
-			thunk(M)
-		M.update_floating( M.Check_Dense_Object() )
+			thunk(M)
+		M.update_floating( M.Check_Dense_Object() )

 /area/proc/thunk(mob)
 	if(istype(get_turf(mob), /turf/space)) // Can't fall onto nothing.
@@ -275,7 +275,7 @@ var/list/mob/living/forced_ambiance_list = new

 	if(istype(mob,/mob/living/carbon/human/))
 		var/mob/living/carbon/human/H = mob
-		if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.flags & NOSLIP))
+		if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.item_flags & NOSLIP))
 			return

 		if(H.m_intent == "run")
@@ -3,7 +3,7 @@
 /area/mine
 	icon_state = "mining"
 	music = 'sound/ambience/song_game.ogg'
-	sound_env = 5 //stoneroom
+	sound_env = ASTEROID

 /area/mine/explored
 	name = "Mine"
@@ -24,7 +24,7 @@ proc/spawn_room(var/atom/start_loc,var/x_size,var/y_size,var/wall,var/floor , va
 	if(!wall)
 		wall = pick(/turf/simulated/wall/r_wall,/turf/simulated/wall,/obj/effect/alien/resin)
 	if(!floor)
-		floor = pick(/turf/simulated/floor,/turf/simulated/floor/engine)
+		floor = pick(/turf/simulated/floor,/turf/simulated/floor/tiled,/turf/simulated/floor/reinforced)

 	for(var/x = 0,x<x_size,x++)
 		for(var/y = 0,y<y_size,y++)
@@ -76,9 +76,9 @@ proc/admin_spawn_room_at_pos()
 			wall=/obj/effect/alien/resin
 	switch(alert("Floor type",null,"Regular floor","Reinforced floor"))
 		if("Regular floor")
-			floor=/turf/simulated/floor
+			floor=/turf/simulated/floor/tiled
 		if("Reinforced floor")
-			floor=/turf/simulated/floor/engine
+			floor=/turf/simulated/floor/reinforced
 	if(x && y && z && wall && floor && x_len && y_len)
 		spawn_room(locate(x,y,z),x_len,y_len,wall,floor,clean)
 	return
@@ -35,7 +35,7 @@
 	else
 		return null

-//return flags that should be added to the viewer's sight var. 
+//return flags that should be added to the viewer's sight var.
 //Otherwise return a negative number to indicate that the view should be cancelled.
 /atom/proc/check_eye(user as mob)
 	if (istype(user, /mob/living/silicon/ai)) // WHYYYY
@@ -66,6 +66,8 @@
 /atom/proc/CheckExit()
 	return 1

+// If you want to use this, the atom must have the PROXMOVE flag, and the moving
+// atom must also have the PROXMOVE flag currently to help with lag. ~ ComicIronic
 /atom/proc/HasProximity(atom/movable/AM as mob|obj)
 	return

@@ -213,7 +215,7 @@ its easier to just keep the beam vertical.

 /atom/proc/ex_act()
 	return
-	
+
 /atom/proc/emag_act(var/remaining_charges, var/mob/user, var/emag_source)
 	return -1

@@ -1,6 +1,6 @@
 // Returns the lowest turf available on a given Z-level, defaults to space.
 var/global/list/base_turf_by_z = list(
-	"5" = /turf/simulated/floor/plating/airless/asteroid // Moonbase.
+	"5" = /turf/simulated/floor/asteroid // Moonbase.
 	)

 proc/get_base_turf(var/z)
@@ -35,8 +35,7 @@
 	icon_state = "culthood"
 	desc = "A hood worn by the followers of Nar-Sie."
 	flags_inv = HIDEFACE
-	flags = HEADCOVERSEYES
-	body_parts_covered = HEAD|EYES
+	body_parts_covered = HEAD
 	armor = list(melee = 30, bullet = 10, laser = 5,energy = 5, bomb = 0, bio = 0, rad = 0)
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
@@ -49,8 +48,7 @@
 	name = "magus helm"
 	icon_state = "magus"
 	desc = "A helm worn by the followers of Nar-Sie."
-	flags_inv = HIDEFACE
-	flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
+	flags_inv = HIDEFACE | BLOCKHAIR
 	body_parts_covered = HEAD|FACE|EYES

 /obj/item/clothing/head/culthood/alt
@@ -127,11 +127,6 @@
 		T.ChangeTurf(/turf/simulated/wall/cult)
 	..()

-/obj/structure/stool/cultify()
-	var/obj/structure/bed/chair/wood/wings/I = new(loc)
-	I.dir = dir
-	..()
-
 /obj/structure/table/cultify()
 	// Make it a wood-reinforced wooden table.
 	// There are cult materials available, but it'd make the table non-deconstructable with how holotables work.
@@ -3,11 +3,9 @@
 	return

 /turf/simulated/floor/cultify()
+	//todo: flooring datum cultify check
 	cultify_floor()

-/turf/simulated/floor/carpet/cultify()
-	return
-
 /turf/simulated/shuttle/floor/cultify()
 	cultify_floor()

@@ -39,8 +37,6 @@
 	if((icon_state != "cult")&&(icon_state != "cult-narsie"))
 		name = "engraved floor"
 		icon_state = "cult"
-		turf_animation('icons/effects/effects.dmi',"cultfloor",0,0,MOB_LAYER-1)

 /turf/proc/cultify_wall()
 	ChangeTurf(/turf/unsimulated/wall/cult)
-	turf_animation('icons/effects/effects.dmi',"cultwall",0,0,MOB_LAYER-1)
@@ -144,6 +144,7 @@ var/global/list/narsie_list = list()
 	if(!(istype(T, /turf/simulated/wall/cult)||istype(T, /turf/space)))
 		if(T.icon_state != "cult-narsie")
 			T.desc = "something that goes beyond your understanding went this way"
+			T.icon = 'icons/turf/flooring/cult.dmi'
 			T.icon_state = "cult-narsie"
 			T.set_light(1)

@@ -432,32 +432,26 @@ var/global/list/additional_antag_types = list()
 	if(!antag_template)
 		return candidates

-	var/roletext
 	// Assemble a list of active players without jobbans.
 	for(var/mob/new_player/player in player_list)
 		if( player.client && player.ready )
-			if(!(jobban_isbanned(player, "Syndicate") || jobban_isbanned(player, antag_template.bantype)))
-				players += player
-
-	// Shuffle the players list so that it becomes ping-independent.
-	players = shuffle(players)
+			players += player

 	// Get a list of all the people who want to be the antagonist for this round
 	for(var/mob/new_player/player in players)
 		if(!role || (player.client.prefs.be_special & role))
-			log_debug("[player.key] had [roletext] enabled, so we are drafting them.")
+			log_debug("[player.key] had [antag_id] enabled, so we are drafting them.")
 			candidates += player.mind
 			players -= player

 	// If we don't have enough antags, draft people who voted for the round.
 	if(candidates.len < required_enemies)
-		for(var/key in round_voters)
-			for(var/mob/new_player/player in players)
-				if(player.ckey == key)
-					log_debug("[player.key] voted for this round, so we are drafting them.")
-					candidates += player.mind
-					players -= player
-					break
+		for(var/mob/new_player/player in players)
+			if(player.ckey in round_voters)
+				log_debug("[player.key] voted for this round, so we are drafting them.")
+				candidates += player.mind
+				players -= player
+				break

 	return candidates		// Returns: The number of people who had the antagonist role set to yes, regardless of recomended_enemies, if that number is greater than required_enemies
 							//			required_enemies if the number of people with that role set to yes is less than recomended_enemies,
@@ -490,12 +484,14 @@ var/global/list/additional_antag_types = list()
 			if(antag)
 				antag_templates |= antag

+	/*
 	if(antag_templates && antag_templates.len)
 		for(var/datum/antagonist/antag in antag_templates)
 			if(antag.flags & (ANTAG_OVERRIDE_JOB|ANTAG_RANDSPAWN))
 				continue
 			antag_templates -= antag
 			world << "<span class='danger'>[antag.role_text_plural] are invalid for additional roundtype antags!</span>"
+	*/

 	newscaster_announcements = pick(newscaster_standard_feeds)

@@ -728,7 +728,7 @@ datum/objective/heist/kidnap
 			//if (!target.current.restrained())
 			//	return 0 // They're loose. Close but no cigar.

-			var/area/shuttle/skipjack/station/A = locate()
+			var/area/skipjack_station/start/A = locate()
 			for(var/mob/living/carbon/human/M in A)
 				if(target.current == M)
 					return 1 //They're restrained on the shuttle. Success.
@@ -779,7 +779,7 @@ datum/objective/heist/loot

 		var/total_amount = 0

-		for(var/obj/O in locate(/area/shuttle/skipjack/station))
+		for(var/obj/O in locate(/area/skipjack_station/start))
 			if(istype(O,target)) total_amount++
 			for(var/obj/I in O.contents)
 				if(istype(I,target)) total_amount++
@@ -828,7 +828,7 @@ datum/objective/heist/salvage

 		var/total_amount = 0

-		for(var/obj/item/O in locate(/area/shuttle/skipjack/station))
+		for(var/obj/item/O in locate(/area/skipjack_station/start))

 			var/obj/item/stack/material/S
 			if(istype(O,/obj/item/stack/material))
@@ -110,7 +110,7 @@
 	selection_color = "#ffeef0"
 	economic_modifier = 5
 	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
-	minimal_access = list(access_medical, access_chemistry)
+	minimal_access = list(access_medical, access_medical_equip, access_chemistry)
 	alt_titles = list("Pharmacist")


@@ -526,10 +526,9 @@ var/global/datum/controller/occupations/job_master
 		else
 			C = new /obj/item/weapon/card/id(H)
 		if(C)
-			C.registered_name = H.real_name
 			C.rank = rank
 			C.assignment = title ? title : rank
-			C.name = "[C.registered_name]'s ID Card ([C.assignment])"
+			C.set_owner_info(H)

 			//put the player's account number onto the ID
 			if(H.mind && H.mind.initial_account)
@@ -18,7 +18,7 @@
 		Beacon.invisibility = INVISIBILITY_MAXIMUM
 		Beacon.loc = T

-		hide(T.intact)
+		hide(!T.is_plating())

 	Destroy()
 		if(Beacon)
@@ -85,10 +85,8 @@
 	if(istype(new_turf, /turf/simulated/floor))
 		var/turf/simulated/floor/T = new_turf
 		if(!T.is_plating())
-			if(!T.broken && !T.burnt)
-				new T.floor_type(T)
-			T.make_plating()
-	return !new_turf.intact
+			T.make_plating(!(T.broken || T.burnt))
+	return new_turf.is_plating()

 /obj/machinery/cablelayer/proc/layCable(var/turf/new_turf,var/M_Dir)
 	if(!on)
@@ -5,7 +5,6 @@
 	icon_state = "sleeper_0"
 	density = 1
 	anchored = 1
-	var/orient = "LEFT" // "RIGHT" changes the dir suffix to "-r"
 	var/mob/living/carbon/human/occupant = null
 	var/list/available_chemicals = list("inaprovaline" = "Inaprovaline", "stoxin" = "Soporific", "paracetamol" = "Paracetamol", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin")
 	var/obj/item/weapon/reagent_containers/glass/beaker = null
@@ -39,7 +38,7 @@
 			toggle_filter()

 /obj/machinery/sleeper/update_icon()
-	icon_state = "sleeper_[occupant ? "1" : "0"][orient == "RIGHT" ? "-r" : ""]"
+	icon_state = "sleeper_[occupant ? "1" : "0"]"

 /obj/machinery/sleeper/attack_hand(var/mob/user)
 	if(..())
@@ -153,10 +152,10 @@
 	if(occupant)
 		go_out()

-	..(severity)
+	..(severity)
 /obj/machinery/sleeper/proc/toggle_filter()
 	if(!occupant || !beaker)
-		filtering = 0
+		filtering = 0
 		return
 	filtering = !filtering

@@ -623,8 +623,8 @@

 	return min(..(), .)

-/obj/machinery/alarm/Topic(href, href_list, var/nowindow = 0, var/datum/topic_state/state)
-	if(..(href, href_list, nowindow, state))
+/obj/machinery/alarm/Topic(href, href_list, var/datum/topic_state/state)
+	if(..(href, href_list, state))
 		return 1

 	// hrefs that can always be called -walter0o
@@ -37,6 +37,11 @@
 	path = /obj/item/device/flashlight
 	category = "General"

+/datum/autolathe/recipe/floor_light
+	name = "floor light"
+	path = /obj/machinery/floor_light
+	category = "General"
+
 /datum/autolathe/recipe/extinguisher
 	name = "extinguisher"
 	path = /obj/item/weapon/extinguisher
@@ -19,7 +19,7 @@
 	brute_dam_coeff = 0.5
 	var/atom/movable/load = null		// the loaded crate (usually)
 	var/beacon_freq = 1400
-	var/control_freq = AI_FREQ
+	var/control_freq = BOT_FREQ

 	suffix = ""

@@ -1,10 +1,9 @@
 /obj/machinery/camera
-
 	var/list/motionTargets = list()
 	var/detectTime = 0
 	var/area/ai_monitored/area_motion = null
 	var/alarm_delay = 100 // Don't forget, there's another 10 seconds in queueAlarm()
-
+	flags = PROXMOVE

 /obj/machinery/camera/process()
 	// motion camera event loop
@@ -155,6 +155,11 @@
 	if(!istype(target))	return
 	var/mob/living/silicon/ai/U = usr

+	if(target == U.cameraFollow)
+		return
+
+	if(U.cameraFollow)
+		U.ai_cancel_tracking()
 	U.cameraFollow = target
 	U << "Now tracking [target.name] on camera."
 	target.tracking_initiated()
@@ -240,7 +245,8 @@ mob/living/proc/near_camera()

 /mob/living/carbon/human/tracking_status()
 	//Cameras can't track people wearing an agent card or a ninja hood.
-	if(wear_id && istype(wear_id.GetID(), /obj/item/weapon/card/id/syndicate))
+	var/obj/item/weapon/card/id/id = GetIdCard(src)
+	if(id && id.prevent_tracking())
 		return TRACKING_TERMINATE
 	if(istype(head, /obj/item/clothing/head/helmet/space/rig))
 		var/obj/item/clothing/head/helmet/space/rig/helmet = head
@@ -412,11 +412,11 @@ What a mess.*/
 //RECORD CREATE
 			if ("New Record (Security)")
 				if ((istype(active1, /datum/data/record) && !( istype(active2, /datum/data/record) )))
-					active2 = CreateSecurityRecord(active1.fields["name"], active1.fields["id"])
+					active2 = data_core.CreateSecurityRecord(active1.fields["name"], active1.fields["id"])
 					screen = 3

 			if ("New Record (General)")
-				active1 = CreateGeneralRecord()
+				active1 = data_core.CreateGeneralRecord()
 				active2 = null

 //FIELD FUNCTIONS
@@ -303,7 +303,7 @@ What a mess.*/
 			if ("New Record (General)")
 				if(PDA_Manifest.len)
 					PDA_Manifest.Cut()
-				active1 = CreateGeneralRecord()
+				active1 = data_core.CreateGeneralRecord()

 //FIELD FUNCTIONS
 			if ("Edit Field")
@@ -430,11 +430,11 @@ What a mess.*/
 //RECORD CREATE
 			if ("New Record (Security)")
 				if ((istype(active1, /datum/data/record) && !( istype(active2, /datum/data/record) )))
-					active2 = CreateSecurityRecord(active1.fields["name"], active1.fields["id"])
+					active2 = data_core.CreateSecurityRecord(active1.fields["name"], active1.fields["id"])
 					screen = 3

 			if ("New Record (General)")
-				active1 = CreateGeneralRecord()
+				active1 = data_core.CreateGeneralRecord()
 				active2 = null

 //FIELD FUNCTIONS
@@ -2,8 +2,8 @@

 /obj/machinery/atmospherics/unary/cryo_cell
 	name = "cryo cell"
-	icon = 'icons/obj/cryogenics.dmi'
-	icon_state = "pod0"
+	icon = 'icons/obj/cryogenics.dmi' // map only
+	icon_state = "pod_preview"
 	density = 1
 	anchored = 1.0
 	layer = 2.8
@@ -22,6 +22,8 @@

 /obj/machinery/atmospherics/unary/cryo_cell/New()
 	..()
+	icon = 'icons/obj/cryogenics_split.dmi'
+	update_icon()
 	initialize_directions = dir

 /obj/machinery/atmospherics/unary/cryo_cell/Destroy()
@@ -193,12 +195,28 @@
 /obj/machinery/atmospherics/unary/cryo_cell/update_icon()
 	overlays.Cut()
 	icon_state = "pod[on]"
+	var/image/I
+
+	I = image(icon, "pod[on]_top")
+	I.layer = 5 // this needs to be fairly high so it displays over most things, but it needs to be under lighting (at 10)
+	I.pixel_z = 32
+	overlays += I
+
 	if(occupant)
 		var/image/pickle = image(occupant.icon, occupant.icon_state)
 		pickle.overlays = occupant.overlays
-		pickle.pixel_y = 20
+		pickle.pixel_z = 18
+		pickle.layer = 5
 		overlays += pickle
-	overlays += "lid[on]"
+
+	I = image(icon, "lid[on]")
+	I.layer = 5
+	overlays += I
+
+	I = image(icon, "lid[on]_top")
+	I.layer = 5
+	I.pixel_z = 32
+	overlays += I

 /obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant()
 	if(air_contents.total_moles < 10)
@@ -22,6 +22,7 @@
 	//Used for logging people entering cryosleep and important items they are carrying.
 	var/list/frozen_crew = list()
 	var/list/frozen_items = list()
+	var/list/_admin_logs = list() // _ so it shows first in VV

 	var/storage_type = "crewmembers"
 	var/storage_name = "Cryogenic Oversight Control"
@@ -146,20 +147,7 @@
 	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "cryo_rear"
 	anchored = 1
-
-	var/orient_right = null //Flips the sprite.
-
-/obj/structure/cryofeed/right
-	orient_right = 1
-	icon_state = "cryo_rear-r"
-
-/obj/structure/cryofeed/New()
-
-	if(orient_right)
-		icon_state = "cryo_rear-r"
-	else
-		icon_state = "cryo_rear"
-	..()
+	dir = WEST

 //Cryopods themselves.
 /obj/machinery/cryopod
@@ -169,6 +157,7 @@
 	icon_state = "body_scanner_0"
 	density = 1
 	anchored = 1
+	dir = WEST

 	var/base_icon_state = "body_scanner_0"
 	var/occupied_icon_state = "body_scanner_1"
@@ -179,7 +168,6 @@
 	var/disallow_occupant_types = list()

 	var/mob/occupant = null       // Person waiting to be despawned.
-	var/orient_right = null       // Flips the sprite.
 	var/time_till_despawn = 18000 // 30 minutes-ish safe period before being despawned.
 	var/time_entered = 0          // Used to keep track of the safe period.
 	var/obj/item/device/radio/intercom/announce //
@@ -203,10 +191,6 @@
 		/obj/item/weapon/storage/internal
 	)

-/obj/machinery/cryopod/right
-	orient_right = 1
-	icon_state = "body_scanner_0-r"
-
 /obj/machinery/cryopod/robot
 	name = "robotic storage unit"
 	desc = "A storage unit for robots."
@@ -220,18 +204,8 @@
 	allow_occupant_types = list(/mob/living/silicon/robot)
 	disallow_occupant_types = list(/mob/living/silicon/robot/drone)

-/obj/machinery/cryopod/robot/right
-	orient_right = 1
-	icon_state = "pod_0-r"
-
 /obj/machinery/cryopod/New()
 	announce = new /obj/item/device/radio/intercom(src)
-
-	if(orient_right)
-		icon_state = "[base_icon_state]-r"
-	else
-		icon_state = base_icon_state
-
 	..()

 /obj/machinery/cryopod/Destroy()
@@ -382,22 +356,22 @@
 		if ((G.fields["name"] == occupant.real_name))
 			qdel(G)

-	if(orient_right)
-		icon_state = "[base_icon_state]-r"
-	else
-		icon_state = base_icon_state
+	icon_state = base_icon_state

 	//TODO: Check objectives/mode, update new targets if this mob is the target, spawn new antags?

-	//This should guarantee that ghosts don't spawn.
-	occupant.ckey = null

 	//Make an announcement and log the person entering storage.
 	control_computer.frozen_crew += "[occupant.real_name], [occupant.mind.role_alt_title] - [worldtime2text()]"
+	control_computer._admin_logs += "[key_name(occupant)] ([occupant.mind.role_alt_title]) at [worldtime2text()]"
+	log_and_message_admins("[key_name(occupant)] ([occupant.mind.role_alt_title]) entered cryostorage.")

 	announce.autosay("[occupant.real_name], [occupant.mind.role_alt_title], [on_store_message]", "[on_store_name]")
 	visible_message("<span class='notice'>\The [initial(name)] hums and hisses as it moves [occupant.real_name] into storage.</span>", 3)

+	//This should guarantee that ghosts don't spawn.
+	occupant.ckey = null
+
 	// Delete the mob.
 	qdel(occupant)
 	set_occupant(null)
@@ -440,10 +414,7 @@
 					M.client.perspective = EYE_PERSPECTIVE
 					M.client.eye = src

-			if(orient_right)
-				icon_state = "[occupied_icon_state]-r"
-			else
-				icon_state = occupied_icon_state
+			icon_state = occupied_icon_state

 			M << "<span class='notice'>[on_enter_occupant_message]</span>"
 			M << "<span class='notice'><b>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</b></span>"
@@ -465,10 +436,7 @@
 	if(usr.stat != 0)
 		return

-	if(orient_right)
-		icon_state = "[base_icon_state]-r"
-	else
-		icon_state = base_icon_state
+	icon_state = base_icon_state

 	//Eject any items that aren't meant to be in the pod.
 	var/list/items = src.contents
@@ -518,10 +486,7 @@
 		usr.loc = src
 		set_occupant(usr)

-		if(orient_right)
-			icon_state = "[occupied_icon_state]-r"
-		else
-			icon_state = occupied_icon_state
+		icon_state = occupied_icon_state

 		usr << "<span class='notice'>[on_enter_occupant_message]</span>"
 		usr << "<span class='notice'><b>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</b></span>"
@@ -544,10 +509,7 @@
 	occupant.loc = get_turf(src)
 	set_occupant(null)

-	if(orient_right)
-		icon_state = "[base_icon_state]-r"
-	else
-		icon_state = base_icon_state
+	icon_state = base_icon_state

 	return

@@ -85,6 +85,14 @@
 /*
 	Airlock remote control
 */
+
+// Bitmasks for door switches.
+#define OPEN   0x1
+#define IDSCAN 0x2
+#define BOLTS  0x4
+#define SHOCK  0x8
+#define SAFE   0x10
+
 /obj/machinery/button/remote/airlock
 	name = "remote door-control"
 	desc = "It controls doors, remotely."
@@ -129,6 +137,12 @@
 				if(specialfunctions & SAFE)
 					D.set_safeties(1)

+#undef OPEN
+#undef IDSCAN
+#undef BOLTS
+#undef SHOCK
+#undef SAFE
+
 /*
 	Blast door remote control
 */
@@ -674,7 +674,7 @@ About the new airlock wires panel:

 	return ..()

-/obj/machinery/door/airlock/Topic(href, href_list, var/nowindow = 0)
+/obj/machinery/door/airlock/Topic(href, href_list)
 	if(..())
 		return 1

@@ -1022,6 +1022,9 @@ About the new airlock wires panel:
 			name = "[istext(assembly.glass) ? "[assembly.glass] airlock" : assembly.base_name]"

 	//wires
+	var/turf/T = get_turf(newloc)
+	if(T && (T.z in config.admin_levels))
+		secured_wires = 1
 	if (secured_wires)
 		wires = new/datum/wires/airlock/secure(src)
 	else
@@ -1,5 +1,3 @@
-/var/const/OPEN = 1
-/var/const/CLOSED = 2

 #define FIREDOOR_MAX_PRESSURE_DIFF 25 // kPa
 #define FIREDOOR_MAX_TEMP 50 // °C
@@ -183,7 +181,7 @@
 				if(A.fire || A.air_doors_activated)
 					alarmed = 1
 			if(alarmed)
-				nextstate = CLOSED
+				nextstate = FIREDOOR_CLOSED
 				close()

 /obj/machinery/door/firedoor/attackby(obj/item/weapon/C as obj, mob/user as mob)
@@ -324,11 +322,11 @@
 	if(operating || !nextstate)
 		return
 	switch(nextstate)
-		if(OPEN)
+		if(FIREDOOR_OPEN)
 			nextstate = null

 			open()
-		if(CLOSED)
+		if(FIREDOOR_CLOSED)
 			nextstate = null
 			close()
 	return
@@ -14,6 +14,7 @@
 	anchored = 1
 	use_power = 1
 	idle_power_usage = 2
+	flags = PROXMOVE

 /obj/machinery/flasher/portable //Portable version of the flasher. Only flashes when anchored
 	name = "portable flasher"
@@ -24,11 +25,6 @@
 	base_state = "pflash"
 	density = 1

-/*
-/obj/machinery/flasher/New()
-	sleep(4)					//<--- What the fuck are you doing? D=
-	src.sd_SetLuminosity(2)
-*/
 /obj/machinery/flasher/power_change()
 	..()
 	if ( !(stat & NOPOWER) )
@@ -0,0 +1,154 @@
+var/list/floor_light_cache = list()
+
+/obj/machinery/floor_light
+	name = "floor light"
+	icon = 'icons/obj/machines/floor_light.dmi'
+	icon_state = "base"
+	desc = "A backlit floor panel."
+	layer = TURF_LAYER+0.001
+	anchored = 0
+	use_power = 2
+	idle_power_usage = 2
+	active_power_usage = 20
+	power_channel = LIGHT
+	matter = list(DEFAULT_WALL_MATERIAL = 2500, "glass" = 2750)
+
+	var/on
+	var/damaged
+	var/default_light_range = 4
+	var/default_light_power = 2
+	var/default_light_colour = "#FFFFFF"
+
+/obj/machinery/floor_light/attackby(var/obj/item/W, var/mob/user)
+	if(istype(W, /obj/item/weapon/screwdriver))
+		anchored = !anchored
+		visible_message("<span class='notice'>\The [user] has [anchored ? "attached" : "detached"] \the [src].</span>")
+	else if(istype(W, /obj/item/weapon/weldingtool) && (damaged || (stat & BROKEN)))
+		var/obj/item/weapon/weldingtool/WT = W
+		if(!WT.remove_fuel(0, user))
+			user << "<span class='warning'>\The [src] must be on to complete this task.</span>"
+			return
+		playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
+		if(!do_after(user, 20))
+			return
+		if(!src || !WT.isOn())
+			return
+		visible_message("<span class='notice'>\The [user] has repaired \the [src].</span>")
+		stat &= ~BROKEN
+		damaged = null
+		update_brightness()
+	else if(W.force && user.a_intent == "hurt")
+		attack_hand(user)
+	return
+
+/obj/machinery/floor_light/attack_hand(var/mob/user)
+
+	if(user.a_intent == "hurt" && !user.small)
+		if(!isnull(damaged) && !(stat & BROKEN))
+			visible_message("<span class='danger'>\The [user] smashes \the [src]!</span>")
+			playsound(src, "shatter", 70, 1)
+			stat |= BROKEN
+		else
+			visible_message("<span class='danger'>\The [user] attacks \the [src]!</span>")
+			playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
+			if(isnull(damaged)) damaged = 0
+		update_brightness()
+		return
+	else
+
+		if(!anchored)
+			user << "<span class='warning'>\The [src] must be screwed down first.</span>"
+			return
+
+		if(stat & BROKEN)
+			user << "<span class='warning'>\The [src] is too damaged to be functional.</span>"
+			return
+
+		if(stat & NOPOWER)
+			user << "<span class='warning'>\The [src] is unpowered.</span>"
+			return
+
+		on = !on
+		if(on) use_power = 2
+		visible_message("<span class='notice'>\The [user] turns \the [src] [on ? "on" : "off"].</span>")
+		update_brightness()
+		return
+
+/obj/machinery/floor_light/process()
+	..()
+	var/need_update
+	if((!anchored || broken()) && on)
+		use_power = 0
+		on = 0
+		need_update = 1
+	else if(use_power && !on)
+		use_power = 0
+		need_update = 1
+	if(need_update)
+		update_brightness()
+
+/obj/machinery/floor_light/proc/update_brightness()
+	if(on && use_power == 2)
+		if(light_range != default_light_range || light_power != default_light_power || light_color != default_light_colour)
+			set_light(default_light_range, default_light_power, default_light_colour)
+	else
+		use_power = 0
+		if(light_range || light_power)
+			set_light(0)
+
+	active_power_usage = ((light_range + light_power) * 10)
+	update_icon()
+
+/obj/machinery/floor_light/update_icon()
+	overlays.Cut()
+	if(use_power && !broken())
+		if(isnull(damaged))
+			var/cache_key = "floorlight-[default_light_colour]"
+			if(!floor_light_cache[cache_key])
+				var/image/I = image("on")
+				I.color = default_light_colour
+				I.layer = layer+0.001
+				floor_light_cache[cache_key] = I
+			overlays |= floor_light_cache[cache_key]
+		else
+			if(damaged == 0) //Needs init.
+				damaged = rand(1,4)
+			var/cache_key = "floorlight-broken[damaged]-[default_light_colour]"
+			if(!floor_light_cache[cache_key])
+				var/image/I = image("flicker[damaged]")
+				I.color = default_light_colour
+				I.layer = layer+0.001
+				floor_light_cache[cache_key] = I
+			overlays |= floor_light_cache[cache_key]
+
+/obj/machinery/floor_light/proc/broken()
+	return (stat & (BROKEN|NOPOWER))
+
+/obj/machinery/floor_light/ex_act(severity)
+	switch(severity)
+		if(1)
+			qdel(src)
+		if(2)
+			if (prob(50))
+				qdel(src)
+			else if(prob(20))
+				stat |= BROKEN
+			else
+				if(isnull(damaged))
+					damaged = 0
+		if(3)
+			if (prob(5))
+				qdel(src)
+			else if(isnull(damaged))
+				damaged = 0
+	return
+
+/obj/machinery/floor_light/Destroy()
+	var/area/A = get_area(src)
+	if(A)
+		on = 0
+	..()
+
+/obj/machinery/floor_light/cultify()
+	default_light_colour = "#FF0000"
+	update_brightness()
@@ -10,7 +10,7 @@
 	var/list/mode = list("dismantle"=0,"laying"=0,"collect"=0)

 /obj/machinery/floorlayer/New()
-	T = new/obj/item/stack/tile/steel(src)
+	T = new/obj/item/stack/tile/floor(src)
 	..()

 /obj/machinery/floorlayer/Move(new_turf,M_Dir)
@@ -80,10 +80,8 @@
 	if(istype(new_turf, /turf/simulated/floor))
 		var/turf/simulated/floor/T = new_turf
 		if(!T.is_plating())
-			if(!T.broken && !T.burnt)
-				new T.floor_type(T)
-			T.make_plating()
-	return !new_turf.intact
+			T.make_plating(!(T.broken || T.burnt))
+	return new_turf.is_plating()

 /obj/machinery/floorlayer/proc/TakeNewStack()
 	for(var/obj/item/stack/tile/tile in contents)
@@ -32,7 +32,7 @@
 	New()
 		..()
 		var/turf/T = loc
-		hide(T.intact)
+		hide(!T.is_plating())
 		center = T

 		spawn(10)	// must wait for map loading to finish
@@ -29,14 +29,14 @@ var/global/list/navbeacons			// no I don't like putting this in, but it will do
 		set_codes()

 		var/turf/T = loc
-		hide(T.intact)
-		
+		hide(!T.is_plating())
+
 		// add beacon to MULE bot beacon list
 		if(freq == 1400)
 			if(!navbeacons)
 				navbeacons = new()
 			navbeacons += src
-			
+

 		spawn(5)	// must wait for map loading to finish
 			if(radio_controller)
@@ -111,7 +111,7 @@ var/global/list/navbeacons			// no I don't like putting this in, but it will do

 	attackby(var/obj/item/I, var/mob/user)
 		var/turf/T = loc
-		if(T.intact)
+		if(!T.is_plating())
 			return		// prevent intraction when T-scanner revealed

 		if(istype(I, /obj/item/weapon/screwdriver))
@@ -145,7 +145,7 @@ var/global/list/navbeacons			// no I don't like putting this in, but it will do

 	interact(var/mob/user, var/ai = 0)
 		var/turf/T = loc
-		if(T.intact)
+		if(!T.is_plating())
 			return		// prevent intraction when T-scanner revealed

 		if(!open && !ai)	// can't alter controls if not open, unless you're an AI
@@ -61,7 +61,7 @@
 							sense = 0
 							colour = rgb(130,130,130)

-					if("/turf/simulated/floor/engine")
+					if("/turf/simulated/floor/reinforced")
 						colour = rgb(128,128,128)

 					if("/turf/simulated/wall")
@@ -208,7 +208,7 @@
 						colour = rgb(10,10,10)
 						sense = 0

-					if("/turf/simulated/floor", "/turf/simulated/floor/engine")
+					if("/turf/simulated/floor/tiled", "/turf/simulated/floor/reinforced")
 						var/datum/gas_mixture/environment = T.return_air()
 						var/turf_total = environment.total_moles
 						var/t1 = turf_total / MOLES_CELLSTANDARD * 175
@@ -461,7 +461,7 @@ Buildable meters
 			P.set_dir(src.dir)
 			P.initialize_directions = pipe_dir
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			if (deleted(P))
 				usr << pipefailtext
@@ -480,7 +480,7 @@ Buildable meters
 			P.set_dir(src.dir)
 			P.initialize_directions = pipe_dir
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			if (deleted(P))
 				usr << pipefailtext
@@ -499,7 +499,7 @@ Buildable meters
 			P.set_dir(src.dir)
 			P.initialize_directions = pipe_dir
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			if (deleted(P))
 				usr << pipefailtext
@@ -518,7 +518,7 @@ Buildable meters
 			P.set_dir(src.dir)
 			P.initialize_directions = pipe_dir
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			if (deleted(P))
 				usr << pipefailtext
@@ -536,8 +536,6 @@ Buildable meters
 			P.set_dir(src.dir)
 			P.initialize_directions = pipe_dir //this var it's used to know if the pipe is bent or not
 			P.initialize_directions_he = pipe_dir
-			//var/turf/T = P.loc
-			//P.level = T.intact ? 2 : 1
 			P.initialize()
 			if (deleted(P))
 				usr << pipefailtext
@@ -557,7 +555,7 @@ Buildable meters
 			if (pipename)
 				C.name = pipename
 			var/turf/T = C.loc
-			C.level = T.intact ? 2 : 1
+			C.level = !T.is_plating() ? 2 : 1
 			C.initialize()
 			C.build_network()
 			if (C.node)
@@ -572,7 +570,7 @@ Buildable meters
 			M.initialize_directions = pipe_dir
 			//M.New()
 			var/turf/T = M.loc
-			M.level = T.intact ? 2 : 1
+			M.level = !T.is_plating() ? 2 : 1
 			M.initialize()
 			if (deleted(M))
 				usr << pipefailtext
@@ -595,7 +593,7 @@ Buildable meters
 			M.initialize_directions = pipe_dir
 			//M.New()
 			var/turf/T = M.loc
-			M.level = T.intact ? 2 : 1
+			M.level = !T.is_plating() ? 2 : 1
 			M.initialize()
 			if (!M)
 				usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
@@ -618,7 +616,7 @@ Buildable meters
 			M.initialize_directions = pipe_dir
 			//M.New()
 			var/turf/T = M.loc
-			M.level = T.intact ? 2 : 1
+			M.level = !T.is_plating() ? 2 : 1
 			M.initialize()
 			if (!M)
 				usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
@@ -641,7 +639,7 @@ Buildable meters
 			M.initialize_directions = pipe_dir
 			//M.New()
 			var/turf/T = M.loc
-			M.level = T.intact ? 2 : 1
+			M.level = !T.is_plating() ? 2 : 1
 			M.initialize()
 			if (deleted(M))
 				usr << pipefailtext
@@ -668,7 +666,7 @@ Buildable meters
 			M.connect_types = src.connect_types
 			//M.New()
 			var/turf/T = M.loc
-			M.level = T.intact ? 2 : 1
+			M.level = !T.is_plating() ? 2 : 1
 			M.initialize()
 			if (!M)
 				usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
@@ -695,7 +693,7 @@ Buildable meters
 			M.connect_types = src.connect_types
 			//M.New()
 			var/turf/T = M.loc
-			M.level = T.intact ? 2 : 1
+			M.level = !T.is_plating() ? 2 : 1
 			M.initialize()
 			if (!M)
 				usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
@@ -719,8 +717,6 @@ Buildable meters
 			P.set_dir(src.dir)
 			P.initialize_directions = src.get_pdir()
 			P.initialize_directions_he = src.get_hdir()
-			//var/turf/T = P.loc
-			//P.level = T.intact ? 2 : 1
 			P.initialize()
 			if (deleted(P))
 				usr << pipefailtext //"There's nothing to connect this pipe to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
@@ -740,7 +736,7 @@ Buildable meters
 			if (pipename)
 				V.name = pipename
 			var/turf/T = V.loc
-			V.level = T.intact ? 2 : 1
+			V.level = !T.is_plating() ? 2 : 1
 			V.initialize()
 			V.build_network()
 			if (V.node)
@@ -755,7 +751,7 @@ Buildable meters
 			if (pipename)
 				V.name = pipename
 			var/turf/T = V.loc
-			V.level = T.intact ? 2 : 1
+			V.level = !T.is_plating() ? 2 : 1
 			V.initialize()
 			V.build_network()
 			if (V.node1)
@@ -774,7 +770,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -791,7 +787,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -811,7 +807,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -831,7 +827,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -851,7 +847,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -871,7 +867,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -891,7 +887,7 @@ Buildable meters
 			if (pipename)
 				S.name = pipename
 			var/turf/T = S.loc
-			S.level = T.intact ? 2 : 1
+			S.level = !T.is_plating() ? 2 : 1
 			S.initialize()
 			S.build_network()
 			if (S.node)
@@ -903,7 +899,7 @@ Buildable meters
 			P.set_dir(src.dir)
 			P.initialize_directions = pipe_dir
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			if (deleted(P))
 				usr << pipefailtext
@@ -923,7 +919,7 @@ Buildable meters
 			if (pipename)
 				V.name = pipename
 			var/turf/T = V.loc
-			V.level = T.intact ? 2 : 1
+			V.level = !T.is_plating() ? 2 : 1
 			V.initialize()
 			V.build_network()
 			if (V.node1)
@@ -943,7 +939,7 @@ Buildable meters
 			if (pipename)
 				V.name = pipename
 			var/turf/T = V.loc
-			V.level = T.intact ? 2 : 1
+			V.level = !T.is_plating() ? 2 : 1
 			V.initialize()
 			V.build_network()
 			if (V.node1)
@@ -993,7 +989,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -1010,7 +1006,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -1027,7 +1023,7 @@ Buildable meters
 			if (pipename)
 				C.name = pipename
 			var/turf/T = C.loc
-			C.level = T.intact ? 2 : 1
+			C.level = !T.is_plating() ? 2 : 1
 			C.initialize()
 			C.build_network()
 			if (C.node)
@@ -1041,7 +1037,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -1057,7 +1053,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -1073,7 +1069,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -1089,7 +1085,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -1105,7 +1101,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -1121,7 +1117,7 @@ Buildable meters
 			if (pipename)
 				P.name = pipename
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 			if (P.node1)
@@ -1134,13 +1130,13 @@ Buildable meters
 		if(PIPE_OMNI_MIXER)
 			var/obj/machinery/atmospherics/omni/mixer/P = new(loc)
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()
 		if(PIPE_OMNI_FILTER)
 			var/obj/machinery/atmospherics/omni/filter/P = new(loc)
 			var/turf/T = P.loc
-			P.level = T.intact ? 2 : 1
+			P.level = !T.is_plating() ? 2 : 1
 			P.initialize()
 			P.build_network()

@@ -110,10 +110,8 @@
 	if(istype(new_turf, /turf/simulated/floor))
 		var/turf/simulated/floor/T = new_turf
 		if(!T.is_plating())
-			if(!T.broken && !T.burnt)
-				new T.floor_type(T)
-			T.make_plating()
-	return !new_turf.intact
+			T.make_plating(!(T.broken || T.burnt))
+	return new_turf.is_plating()

 /obj/machinery/pipelayer/proc/layPipe(var/turf/w_turf,var/M_Dir,var/old_dir)
 	if(!on || !(M_Dir in list(1, 2, 4, 8)) || M_Dir==old_dir)
@@ -236,7 +236,7 @@ var/list/turret_icons
 	return ..()


-/obj/machinery/porta_turret/Topic(href, href_list, var/nowindow = 0)
+/obj/machinery/porta_turret/Topic(href, href_list)
 	if(..())
 		return 1

@@ -1,8 +1,11 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31

+/obj/machinery/computer/telecomms
+	icon_keyboard = "tech_key"
+
 /obj/machinery/computer/telecomms/server
 	name = "Telecommunications Server Monitor"
-	icon_state = "comm_logs"
+	icon_screen = "comm_logs"

 	var/screen = 0				// the screen number:
 	var/list/servers = list()	// the servers located by the computer
@@ -56,7 +56,7 @@
 	id = "Receiver A"
 	network = "tcommsat"
 	autolinkers = list("receiverA") // link to relay
-	freq_listening = list(SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ)
+	freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ)

 	//Common and other radio frequencies for people to freely use
 	New()
@@ -88,7 +88,7 @@

 /obj/machinery/telecomms/bus/preset_two/New()
 	for(var/i = 1441, i < 1489, i += 2)
-		if(i == AI_FREQ || i == PUB_FREQ)
+		if(i == PUB_FREQ)
 			continue
 		freq_listening |= i
 	..()
@@ -9,7 +9,7 @@

 /obj/machinery/computer/telecomms/monitor
 	name = "Telecommunications Monitor"
-	icon_state = "comm_monitor"
+	icon_screen = "comm_monitor"

 	var/screen = 0				// the screen number:
 	var/list/machinelist = list()	// the machines located by the computer
@@ -6,7 +6,7 @@

 /obj/machinery/computer/telecomms/traffic
 	name = "Telecommunications Traffic Control"
-	icon_state = "computer_generic"
+	icon_screen = "generic"

 	var/screen = 0				// the screen number:
 	var/list/servers = list()	// the servers located by the computer
--- a/Show More
+++ b/Show More