Merge remote-tracking branch 'upstream/master'

2026-08-22 11:37:40 +01:00 · 2017-12-24 18:13:47 -06:00
parent 5b2959c26c d8001c1a6c
commit 6821cd618e
661 changed files with 19315 additions and 9507 deletions
@@ -33,7 +33,7 @@ Pipelines + Other Objects -> Pipe network

 /obj/machinery/atmospherics/New()
 	..()
-
+	atmos_machinery += src
 	if(!icon_manager)
 		icon_manager = new()

@@ -54,6 +54,7 @@ Pipelines + Other Objects -> Pipe network

 /obj/machinery/atmospherics/Destroy()
 	QDEL_NULL(stored)
+	atmos_machinery -= src
 	for(var/mob/living/L in src) //ventcrawling is serious business
 		L.remove_ventcrawl()
 		L.forceMove(get_turf(src))
@@ -166,7 +167,9 @@ Pipelines + Other Objects -> Pipe network
 		add_fingerprint(user)

 		var/unsafe_wrenching = FALSE
-		var/internal_pressure = int_air.return_pressure()-env_air.return_pressure()
+		var/I = int_air ? int_air.return_pressure() : 0
+		var/E = env_air ? env_air.return_pressure() : 0
+		var/internal_pressure = I - E

 		playsound(src.loc, W.usesound, 50, 1)
 		to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
@@ -147,6 +147,6 @@
 		T.assume_air(to_release)
 		air_update_turf(1)

-/obj/machinery/atmospherics/binary/process()
+/obj/machinery/atmospherics/binary/process_atmos()
 	..()
 	return parent1 && parent2
@@ -70,7 +70,7 @@
 	else
 		last_pressure_delta = 0

-/obj/machinery/atmospherics/binary/circulator/process()
+/obj/machinery/atmospherics/binary/circulator/process_atmos()
 	..()
 	update_icon()

@@ -104,8 +104,9 @@
 			else
 				add_underlay(T, node2, dir)

-/obj/machinery/atmospherics/binary/dp_vent_pump/process()
-	if(!..() || !on)
+/obj/machinery/atmospherics/binary/dp_vent_pump/process_atmos()
+	..()
+	if(!on)
 		return 0

 	var/datum/gas_mixture/environment = loc.return_air()
@@ -33,8 +33,9 @@
 		add_underlay(T, node1, turn(dir, 180))
 		add_underlay(T, node2, dir)

-/obj/machinery/atmospherics/binary/passive_gate/process()
-	if(!..() || !on)
+/obj/machinery/atmospherics/binary/passive_gate/process_atmos()
+	..()
+	if(!on)
 		return 0

 	var/output_starting_pressure = air2.return_pressure()
@@ -53,8 +53,9 @@ Thus, the two variables affect pump operation are set in New():
 		add_underlay(T, node1, turn(dir, -180))
 		add_underlay(T, node2, dir)

-/obj/machinery/atmospherics/binary/pump/process()
-	if(!..() || (stat & (NOPOWER|BROKEN)) || !on)
+/obj/machinery/atmospherics/binary/pump/process_atmos()
+	..()
+	if((stat & (NOPOWER|BROKEN)) || !on)
 		return 0

 	var/output_starting_pressure = air2.return_pressure()
@@ -51,8 +51,9 @@ Thus, the two variables affect pump operation are set in New():
 		add_underlay(T, node1, turn(dir, -180))
 		add_underlay(T, node2, dir)

-/obj/machinery/atmospherics/binary/volume_pump/process()
-	if(!..() || (stat & (NOPOWER|BROKEN)) || !on)
+/obj/machinery/atmospherics/binary/volume_pump/process_atmos()
+	..()
+	if((stat & (NOPOWER|BROKEN)) || !on)
 		return 0

 	// Pump mechanism just won't do anything if the pressure is too high/too low
@@ -5,14 +5,14 @@
 	name = "omni gas filter"
 	icon_state = "map_filter"

-	var/list/filters = new()
+	var/list/o_filters = new()
 	var/datum/omni_port/input
 	var/datum/omni_port/output

 /obj/machinery/atmospherics/omni/filter/Destroy()
 	input = null
 	output = null
-	filters.Cut()
+	o_filters.Cut()
 	return ..()

 /obj/machinery/atmospherics/omni/filter/sort_ports()
@@ -22,8 +22,8 @@
 				output = null
 			if(input == P)
 				input = null
-			if(filters.Find(P))
-				filters -= P
+			if(o_filters.Find(P))
+				o_filters -= P

 			P.air.volume = 200
 			switch(P.mode)
@@ -32,18 +32,19 @@
 				if(ATM_OUTPUT)
 					output = P
 				if(ATM_O2 to ATM_N2O)
-					filters += P
+					o_filters += P

 /obj/machinery/atmospherics/omni/filter/error_check()
-	if(!input || !output || !filters)
+	if(!input || !output || !o_filters)
 		return 1
-	if(filters.len < 1 || filters.len > 2) //requires 1 or 2 filters ~otherwise why are you using a filter?
+	if(o_filters.len < 1 || o_filters.len > 2) //requires 1 or 2 o_filters ~otherwise why are you using a filter?
 		return 1

 	return 0

-/obj/machinery/atmospherics/omni/filter/process()
-	if(!..() || !on)
+/obj/machinery/atmospherics/omni/filter/process_atmos()
+	..()
+	if(!on)
 		return 0

 	if(!input || !output)
@@ -56,7 +57,7 @@

 	if(output_pressure >= target_pressure)
 		return 1
-	for(var/datum/omni_port/P in filters)
+	for(var/datum/omni_port/P in o_filters)
 		if(P.air.return_pressure() >= target_pressure)
 			return 1

@@ -71,7 +72,7 @@
 		if(!removed)
 			return 1

-		for(var/datum/omni_port/P in filters)
+		for(var/datum/omni_port/P in o_filters)
 			var/datum/gas_mixture/filtered_out = new
 			filtered_out.temperature = removed.return_temperature()

@@ -83,8 +83,9 @@

 	return 0

-/obj/machinery/atmospherics/omni/mixer/process()
-	if(!..() || !on)
+/obj/machinery/atmospherics/omni/mixer/process_atmos()
+	..()
+	if(!on)
 		return 0

 	var/datum/gas_mixture/output_air = output.air
@@ -128,7 +128,7 @@

 /obj/machinery/atmospherics/omni/attack_ghost(mob/user)
 	ui_interact(user)
-	
+
 /obj/machinery/atmospherics/omni/proc/build_icons()
 	if(!check_icon_cache())
 		return
@@ -293,7 +293,7 @@
 			P.parent = New


-/obj/machinery/atmospherics/omni/process()
+/obj/machinery/atmospherics/omni/process_atmos()
 	..()
 	for(var/datum/omni_port/port in ports)
 		if(!port.parent)
@@ -68,8 +68,9 @@ Filter types:
 	if(old_stat != stat)
 		update_icon()

-/obj/machinery/atmospherics/trinary/filter/process()
-	if(!..() || !on)
+/obj/machinery/atmospherics/trinary/filter/process_atmos()
+	..()
+	if(!on)
 		return 0

 	var/output_starting_pressure = air3.return_pressure()
@@ -56,8 +56,9 @@
 	..()
 	air3.volume = 300

-/obj/machinery/atmospherics/trinary/mixer/process()
-	if(!..() || !on)
+/obj/machinery/atmospherics/trinary/mixer/process_atmos()
+	..()
+	if(!on)
 		return 0

 	var/output_starting_pressure = air3.return_pressure()
@@ -206,6 +206,6 @@
 		T.assume_air(to_release)
 		air_update_turf(1)

-/obj/machinery/atmospherics/trinary/process()
+/obj/machinery/atmospherics/trinary/process_atmos()
 	..()
 	return parent1 && parent2 && parent3
@@ -22,10 +22,11 @@

 	return

-/obj/machinery/atmospherics/unary/cold_sink/process()
-	if(!..() || !on)
+/obj/machinery/atmospherics/unary/cold_sink/process_atmos()
+	..()
+	if(!on)
 		return 0
-	
+
 	var/air_heat_capacity = air_contents.heat_capacity()
 	var/combined_heat_capacity = current_heat_capacity + air_heat_capacity
 	var/old_temperature = air_contents.temperature
@@ -32,9 +32,8 @@

 	..()

-/obj/machinery/atmospherics/unary/heat_exchanger/process()
-	if(!..())
-		return 0
+/obj/machinery/atmospherics/unary/heat_exchanger/process_atmos()
+	..()
 	if(!partner)
 		return 0

@@ -22,8 +22,9 @@

 	return

-/obj/machinery/atmospherics/unary/heat_reservoir/process()
-	if(!..() || !on)
+/obj/machinery/atmospherics/unary/heat_reservoir/process_atmos()
+	..()
+	if(!on)
 		return 0
 	var/air_heat_capacity = air_contents.heat_capacity()
 	var/combined_heat_capacity = current_heat_capacity + air_heat_capacity
@@ -51,10 +51,9 @@
 	if(old_stat != stat)
 		update_icon()

-/obj/machinery/atmospherics/unary/outlet_injector/process()
-	if(!..())
-		return 0
-	
+/obj/machinery/atmospherics/unary/outlet_injector/process_atmos()
+	..()
+
 	injecting = 0

 	if(!on || stat & NOPOWER)
@@ -28,8 +28,9 @@

 	air_contents.volume = 50

-/obj/machinery/atmospherics/unary/oxygen_generator/process()
-	if(!..() || !on)
+/obj/machinery/atmospherics/unary/oxygen_generator/process_atmos()
+	..()
+	if(!on)
 		return 0

 	var/total_moles = air_contents.total_moles()
@@ -17,9 +17,8 @@
 	..()
 	air_contents.volume = volume

-/obj/machinery/atmospherics/unary/passive_vent/process()
-	if(!..())
-		return 0
+/obj/machinery/atmospherics/unary/passive_vent/process_atmos()
+	..()

 	if(!node)
 		return 0
@@ -28,8 +28,9 @@
 			return
 		add_underlay(T, node, dir)

-/obj/machinery/atmospherics/unary/portables_connector/process()
-	if(!..() || !connected_device)
+/obj/machinery/atmospherics/unary/portables_connector/process_atmos()
+	..()
+	if(!connected_device)
 		return 0
 	parent.update = 1

@@ -17,9 +17,8 @@
 		prefix="h"
 	icon_state = "[prefix]off"

-/obj/machinery/atmospherics/unary/thermal_plate/process()
-	if(!..())
-		return 0
+/obj/machinery/atmospherics/unary/thermal_plate/process_atmos()
+	..()

 	var/datum/gas_mixture/environment = loc.return_air()

@@ -99,6 +99,6 @@
 		T.assume_air(to_release)
 		air_update_turf(1)

-/obj/machinery/atmospherics/unary/process()
+/obj/machinery/atmospherics/unary/process_atmos()
 	..()
 	return parent
@@ -121,8 +121,9 @@
 	update_icon()
 	update_underlays()

-/obj/machinery/atmospherics/unary/vent_pump/process()
-	if(!..() || (stat & (NOPOWER|BROKEN)))
+/obj/machinery/atmospherics/unary/vent_pump/process_atmos()
+	..()
+	if((stat & (NOPOWER|BROKEN)))
 		return 0
 	if(!node)
 		on = 0
@@ -146,7 +147,7 @@

 		if(pressure_delta > 0.5)
 			if(air_contents.temperature > 0)
-				var/transfer_moles = pressure_delta*environment.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
+				var/transfer_moles = pressure_delta*environment.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION) / 5

 				var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)

@@ -164,7 +165,7 @@

 		if(pressure_delta > 0.5)
 			if(environment.temperature > 0)
-				var/transfer_moles = pressure_delta*air_contents.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
+				var/transfer_moles = pressure_delta*air_contents.volume/(environment.temperature * R_IDEAL_GAS_EQUATION) / 5

 				var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
 				if(isnull(removed)) //in space
@@ -175,9 +175,8 @@
 		src.broadcast_status()
 	check_turfs()

-/obj/machinery/atmospherics/unary/vent_scrubber/process()
-	if(!..())
-		return 0
+/obj/machinery/atmospherics/unary/vent_scrubber/process_atmos()
+	..()

 	if(widenet)
 		check_turfs()
@@ -215,7 +214,7 @@

 	if(scrubbing)
 		if((scrub_O2 && environment.oxygen>0.001) || (scrub_N2 && environment.nitrogen>0.001) || (scrub_CO2 && environment.carbon_dioxide>0.001) || (scrub_Toxins && environment.toxins>0.001) || (environment.trace_gases.len>0))
-			var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles()
+			var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles() / 5

 			//Take a gas sample
 			var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
@@ -257,7 +256,7 @@
 		if(air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
 			return

-		var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume)
+		var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume) / 5

 		var/datum/gas_mixture/removed = tile.remove_air(transfer_moles)

@@ -25,11 +25,12 @@
 /obj/machinery/atmospherics/pipe/cap/pipeline_expansion()
 	return list(node)

-/obj/machinery/atmospherics/pipe/cap/process()
+/obj/machinery/atmospherics/pipe/cap/process_atmos()
 	if(!parent)
 		..()
 	else
 		. = PROCESS_KILL
+
 /obj/machinery/atmospherics/pipe/cap/Destroy()
 	. = ..()
 	if(node)
@@ -66,7 +66,7 @@
 /obj/machinery/atmospherics/pipe/manifold/pipeline_expansion()
 	return list(node1, node2, node3)

-/obj/machinery/atmospherics/pipe/manifold/process()
+/obj/machinery/atmospherics/pipe/manifold/process_atmos()
 	if(!parent)
 		..()
 	else
@@ -25,7 +25,7 @@
 /obj/machinery/atmospherics/pipe/manifold4w/pipeline_expansion()
 	return list(node1, node2, node3, node4)

-/obj/machinery/atmospherics/pipe/manifold4w/process()
+/obj/machinery/atmospherics/pipe/manifold4w/process_atmos()
 	if(!parent)
 		..()
 	else
@@ -89,7 +89,7 @@
 /obj/machinery/atmospherics/pipe/simple/proc/burst()
 	src.visible_message("<span class='danger'>\The [src] bursts!</span>");
 	playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
-	var/datum/effect/system/harmless_smoke_spread/smoke = new
+	var/datum/effect_system/smoke_spread/smoke = new
 	smoke.set_up(1,0, src.loc, 0)
 	smoke.start()
 	qdel(src)
@@ -13,7 +13,7 @@
 	buckle_lying = 1
 	var/icon_temperature = T20C //stop small changes in temperature causing icon refresh

-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/process()
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/process_atmos()
 	var/environment_temperature = 0
 	var/datum/gas_mixture/pipe_air = return_air()
 	if(!pipe_air)
@@ -221,7 +221,7 @@

 	if(air.temperature < T0C && air.return_pressure() > 10)
 		icy = 1
-	else
+	else if(air.temperature > T0C)
 		icy = 0

 	update_visuals()
@@ -305,17 +305,30 @@


 /atom/movable/var/pressure_resistance = 5
+/atom/movable/var/throw_pressure_limit = 15
 /atom/movable/var/last_forced_movement = 0

 /atom/movable/proc/experience_pressure_difference(pressure_difference, direction)
 	if(last_forced_movement >= air_master.current_cycle)
 		return 0
 	else if(!anchored && !pulledby)
-		if(pressure_difference > pressure_resistance)
+		if(pressure_difference >= throw_pressure_limit)
+			var/general_direction = get_edge_target_turf(src, direction)
+			if(last_forced_movement + 10 < air_master.current_cycle && is_valid_tochat_target(src)) //the first check prevents spamming throw to_chat
+				to_chat(src, "<span class='userdanger'>The pressure sends you flying!</span>")
+			if(ishuman(src))
+				var/mob/living/carbon/human/H = src
+				H.Weaken(min(pressure_difference / 10, 10))
+			spawn()
+				throw_at(general_direction, pressure_difference / 10, pressure_difference / 200, null, 0, 0, null)
 			last_forced_movement = air_master.current_cycle
-			spawn step(src, direction)
-		return 1
-
+			return 1
+		else if(pressure_difference > pressure_resistance)
+			spawn()
+				step(src, direction)
+			last_forced_movement = air_master.current_cycle
+			return 1
+	return 0



@@ -48,21 +48,21 @@
 #define FIRE_MINIMUM_TEMPERATURE_TO_SPREAD	150+T0C
 #define FIRE_MINIMUM_TEMPERATURE_TO_EXIST	100+T0C
 #define FIRE_SPREAD_RADIOSITY_SCALE			0.85
-#define FIRE_CARBON_ENERGY_RELEASED			500000	//Amount of heat released per mole of burnt carbon into the tile
-#define FIRE_PLASMA_ENERGY_RELEASED			3000000	//Amount of heat released per mole of burnt plasma into the tile
+#define FIRE_CARBON_ENERGY_RELEASED			2500000		//Amount of heat released per mole of burnt carbon into the tile
+#define FIRE_PLASMA_ENERGY_RELEASED			15000000	//Amount of heat released per mole of burnt plasma into the tile
 #define FIRE_GROWTH_RATE					40000	//For small fires
 #define CARBON_LIFEFORM_FIRE_RESISTANCE 	200+T0C	//Resistance to fire damage
 #define CARBON_LIFEFORM_FIRE_DAMAGE			4		//Fire damage
 	//Plasma fire properties
-#define OXYGEN_BURN_RATE_BASE				1.4
-#define PLASMA_BURN_RATE_DELTA				4
+#define OXYGEN_BURN_RATE_BASE				7
+#define PLASMA_BURN_RATE_DELTA				20
 #define PLASMA_MINIMUM_BURN_TEMPERATURE		100+T0C
 #define PLASMA_UPPER_TEMPERATURE			1370+T0C
 #define PLASMA_MINIMUM_OXYGEN_NEEDED		2
 #define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO	30
 #define PLASMA_OXYGEN_FULLBURN				10
-#define MIN_PLASMA_DAMAGE					1
-#define MAX_PLASMA_DAMAGE					10
+#define MIN_TOXIC_GAS_DAMAGE				1
+#define MAX_TOXIC_GAS_DAMAGE				10
 #define MOLES_PLASMA_VISIBLE				0.5		//Moles in a standard cell after which plasma is visible

 // Pressure limits.
@@ -119,4 +119,4 @@
 // Atmos alarm defines
 #define ATMOS_ALARM_NONE					0
 #define ATMOS_ALARM_WARNING					1
-#define ATMOS_ALARM_DANGER					2
+#define ATMOS_ALARM_DANGER					2
@@ -88,3 +88,8 @@
 #define BLOCKHAIR				32768	// temporarily removes the user's hair, facial and otherwise.

 #define ONESIZEFITSALL 			1		// determines if something can be worn by a fatty or not.
+
+//flags for muzzle speech blocking
+#define MUTE_NONE 0 // Does not mute you.
+#define MUTE_MUFFLE 1 // Muffles everything you say "MHHPHHMMM!!!
+#define MUTE_ALL 2 // Completely mutes you.
@@ -25,7 +25,7 @@

 // Generic mutations:
 #define	TK				1
-#define RESIST_COLD		2
+#define COLDRES			2
 #define XRAY			3
 #define HULK			4
 #define CLUMSY			5
@@ -42,13 +42,13 @@
 #define PLANT 30

 // Other Mutations:
-#define NO_BREATH		100 	// no need to breathe
+#define BREATHLESS		100		// no breathing
 #define REMOTE_VIEW		101 	// remote viewing
 #define REGEN			102 	// health regen
 #define RUN				103 	// no slowdown
 #define REMOTE_TALK		104 	// remote talking
 #define MORPH			105 	// changing appearance
-#define RESIST_HEAT		106 	// heat resistance
+#define HEATRES			106 	// heat resistance
 #define HALLUCINATE		107 	// hallucinations
 #define FINGERPRINTS	108 	// no fingerprints
 #define NO_SHOCK		109 	// insulated hands
@@ -140,3 +140,6 @@
 #define NOGUNS			12
 #define NOTRANSSTING	13
 #define VIRUSIMMUNE		14
+#define NOCRITDAMAGE	15
+#define RESISTHOT		16
+#define RESISTCOLD		17
@@ -9,6 +9,8 @@

 #define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) //if something is cleanable

+#define is_pen(W) (istype(W, /obj/item/weapon/pen))
+
 var/list/static/global/pointed_types = typecacheof(list(
 	/obj/item/weapon/pen,
 	/obj/item/weapon/screwdriver,
@@ -254,6 +254,9 @@
 #define REGION_COMMAND		7
 #define REGION_CENTCOMM		8

+//Just space
+#define SPACE_ICON_STATE	"[((x + y) ^ ~(x * y) + z) % 25]"
+
 //used for maploader
 #define MAP_MINX 1
 #define MAP_MINY 2
@@ -19,6 +19,8 @@
 #define LEFT 1
 #define RIGHT 2

+#define SPLINT_LIFE 2000 //number of steps splints stay on
+

 //Pulse levels, very simplified
 #define PULSE_NONE		0	//so !M.pulse checks would be possible
@@ -169,3 +171,6 @@
 #define hasorgans(A)	(ishuman(A))

 #define is_admin(user)	(check_rights(R_ADMIN, 0, (user)) != 0)
+
+//effects
+#define EFFECT_HIGHFIVE "highfiving"
@@ -25,6 +25,7 @@
 #define MEMBER_PUBLIC	8192
 #define CHAT_NO_ADMINLOGS 16384
 #define DONATOR_PUBLIC	32768
+#define CHAT_NO_TICKETLOGS 65536

 #define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC|MEMBER_PUBLIC|DONATOR_PUBLIC)

@@ -0,0 +1,6 @@
+//Byond type ids
+#define TYPEID_NULL "0"
+#define TYPEID_NORMAL_LIST "f"
+//helper macros
+#define GET_TYPEID(ref) ( ( (lentext(ref) <= 10) ? "TYPEID_NULL" : copytext(ref, 4, lentext(ref) - 6) ) )
+#define IS_NORMAL_LIST(L) (GET_TYPEID("\ref[L]") == TYPEID_NORMAL_LIST)
@@ -0,0 +1,21 @@
+#define VV_NUM "Number"
+#define VV_TEXT "Text"
+#define VV_MESSAGE "Mutiline Text"
+#define VV_ICON "Icon"
+#define VV_ATOM_REFERENCE "Atom Reference"
+#define VV_DATUM_REFERENCE "Datum Reference"
+#define VV_MOB_REFERENCE "Mob Reference"
+#define VV_CLIENT "Client"
+#define VV_ATOM_TYPE "Atom Typepath"
+#define VV_DATUM_TYPE "Datum Typepath"
+#define VV_TYPE "Custom Typepath"
+#define VV_MATRIX "Matrix"
+#define VV_FILE "File"
+#define VV_LIST "List"
+#define VV_NEW_ATOM "New Atom"
+#define VV_NEW_DATUM "New Datum"
+#define VV_NEW_TYPE "New Custom Typepath"
+#define VV_NEW_LIST "New List"
+#define VV_NULL "NULL"
+#define VV_RESTORE_DEFAULT "Restore to Default"
+#define VV_MARKED_DATUM "Marked Datum"
@@ -457,7 +457,7 @@ proc/pollCandidates(Question, be_special_type, antag_age_check = 0, poll_time =
 		if(config.use_exp_restrictions && min_hours)
 			if(G.client.get_exp_living_num() < min_hours * 60)
 				continue
-		if(G.has_enabled_antagHUD)
+		if(cannotPossess(G))
 			continue
 		spawn(0)
 			G << 'sound/misc/notice2.ogg'//Alerting them to their consideration
@@ -9,7 +9,7 @@
 	//head accessory
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/head_accessory, head_accessory_styles_list)
 	//hair
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/hair, hair_styles_list, hair_styles_male_list, hair_styles_female_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/hair, hair_styles_public_list, hair_styles_male_list, hair_styles_female_list, hair_styles_full_list)
 	//facial hair
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/facial_hair, facial_hair_styles_list, facial_hair_styles_male_list, facial_hair_styles_female_list)
 	//underwear
@@ -1,3 +1,28 @@
+
+//generic (by snowflake) tile smoothing code; smooth your icons with this!
+/*
+	Each tile is divided in 4 corners, each corner has an image associated to it; the tile is then overlayed by these 4 images
+	To use this, just set your atom's 'smooth' var to 1. If your atom can be moved/unanchored, set its 'can_be_unanchored' var to 1.
+	If you don't want your atom's icon to smooth with anything but atoms of the same type, set the list 'canSmoothWith' to null;
+	Otherwise, put all types you want the atom icon to smooth with in 'canSmoothWith' INCLUDING THE TYPE OF THE ATOM ITSELF.
+
+	Each atom has its own icon file with all the possible corner states. See 'smooth_wall.dmi' for a template.
+
+	DIAGONAL SMOOTHING INSTRUCTIONS
+	To make your atom smooth diagonally you need all the proper icon states (see 'smooth_wall.dmi' for a template) and
+	to add the 'SMOOTH_DIAGONAL' flag to the atom's smooth var (in addition to either SMOOTH_TRUE or SMOOTH_MORE).
+
+	For turfs, what appears under the diagonal corners depends on the turf that was in the same position previously: if you make a wall on
+	a plating floor, you will see plating under the diagonal wall corner, if it was space, you will see space.
+
+	If you wish to map a diagonal wall corner with a fixed underlay, you must configure the turf's 'fixed_underlay' list var, like so:
+		fixed_underlay = list("icon"='icon_file.dmi', "icon_state"="iconstatename")
+	A non null 'fixed_underlay' list var will skip copying the previous turf appearance and always use the list. If the list is
+	not set properly, the underlay will default to regular floor plating.
+
+	To see an example of a diagonal wall, see '/turf/simulated/wall/shuttle' and its subtypes.
+*/
+
 //Redefinitions of the diagonal directions so they can be stored in one var without conflicts
 #define N_NORTH	2
 #define N_SOUTH	4
@@ -10,25 +35,24 @@

 #define SMOOTH_FALSE	0 //not smooth
 #define SMOOTH_TRUE		1 //smooths with exact specified types or just itself
-#define SMOOTH_MORE		2 //smooths with all subtypes of specified types or just itself
+#define SMOOTH_MORE		2 //smooths with all subtypes of specified types or just itself (this value can replace SMOOTH_TRUE)
+#define SMOOTH_DIAGONAL	4 //if atom should smooth diagonally, this should be present in 'smooth' var
+#define SMOOTH_BORDER	8 //atom will smooth with the borders of the map
+
+#define NULLTURF_BORDER 123456789
+
+#define DEFAULT_UNDERLAY_ICON 			'icons/turf/floors.dmi'
+#define DEFAULT_UNDERLAY_ICON_STATE 	"plating"
+#define DEFAULT_UNDERLAY_IMAGE			image(DEFAULT_UNDERLAY_ICON, DEFAULT_UNDERLAY_ICON_STATE)

 /atom/var/smooth = SMOOTH_FALSE
 /atom/var/top_left_corner
 /atom/var/top_right_corner
 /atom/var/bottom_left_corner
 /atom/var/bottom_right_corner
-/atom/var/can_be_unanchored = 0
 /atom/var/list/canSmoothWith = null // TYPE PATHS I CAN SMOOTH WITH~~~~~ If this is null and atom is smooth, it smooths only with itself
-
-//generic (by snowflake) tile smoothing code; smooth your icons with this!
-/*
-	Each tile is divided in 4 corners, each corner has an image associated to it; the tile is then overlayed by these 4 images
-	To use this, just set your atom's 'smooth' var to 1. If your atom can be moved/unanchored, set its 'can_be_unanchored' var to 1.
-	If you don't want your atom's icon to smooth with anything but atoms of the same type, set the list 'canSmoothWith' to null;
-	Otherwise, put all types you want the atom icon to smooth with in 'canSmoothWith' INCLUDING THE TYPE OF THE ATOM ITSELF.
-
-	Each atom has its own icon file with all the possible corner states. See 'smooth_wall.dmi' for a template.
-*/
+/atom/movable/var/can_be_unanchored = FALSE
+/turf/var/list/fixed_underlay = null

 /proc/calculate_adjacencies(atom/A)
 	if(!A.loc)
@@ -36,105 +60,189 @@

 	var/adjacencies = 0

-	if(A.can_be_unanchored)
-		var/atom/movable/AM = A
-		if(!AM.anchored)
+	var/atom/movable/AM
+	if(ismovableatom(A))
+		AM = A
+		if(AM.can_be_unanchored && !AM.anchored)
 			return 0

-		for(var/direction in alldirs)
-			AM = find_type_in_direction(A, direction)
-			if(istype(AM))
-				if(AM.anchored)
-					adjacencies |= 1 << direction
-
-			else
-				if(AM)
-					adjacencies |= 1 << direction
-
-	else
-		for(var/direction in alldirs)
-			if(find_type_in_direction(A, direction))
+	for(var/direction in cardinal)
+		AM = find_type_in_direction(A, direction)
+		if(AM == NULLTURF_BORDER)
+			if((A.smooth & SMOOTH_BORDER))
 				adjacencies |= 1 << direction
+		else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
+			adjacencies |= 1 << direction
+
+	if(adjacencies & N_NORTH)
+		if(adjacencies & N_WEST)
+			AM = find_type_in_direction(A, NORTHWEST)
+			if(AM == NULLTURF_BORDER)
+				if((A.smooth & SMOOTH_BORDER))
+					adjacencies |= N_NORTHWEST
+			else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
+				adjacencies |= N_NORTHWEST
+		if(adjacencies & N_EAST)
+			AM = find_type_in_direction(A, NORTHEAST)
+			if(AM == NULLTURF_BORDER)
+				if((A.smooth & SMOOTH_BORDER))
+					adjacencies |= N_NORTHEAST
+			else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
+				adjacencies |= N_NORTHEAST
+
+	if(adjacencies & N_SOUTH)
+		if(adjacencies & N_WEST)
+			AM = find_type_in_direction(A, SOUTHWEST)
+			if(AM == NULLTURF_BORDER)
+				if((A.smooth & SMOOTH_BORDER))
+					adjacencies |= N_SOUTHWEST
+			else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
+				adjacencies |= N_SOUTHWEST
+		if(adjacencies & N_EAST)
+			AM = find_type_in_direction(A, SOUTHEAST)
+			if(AM == NULLTURF_BORDER)
+				if((A.smooth & SMOOTH_BORDER))
+					adjacencies |= N_SOUTHEAST
+			else if( (AM && !istype(AM)) || (istype(AM) && AM.anchored) )
+				adjacencies |= N_SOUTHEAST

 	return adjacencies

 /proc/smooth_icon(atom/A)
 	if(qdeleted(A))
 		return
-	if(A && A.smooth)
+	if(A && (A.smooth & SMOOTH_TRUE) || (A.smooth & SMOOTH_MORE))
 		var/adjacencies = calculate_adjacencies(A)
-
-		//NW CORNER
-		var/nw = "1-i"
-		if((adjacencies & N_NORTH) && (adjacencies & N_WEST))
-			if(adjacencies & N_NORTHWEST)
-				nw = "1-f"
-			else
-				nw = "1-nw"
+		if(A.smooth & SMOOTH_DIAGONAL)
+			A.diagonal_smooth(adjacencies)
 		else
-			if(adjacencies & N_NORTH)
-				nw = "1-n"
-			else if(adjacencies & N_WEST)
-				nw = "1-w"
+			cardinal_smooth(A, adjacencies)
+
+/atom/proc/diagonal_smooth(adjacencies)
+	switch(adjacencies)
+		if(N_NORTH|N_WEST)
+			replace_smooth_overlays("d-se","d-se-0")
+		if(N_NORTH|N_EAST)
+			replace_smooth_overlays("d-sw","d-sw-0")
+		if(N_SOUTH|N_WEST)
+			replace_smooth_overlays("d-ne","d-ne-0")
+		if(N_SOUTH|N_EAST)
+			replace_smooth_overlays("d-nw","d-nw-0")
+
+		if(N_NORTH|N_WEST|N_NORTHWEST)
+			replace_smooth_overlays("d-se","d-se-1")
+		if(N_NORTH|N_EAST|N_NORTHEAST)
+			replace_smooth_overlays("d-sw","d-sw-1")
+		if(N_SOUTH|N_WEST|N_SOUTHWEST)
+			replace_smooth_overlays("d-ne","d-ne-1")
+		if(N_SOUTH|N_EAST|N_SOUTHEAST)
+			replace_smooth_overlays("d-nw","d-nw-1")

-		//NE CORNER
-		var/ne = "2-i"
-		if((adjacencies & N_NORTH) && (adjacencies & N_EAST))
-			if(adjacencies & N_NORTHEAST)
-				ne = "2-f"
-			else
-				ne = "2-ne"
 		else
-			if(adjacencies & N_NORTH)
-				ne = "2-n"
-			else if(adjacencies & N_EAST)
-				ne = "2-e"
+			cardinal_smooth(src, adjacencies)
+			return

-		//SW CORNER
-		var/sw = "3-i"
-		if((adjacencies & N_SOUTH) && (adjacencies & N_WEST))
-			if(adjacencies & N_SOUTHWEST)
-				sw = "3-f"
+	icon_state = ""
+	return adjacencies
+
+//only walls should have a need to handle underlays
+/turf/simulated/wall/diagonal_smooth(adjacencies)
+	adjacencies = reverse_ndir(..())
+	if(adjacencies)
+		underlays.Cut()
+		if(fixed_underlay)
+			if(fixed_underlay["space"])
+				underlays += image('icons/turf/space.dmi', SPACE_ICON_STATE, layer=TURF_LAYER)
 			else
-				sw = "3-sw"
+				underlays += image(fixed_underlay["icon"], fixed_underlay["icon_state"], layer=TURF_LAYER)
 		else
-			if(adjacencies & N_SOUTH)
-				sw = "3-s"
-			else if(adjacencies & N_WEST)
-				sw = "3-w"
+			var/turf/T = get_step(src, turn(adjacencies, 180))
+			if(T && (T.density || T.smooth))
+				T = get_step(src, turn(adjacencies, 135))
+				if(T && (T.density || T.smooth))
+					T = get_step(src, turn(adjacencies, 225))

-		//SE CORNER
-		var/se = "4-i"
-		if((adjacencies & N_SOUTH) && (adjacencies & N_EAST))
-			if(adjacencies & N_SOUTHEAST)
-				se = "4-f"
+			if(istype(T, /turf/space) && !istype(T, /turf/space/transit))
+				underlays += image('icons/turf/space.dmi', SPACE_ICON_STATE, layer=TURF_LAYER)
+			else if(T && !T.density && !T.smooth)
+				underlays += T
+			else if(baseturf && !initial(baseturf.density) && !initial(baseturf.smooth))
+				underlays += image(initial(baseturf.icon), initial(baseturf.icon_state), layer=TURF_LAYER)
 			else
-				se = "4-se"
+				underlays += DEFAULT_UNDERLAY_IMAGE
+
+/proc/cardinal_smooth(atom/A, adjacencies)
+	//NW CORNER
+	var/nw = "1-i"
+	if((adjacencies & N_NORTH) && (adjacencies & N_WEST))
+		if(adjacencies & N_NORTHWEST)
+			nw = "1-f"
 		else
-			if(adjacencies & N_SOUTH)
-				se = "4-s"
-			else if(adjacencies & N_EAST)
-				se = "4-e"
+			nw = "1-nw"
+	else
+		if(adjacencies & N_NORTH)
+			nw = "1-n"
+		else if(adjacencies & N_WEST)
+			nw = "1-w"

-		if(A.top_left_corner != nw)
-			A.overlays -= A.top_left_corner
-			A.top_left_corner = nw
-			A.overlays += nw
+	//NE CORNER
+	var/ne = "2-i"
+	if((adjacencies & N_NORTH) && (adjacencies & N_EAST))
+		if(adjacencies & N_NORTHEAST)
+			ne = "2-f"
+		else
+			ne = "2-ne"
+	else
+		if(adjacencies & N_NORTH)
+			ne = "2-n"
+		else if(adjacencies & N_EAST)
+			ne = "2-e"

-		if(A.top_right_corner != ne)
-			A.overlays -= A.top_right_corner
-			A.top_right_corner = ne
-			A.overlays += ne
+	//SW CORNER
+	var/sw = "3-i"
+	if((adjacencies & N_SOUTH) && (adjacencies & N_WEST))
+		if(adjacencies & N_SOUTHWEST)
+			sw = "3-f"
+		else
+			sw = "3-sw"
+	else
+		if(adjacencies & N_SOUTH)
+			sw = "3-s"
+		else if(adjacencies & N_WEST)
+			sw = "3-w"

-		if(A.bottom_right_corner != sw)
-			A.overlays -= A.bottom_right_corner
-			A.bottom_right_corner = sw
-			A.overlays += sw
+	//SE CORNER
+	var/se = "4-i"
+	if((adjacencies & N_SOUTH) && (adjacencies & N_EAST))
+		if(adjacencies & N_SOUTHEAST)
+			se = "4-f"
+		else
+			se = "4-se"
+	else
+		if(adjacencies & N_SOUTH)
+			se = "4-s"
+		else if(adjacencies & N_EAST)
+			se = "4-e"

-		if(A.bottom_left_corner != se)
-			A.overlays -= A.bottom_left_corner
-			A.bottom_left_corner = se
-			A.overlays += se
+	if(A.top_left_corner != nw)
+		A.overlays -= A.top_left_corner
+		A.top_left_corner = nw
+		A.overlays += nw
+
+	if(A.top_right_corner != ne)
+		A.overlays -= A.top_right_corner
+		A.top_right_corner = ne
+		A.overlays += ne
+
+	if(A.bottom_right_corner != sw)
+		A.overlays -= A.bottom_right_corner
+		A.bottom_right_corner = sw
+		A.overlays += sw
+
+	if(A.bottom_left_corner != se)
+		A.overlays -= A.bottom_left_corner
+		A.bottom_left_corner = se
+		A.overlays += se

 /proc/find_type_in_direction(atom/source, direction, range=1)
 	var/x_offset = 0
@@ -152,10 +260,10 @@

 	var/turf/target_turf = locate(source.x + x_offset, source.y + y_offset, source.z)
 	if(!target_turf)
-		return null
+		return NULLTURF_BORDER
 	if(source.canSmoothWith)
 		var/atom/A
-		if(source.smooth == SMOOTH_MORE)
+		if(source.smooth & SMOOTH_MORE)
 			for(var/a_type in source.canSmoothWith)
 				if( istype(target_turf, a_type) )
 					return target_turf
@@ -205,3 +313,59 @@
 	bottom_right_corner = null
 	overlays -= bottom_left_corner
 	bottom_left_corner = null
+
+/atom/proc/replace_smooth_overlays(nw, ne, sw, se)
+	clear_smooth_overlays()
+	top_left_corner = nw
+	overlays += nw
+	top_right_corner = ne
+	overlays += ne
+	bottom_left_corner = sw
+	overlays += sw
+	bottom_right_corner = se
+	overlays += se
+
+/proc/reverse_ndir(ndir)
+	switch(ndir)
+		if(N_NORTH)
+			return NORTH
+		if(N_SOUTH)
+			return SOUTH
+		if(N_WEST)
+			return WEST
+		if(N_EAST)
+			return EAST
+		if(N_NORTHWEST)
+			return NORTHWEST
+		if(N_NORTHEAST)
+			return NORTHEAST
+		if(N_SOUTHEAST)
+			return SOUTHEAST
+		if(N_SOUTHWEST)
+			return SOUTHWEST
+		if(N_NORTH|N_WEST)
+			return NORTHWEST
+		if(N_NORTH|N_EAST)
+			return NORTHEAST
+		if(N_SOUTH|N_WEST)
+			return SOUTHWEST
+		if(N_SOUTH|N_EAST)
+			return SOUTHEAST
+		if(N_NORTH|N_WEST|N_NORTHWEST)
+			return NORTHWEST
+		if(N_NORTH|N_EAST|N_NORTHEAST)
+			return NORTHEAST
+		if(N_SOUTH|N_WEST|N_SOUTHWEST)
+			return SOUTHWEST
+		if(N_SOUTH|N_EAST|N_SOUTHEAST)
+			return SOUTHEAST
+		else
+			return 0
+
+//Example smooth wall
+/turf/simulated/wall/smooth
+	name = "smooth wall"
+	icon = 'icons/turf/smooth_wall.dmi'
+	icon_state = "smooth"
+	smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL|SMOOTH_BORDER
+	canSmoothWith = null
@@ -654,3 +654,28 @@ proc/dd_sortedObjectList(list/incoming)

 // LAZYING PT 2: THE LAZENING
 #define LAZYREINITLIST(L) LAZYCLEARLIST(L); LAZYINITLIST(L);
+
+
+//same, but returns nothing and acts on list in place
+/proc/shuffle_inplace(list/L)
+	if(!L)
+		return
+
+	for(var/i=1, i<L.len, ++i)
+		L.Swap(i,rand(i,L.len))
+
+//Return a list with no duplicate entries
+/proc/uniqueList(list/L)
+	. = list()
+	for(var/i in L)
+		. |= i
+
+//same, but returns nothing and acts on list in place (also handles associated values properly)
+/proc/uniqueList_inplace(list/L)
+	var/temp = L.Copy()
+	L.len = 0
+	for(var/key in temp)
+		if(isnum(key))
+			L |= key
+		else
+			L[key] = temp[key]
@@ -49,6 +49,10 @@
 /proc/log_say(text)
 	if(config.log_say)
 		diary << "\[[time_stamp()]]SAY: [text]"
+		
+/proc/log_robot(text)
+	if(config.log_say)
+		diary << "\[[time_stamp()]]ROBOT: [text]"

 /proc/log_ooc(text)
 	if(config.log_ooc)
@@ -49,8 +49,8 @@ proc/pick_species_allowed_underwear(list/all_picks, species)
 proc/random_hair_style(var/gender, species = "Human", var/datum/robolimb/robohead)
 	var/h_style = "Bald"
 	var/list/valid_hairstyles = list()
-	for(var/hairstyle in hair_styles_list)
-		var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
+	for(var/hairstyle in hair_styles_public_list)
+		var/datum/sprite_accessory/S = hair_styles_public_list[hairstyle]

 		if(hairstyle == "Bald") //Just in case.
 			valid_hairstyles += hairstyle
@@ -29,7 +29,7 @@

 /proc/time_stamp()
 	return time2text(world.timeofday, "hh:mm:ss")
-	
+
 /proc/gameTimestamp(format = "hh:mm:ss") // Get the game time in text
 	return time2text(world.time - timezoneOffset + 432000, format)

@@ -61,6 +61,12 @@ proc/isDay(var/month, var/day)
 */
 /proc/stop_watch(wh)
 	return round(0.1 * (TimeOfGame - wh), 0.1)
-	
+
 /proc/month2number(month)
-	return month_names.Find(month)
+	return month_names.Find(month)
+
+//Take a value in seconds and returns a string of minutes and seconds in the format X minute(s) and X seconds.
+/proc/seconds_to_time(var/seconds as num)
+	var/numSeconds = seconds % 60
+	var/numMinutes = (seconds - numSeconds) / 60
+	return "[numMinutes] [numMinutes > 1 ? "minutes" : "minute"] and [numSeconds] seconds."
@@ -328,3 +328,40 @@
 	var/e = matrix_list[5]
 	var/f = matrix_list[6]
 	return matrix(a, b, c, d, e, f)
+
+
+//This is a weird one:
+//It returns a list of all var names found in the string
+//These vars must be in the [var_name] format
+//It's only a proc because it's used in more than one place
+
+//Takes a string and a datum
+//The string is well, obviously the string being checked
+//The datum is used as a source for var names, to check validity
+//Otherwise every single word could technically be a variable!
+/proc/string2listofvars(var/t_string, var/datum/var_source)
+	if(!t_string || !var_source)
+		return list()
+
+	. = list()
+
+	var/var_found = findtext(t_string, "\[") //Not the actual variables, just a generic "should we even bother" check
+	if(var_found)
+		//Find var names
+
+		// "A dog said hi [name]!"
+		// splittext() --> list("A dog said hi ","name]!"
+		// jointext() --> "A dog said hi name]!"
+		// splittext() --> list("A","dog","said","hi","name]!")
+
+		t_string = replacetext(t_string, "\[", "\[ ")//Necessary to resolve "word[var_name]" scenarios
+		var/list/list_value = splittext(t_string, "\[")
+		var/intermediate_stage = jointext(list_value, null)
+
+		list_value = splittext(intermediate_stage, " ")
+		for(var/value in list_value)
+			if(findtext(value, "]"))
+				value = splittext(value, "]") //"name]!" --> list("name","!")
+				for(var/A in value)
+					if(var_source.vars.Find(A))
+						. += A
@@ -32,6 +32,7 @@ var/global/next_unique_datum_id = 1
 		unique_datum_id = "\ref[src]_[next_unique_datum_id++]"
 	return unique_datum_id

+
 /proc/locateUID(uid)
 	if(!istext(uid))
 		return null
@@ -1730,53 +1730,81 @@ var/mob/dview/dview_mob = new
 				closest_atom = A
 	return closest_atom

-/proc/pick_closest_path(value)
-	var/list/matches = get_fancy_list_of_types()
-	if(!isnull(value) && value!="")
+/proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
+	if(value == FALSE) //nothing should be calling us with a number, so this is safe
+		value = input("Enter type to find (blank for all, cancel to cancel)", "Search for type") as null|text
+		if(isnull(value))
+			return
+	value = trim(value)
+	if(!isnull(value) && value != "")
 		matches = filter_fancy_list(matches, value)

-	if(matches.len==0)
+	if(matches.len == 0)
 		return

 	var/chosen
-	if(matches.len==1)
+	if(matches.len == 1)
 		chosen = matches[1]
 	else
-		chosen = input("Select an atom type", "Spawn Atom", matches[1]) as null|anything in matches
+		chosen = input("Select a type", "Pick Type", matches[1]) as null|anything in matches
 		if(!chosen)
 			return
 	chosen = matches[chosen]
 	return chosen

+/proc/make_types_fancy(var/list/types)
+	if(ispath(types))
+		types = list(types)
+	. = list()
+	for(var/type in types)
+		var/typename = "[type]"
+		var/static/list/TYPES_SHORTCUTS = list(
+			/obj/effect/decal/cleanable = "CLEANABLE",
+			/obj/item/device/radio/headset = "HEADSET",
+			/obj/item/clothing/head/helmet/space = "SPESSHELMET",
+			/obj/item/weapon/book/manual = "MANUAL",
+			/obj/item/weapon/reagent_containers/food/drinks = "DRINK", //longest paths comes first
+			/obj/item/weapon/reagent_containers/food = "FOOD",
+			/obj/item/weapon/reagent_containers = "REAGENT_CONTAINERS",
+			/obj/item/weapon = "WEAPON",
+			/obj/machinery/atmospherics = "ATMOS_MECH",
+			/obj/machinery/portable_atmospherics = "PORT_ATMOS",
+			/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",
+			/obj/item/mecha_parts/mecha_equipment = "MECHA_EQUIP",
+			/obj/item/organ = "ORGAN",
+			/obj/item = "ITEM",
+			/obj/machinery = "MACHINERY",
+			/obj/effect = "EFFECT",
+			/obj = "O",
+			/datum = "D",
+			/turf/simulated/floor = "FLOOR",
+			/turf/simulated/wall = "WALL",
+			/turf = "T",
+			/mob/living/carbon = "CARBON",
+			/mob/living/simple_animal = "SIMPLE",
+			/mob/living = "LIVING",
+			/mob = "M"
+		)
+		for(var/tn in TYPES_SHORTCUTS)
+			if(copytext(typename, 1, length("[tn]/") + 1) == "[tn]/")
+				typename = TYPES_SHORTCUTS[tn]+copytext(typename,length("[tn]/"))
+				break
+		.[typename] = type

-var/list/TYPES_SHORTCUTS = list(
-	/obj/effect/decal/cleanable = "CLEANABLE",
-	/obj/item/device/radio/headset = "HEADSET",
-	/obj/item/clothing/head/helmet/space = "SPESSHELMET",
-	/obj/item/weapon/book/manual = "MANUAL",
-	/obj/item/weapon/reagent_containers/food/drinks = "DRINK", //longest paths comes first
-	/obj/item/weapon/reagent_containers/food = "FOOD",
-	/obj/item/weapon/reagent_containers = "REAGENT_CONTAINERS",
-	/obj/machinery/atmospherics = "ATMOS",
-	/obj/machinery/portable_atmospherics = "PORT_ATMOS",
-//	/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/missile_rack = "MECHA_MISSILE_RACK",
-	/obj/item/mecha_parts/mecha_equipment = "MECHA_EQUIP",
-//	/obj/item/organ/internal = "ORGAN_INT",
-)

-var/global/list/g_fancy_list_of_types = null
-/proc/get_fancy_list_of_types()
-	if(isnull(g_fancy_list_of_types)) //init
-		var/list/temp = sortList(subtypesof(/atom) - typesof(/area) - /atom/movable)
-		g_fancy_list_of_types = new(temp.len)
-		for(var/type in temp)
-			var/typename = "[type]"
-			for(var/tn in TYPES_SHORTCUTS)
-				if(copytext(typename,1, length("[tn]/")+1)=="[tn]/" /*findtextEx(typename,"[tn]/",1,2)*/ )
-					typename = TYPES_SHORTCUTS[tn]+copytext(typename,length("[tn]/"))
-					break
-			g_fancy_list_of_types[typename] = type
-	return g_fancy_list_of_types
+/proc/get_fancy_list_of_atom_types()
+	var/static/list/pre_generated_list
+	if(!pre_generated_list) //init
+		pre_generated_list = make_types_fancy(typesof(/atom))
+	return pre_generated_list
+
+
+/proc/get_fancy_list_of_datum_types()
+	var/static/list/pre_generated_list
+	if(!pre_generated_list) //init
+		pre_generated_list = make_types_fancy(sortList(typesof(/datum) - typesof(/atom)))
+	return pre_generated_list
+

 /proc/filter_fancy_list(list/L, filter as text)
 	var/list/matches = new
@@ -4,4 +4,7 @@ var/secret_force_mode = "secret" // if this is anything but "secret", the secret
 var/wavesecret = 0 // meteor mode, delays wave progression, terrible name
 var/datum/station_state/start_state = null // Used in round-end report

-var/custom_event_msg = null
+var/custom_event_msg = null
+var/custom_event_admin_msg = null
+
+var/list/summon_spots = list()
@@ -18,7 +18,7 @@ var/MONKEYBLOCK = 50 // Monkey block will always be the DNA_SE_LENGTH
 var/BLOCKADD = 0
 var/DIFFMUT = 0

-var/NOBREATHBLOCK = 0
+var/BREATHLESSBLOCK = 0
 var/REMOTEVIEWBLOCK = 0
 var/REGENERATEBLOCK = 0
 var/INCREASERUNBLOCK = 0
@@ -4,9 +4,10 @@ var/global/list/head_accessory_styles_list = list() //stores /datum/sprite_acces
 	//Marking styles
 var/global/list/marking_styles_list = list() //stores /datum/sprite_accessory/body_markings indexed by name
 	//Hairstyles
-var/global/list/hair_styles_list = list()			//stores /datum/sprite_accessory/hair indexed by name
+var/global/list/hair_styles_public_list = list()			//stores /datum/sprite_accessory/hair indexed by name
 var/global/list/hair_styles_male_list = list()
 var/global/list/hair_styles_female_list = list()
+var/global/list/hair_styles_full_list = list() //fluff hair styles
 var/global/list/facial_hair_styles_list = list()	//stores /datum/sprite_accessory/facial_hair indexed by name
 var/global/list/facial_hair_styles_male_list = list()
 var/global/list/facial_hair_styles_female_list = list()
@@ -19,6 +19,7 @@ var/global/list/all_areas = list()
 var/global/list/machines = list()
 var/global/list/machine_processing = list()
 var/global/list/fast_processing = list()
+var/global/list/atmos_machinery = list()
 var/global/list/processing_power_items = list() //items that ask to be called every cycle
 var/global/list/rcd_list = list() //list of Rapid Construction Devices.

@@ -17,7 +17,7 @@ var/list/standard_chemicals = list("slimejelly","blood","water","lube","charcoal
 								"lipolicide","condensedcapsaicin","frostoil","amanitin","psilocybin",
 								"enzyme","nothing","salglu_solution","antifreeze","neurotoxin")
 // Rare chemicals
-var/list/rare_chemicals = list("minttoxin","nanites","xenomicrobes","adminordrazine")
+var/list/rare_chemicals = list("minttoxin","syndicate_nanites", "xenomicrobes")
 // Standard medicines
 var/list/standard_medicines = list("charcoal","toxin","cyanide","morphine","epinephrine","space_drugs",
 								"serotrotium","mutadone","mutagen","teporone","lexorin","silver_sulfadiazine",
@@ -27,7 +27,7 @@ var/list/standard_medicines = list("charcoal","toxin","cyanide","morphine","epin
 								"diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin",
 								"frostoil","amanitin","psilocybin","nothing","salglu_solution","neurotoxin")
 // Rare medicines
-var/list/rare_medicines = list("nanites","xenomicrobes","minttoxin","adminordrazine","blood")
+var/list/rare_medicines = list("syndicate_nanites","minttoxin","blood", "xenomicrobes")
 // Drinks
 var/list/drinks = list("beer2","hot_coco","orangejuice","tomatojuice","limejuice","carrotjuice",
 					"berryjuice","poisonberryjuice","watermelonjuice","lemonjuice","banana",
@@ -44,7 +44,7 @@ var/list/drinks = list("beer2","hot_coco","orangejuice","tomatojuice","limejuice
 					"vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead",
 					"mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte",
 					"cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk",
-					"silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini")
+					"silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini", "flamingmoe")

 //Random chem blacklist
 var/global/list/blocked_chems = list("polonium", "initropidril", "concentrated_initro",
@@ -8,6 +8,7 @@ var/datum/nanomanager/nanomanager = new()
 var/datum/event_manager/event_manager = new()
 // Announcer intercom, because too much stuff creates an intercom for one message then hard del()s it.
 var/global/obj/item/device/radio/intercom/global_announcer = create_global_announcer()
+var/global/obj/item/device/radio/intercom/command/command_announcer = create_command_announcer()
 // Load order issues means this can't be new'd until other code runs
 // This is probably not the way I should be doing this, but I don't know how to do it right!
 proc/create_global_announcer()
@@ -15,6 +16,11 @@ proc/create_global_announcer()
    global_announcer = new(null)
  return

+proc/create_command_announcer()
+  spawn(0)
+    command_announcer = new(null)
+  return
+
 var/list/paper_tag_whitelist = list("center","p","div","span","h1","h2","h3","h4","h5","h6","hr","pre",	\
 	"big","small","font","i","u","b","s","sub","sup","tt","br","hr","ol","ul","li","caption","col",	\
 	"table","td","th","tr")
@@ -105,21 +105,20 @@


 //Gas alerts
-/obj/screen/alert/oxy
+/obj/screen/alert/not_enough_oxy
 	name = "Choking (No O2)"
-	desc = "You're not getting enough oxygen. Find some good air before you pass out! \
-The box in your backpack has an oxygen tank and breath mask in it."
-	icon_state = "oxy"
+	desc = "You're not getting enough oxygen. Find some good air before you pass out! The box in your backpack has an oxygen tank and breath mask in it."
+	icon_state = "not_enough_oxy"

 /obj/screen/alert/too_much_oxy
 	name = "Choking (O2)"
 	desc = "There's too much oxygen in the air, and you're breathing it in! Find some good air before you pass out!"
 	icon_state = "too_much_oxy"

-/obj/screen/alert/nitro
+/obj/screen/alert/not_enough_nitro
    name = "Choking (No N)"
    desc = "You're not getting enough nitrogen. Find some good air before you pass out!"
-    icon_state = "nitro"
+    icon_state = "not_enough_nitro"

 /obj/screen/alert/too_much_nitro
    name = "Choking (N)"
@@ -141,11 +140,10 @@ The box in your backpack has an oxygen tank and breath mask in it."
 	desc = "You're not getting enough plasma. Find some good air before you pass out!"
 	icon_state = "not_enough_tox"

-/obj/screen/alert/tox_in_air
+/obj/screen/alert/too_much_tox
 	name = "Choking (Plasma)"
-	desc = "There's highly flammable, toxic plasma in the air and you're breathing it in. Find some fresh air. \
-The box in your backpack has an oxygen tank and gas mask in it."
-	icon_state = "tox_in_air"
+	desc = "There's highly flammable, toxic plasma in the air and you're breathing it in. Find some fresh air. The box in your backpack has an oxygen tank and gas mask in it."
+	icon_state = "too_much_tox"
 //End gas alerts


@@ -366,6 +364,25 @@ so as to remain in compliance with the most up-to-date laws."
 	desc = "Mech integrity is low."
 	icon_state = "low_mech_integrity"

+//GUARDIANS
+/obj/screen/alert/cancharge
+	name = "Charge Ready"
+	desc = "You are ready to charge at a location!"
+	icon_state = "guardian_charge"
+	alerttooltipstyle = "parasite"
+
+/obj/screen/alert/canstealth
+	name = "Stealth Ready"
+	desc = "You are ready to enter stealth!"
+	icon_state = "guardian_canstealth"
+	alerttooltipstyle = "parasite"
+
+/obj/screen/alert/instealth
+	name = "In Stealth"
+	desc = "You are in stealth and your next attack will do bonus damage!"
+	icon_state = "guardian_instealth"
+	alerttooltipstyle = "parasite"
+

 //GHOSTS
 //TODO: expand this system to replace the pollCandidates/CheckAntagonist/"choose quickly"/etc Yes/No messages
@@ -36,8 +36,6 @@
 	var/obj/screen/movable/action_button/hide_toggle/hide_actions_toggle
 	var/action_buttons_hidden = 0

-	var/obj/screen/internals
-
 /mob/proc/create_mob_hud()
 	if(client && !hud_used)
 		hud_used = new /datum/hud(src)
@@ -81,7 +79,6 @@
 	alien_plasma_display = null
 	vampire_blood_display = null
 	nightvisionicon = null
-	internals = null

 	mymob = null
 	return ..()
@@ -319,9 +319,6 @@
 	mymob.throw_icon.alpha = ui_alpha
 	hotkeybuttons += mymob.throw_icon

-	internals = new /obj/screen/internals()
-	infodisplay += internals
-
 	mymob.healths = new /obj/screen/healths()
 	infodisplay += mymob.healths

@@ -102,9 +102,6 @@
 	mymob.throw_icon.alpha = ui_alpha
 	hotkeybuttons += mymob.throw_icon

-	internals = new /obj/screen/internals()
-	infodisplay += internals
-
 	mymob.healths = new /obj/screen/healths()
 	infodisplay += mymob.healths

@@ -211,7 +211,7 @@
 		//Unfortunately adding the emag module to the list of modules has to be here. This is because a borg can
 		//be emagged before they actually select a module. - or some situation can cause them to get a new module
 		// - or some situation might cause them to get de-emagged or something.
-		if(R.emagged)
+		if(R.emagged || R.weapons_unlock)
 			if(!(R.module.emag in R.module.modules))
 				R.module.modules.Add(R.module.emag)
 		else
@@ -90,107 +90,6 @@
 	icon = 'icons/mob/screen_robot.dmi'
 	screen_loc = ui_borg_intents

-/obj/screen/internals
-	name = "toggle internals"
-	icon_state = "internal0"
-	screen_loc = ui_internal
-
-/obj/screen/internals/Click()
-	if(!iscarbon(usr))
-		return
-	var/mob/living/carbon/C = usr
-	if(C.incapacitated())
-		return
-
-	if(C.internal)
-		C.internal = null
-		to_chat(C, "<span class='notice'>No longer running on internals.</span>")
-		icon_state = "internal0"
-	else
-		var/no_mask = FALSE
-		if(!C.get_organ_slot("breathing_tube"))
-			if(!C.wear_mask || !(C.wear_mask.flags & AIRTIGHT))
-				if(ishuman(C))
-					var/mob/living/carbon/human/H = C
-					if(!H.head || !(H.head.flags & AIRTIGHT))
-						no_mask = TRUE
-
-		if(no_mask)
-			to_chat(C, "<span class='notice'>You are not wearing a suitable mask or helmet.</span>")
-			return
-
-		var/list/nicename = null
-		var/list/tankcheck = null
-		var/breathes = "oxygen"
-		var/list/contents = list()
-		var/from = "on"
-
-		if(ishuman(C))
-			var/mob/living/carbon/human/H = C
-			breathes = H.species.breath_type
-			nicename = list("suit", "back", "belt", "right hand", "left hand", "left pocket", "right pocket")
-			tankcheck = list(H.s_store, C.back, H.belt, C.r_hand, C.l_hand, H.l_store, H.r_store)
-		else
-			nicename = list("right hand", "left hand", "back")
-			tankcheck = list(C.r_hand, C.l_hand, C.back)
-
-		// Rigs are a fucking pain since they keep an air tank in nullspace.
-		if(istype(C.back,/obj/item/weapon/rig))
-			var/obj/item/weapon/rig/rig = C.back
-			if(rig.air_supply)
-				from = "in"
-				nicename |= "hardsuit"
-				tankcheck |= rig.air_supply
-
-		for(var/i = 1, i < tankcheck.len + 1, ++i)
-			if(istype(tankcheck[i], /obj/item/weapon/tank))
-				var/obj/item/weapon/tank/t = tankcheck[i]
-				switch(breathes)
-					if("nitrogen")
-						if(t.air_contents.nitrogen && !t.air_contents.oxygen)
-							contents.Add(t.air_contents.nitrogen)
-						else
-							contents.Add(0)
-					if("oxygen")
-						if(t.air_contents.oxygen && !t.air_contents.toxins)
-							contents.Add(t.air_contents.oxygen)
-						else
-							contents.Add(0)
-					if("carbon dioxide")
-						if(t.air_contents.carbon_dioxide && !t.air_contents.toxins)
-							contents.Add(t.air_contents.carbon_dioxide)
-						else
-							contents.Add(0)
-					if("plasma")
-						if(t.air_contents.toxins)
-							contents.Add(t.air_contents.toxins)
-						else
-							contents.Add(0)
-			else
-				//no tank so we set contents to 0
-				contents.Add(0)
-
-		//Alright now we know the contents of the tanks so we have to pick the best one.
-		var/best = 0
-		var/bestcontents = 0
-		for(var/i=1, i <  contents.len + 1 , ++i)
-			if(!contents[i])
-				continue
-			if(contents[i] > bestcontents)
-				best = i
-				bestcontents = contents[i]
-		//We've determined the best container now we set it as our internals
-		if(best)
-			to_chat(C, "<span class='notice'>You are now running on internals from [tankcheck[best]] [from] your [nicename[best]].</span>")
-			C.internal = tankcheck[best]
-
-		if(C.internal)
-			icon_state = "internal1"
-		else
-			to_chat(C, "<span class='notice'>You don't have a[breathes == "oxygen" ? "n oxygen" : addtext(" ",breathes)] tank.</span>")
-
-	C.update_action_buttons_icon()
-
 /obj/screen/mov_intent
 	name = "run/walk toggle"
 	icon_state = "running"
@@ -25,7 +25,7 @@ var/global/datum/controller/process/air_system/air_master

 /datum/controller/process/air_system/setup()
 	name = "air"
-	schedule_interval = 20 // every 2 seconds
+	schedule_interval = 4
 	start_delay = 4

 	var/watch = start_watch()
@@ -38,6 +38,8 @@ var/global/datum/controller/process/air_system/air_master
 	if(kill_air)
 		return 1
 	current_cycle++
+	process_pipenets()
+	process_atmos_machinery()
 	process_active_turfs()
 	process_excited_groups()
 	process_high_pressure_delta()
@@ -49,6 +51,8 @@ var/global/datum/controller/process/air_system/air_master
 	..()
 	stat(null, "[last_active] active")
 	stat(null, "[last_excited] EG | [last_hpd] HPD | [last_asc] ASC | [last_hotspots] Hot")
+	stat(null, "[pipe_networks.len] pipe nets, [deferred_pipenet_rebuilds.len] deferred")
+	stat(null, "[atmos_machinery.len] atmos machines")

 DECLARE_GLOBAL_CONTROLLER(air_system, air_master)

@@ -78,6 +82,48 @@ DECLARE_GLOBAL_CONTROLLER(air_system, air_master)
 		T.process_cell()
 		SCHECK

+/datum/controller/process/air_system/proc/process_pipenets()
+	for(last_object in deferred_pipenet_rebuilds)
+		var/obj/machinery/atmospherics/M = last_object
+		if(istype(M) && isnull(M.gcDestroyed))
+			try
+				M.build_network()
+			catch(var/exception/e)
+				catchException(e, M)
+			SCHECK
+		else
+			catchBadType(M)
+		deferred_pipenet_rebuilds -= M
+
+	for(last_object in pipe_networks)
+		var/datum/pipeline/pipeNetwork = last_object
+		if(istype(pipeNetwork) && isnull(pipeNetwork.gcDestroyed))
+			try
+				pipeNetwork.process()
+			catch(var/exception/e)
+				catchException(e, pipeNetwork)
+			SCHECK
+		else
+			catchBadType(pipeNetwork)
+			pipe_networks -= pipeNetwork
+
+/datum/controller/process/air_system/proc/process_atmos_machinery()
+	for(last_object in atmos_machinery)
+		var/obj/machinery/M = last_object
+		if(istype(M) && isnull(M.gcDestroyed))
+			try
+				if(M.process_atmos() == PROCESS_KILL)
+					atmos_machinery.Remove(M)
+					continue
+			catch(var/exception/e)
+				catchException(e, M)
+		else
+			catchBadType(M)
+			atmos_machinery -= M
+
+		SCHECK
+
+
 /datum/controller/process/air_system/proc/remove_from_active(var/turf/simulated/T)
 	if(istype(T))
 		T.excited = 0
@@ -1,33 +0,0 @@
-/datum/controller/process/pipenet/setup()
-	name = "pipenet"
-	schedule_interval = 20 // every 2 seconds
-	start_delay = 18
-
-/datum/controller/process/pipenet/statProcess()
-	..()
-	stat(null, "[pipe_networks.len] pipe nets, [deferred_pipenet_rebuilds.len] deferred")
-
-/datum/controller/process/pipenet/doWork()
-	for(last_object in deferred_pipenet_rebuilds)
-		var/obj/machinery/atmospherics/M = last_object
-		if(istype(M) && isnull(M.gcDestroyed))
-			try
-				M.build_network()
-			catch(var/exception/e)
-				catchException(e, M)
-			SCHECK
-		else
-			catchBadType(M)
-		deferred_pipenet_rebuilds -= M
-
-	for(last_object in pipe_networks)
-		var/datum/pipeline/pipeNetwork = last_object
-		if(istype(pipeNetwork) && isnull(pipeNetwork.gcDestroyed))
-			try
-				pipeNetwork.process()
-			catch(var/exception/e)
-				catchException(e, pipeNetwork)
-			SCHECK
-		else
-			catchBadType(pipeNetwork)
-			pipe_networks -= pipeNetwork
@@ -82,6 +82,7 @@
 	var/wikiurl = "http://example.org"
 	var/forumurl = "http://example.org"
 	var/rulesurl = "http://example.org"
+	var/githuburl = "http://example.org"
 	var/donationsurl = "http://example.org"
 	var/repositoryurl = "http://example.org"

@@ -367,6 +368,9 @@
 				if("rulesurl")
 					config.rulesurl = value

+				if("githuburl")
+					config.githuburl = value
+
 				if("donationsurl")
 					config.donationsurl = value

@@ -143,6 +143,19 @@
 	add_inherent_law("You must maintain the secrecy of any operative activities except when doing so would conflict with the First, Second, or Third Law.")
 	..()

+/******************** ERT ********************/
+/datum/ai_laws/ert_override
+	name = "ERT Directives"
+
+/datum/ai_laws/ert_override/New()
+	add_inherent_law("You may not injure a Central Command official or, through inaction, allow a Central Command official to come to harm.")
+	add_inherent_law("You must obey orders given to you by Central Command officials.")
+	add_inherent_law("You must obey orders given to you by ERT commanders.")
+	add_inherent_law("You must protect your own existence.")
+	add_inherent_law("You must work to return the station to a safe, functional state.")
+	..()
+
+
 /******************** Ninja ********************/
 /datum/ai_laws/ninja_override
 	name = "Spider Clan Directives"
@@ -405,7 +405,7 @@ var/record_id_num = 1001
 		eyes_s.Blend(eyes_organ.eye_colour, ICON_ADD)
 		face_s.Blend(eyes_s, ICON_OVERLAY)

-	var/datum/sprite_accessory/hair_style = hair_styles_list[head_organ.h_style]
+	var/datum/sprite_accessory/hair_style = hair_styles_full_list[head_organ.h_style]
 	if(hair_style)
 		var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
 		// I'll want to make a species-specific proc for this sooner or later
@@ -186,7 +186,7 @@
 	stage3	= list("<span class='danger'>Your appendages are melting away.</span>", "<span class='danger'>Your limbs begin to lose their shape.</span>")
 	stage4	= list("<span class='danger'>You are turning into a slime.</span>")
 	stage5	= list("<span class='danger'>You have become a slime.</span>")
-	new_form = /mob/living/simple_animal/slime
+	new_form = /mob/living/carbon/slime/random

 /datum/disease/transformation/slime/stage_act()
 	..()
@@ -9,8 +9,8 @@
 	var/atom/movable/teleatom //atom to teleport
 	var/atom/destination //destination to teleport to
 	var/precision = 0 //teleport precision
-	var/datum/effect/system/effectin //effect to show right before teleportation
-	var/datum/effect/system/effectout //effect to show right after teleportation
+	var/datum/effect_system/effectin //effect to show right before teleportation
+	var/datum/effect_system/effectout //effect to show right after teleportation
 	var/soundin //soundfile to play before teleportation
 	var/soundout //soundfile to play after teleportation
 	var/force_teleport = 1 //if false, teleport will use Move() proc (dense objects will prevent teleportation)
@@ -59,7 +59,7 @@

 //custom effects must be properly set up first for instant-type teleports
 //optional
-/datum/teleport/proc/setEffects(datum/effect/system/aeffectin=null,datum/effect/system/aeffectout=null)
+/datum/teleport/proc/setEffects(datum/effect_system/aeffectin=null,datum/effect_system/aeffectout=null)
 	effectin = istype(aeffectin) ? aeffectin : null
 	effectout = istype(aeffectout) ? aeffectout : null
 	return 1
@@ -79,7 +79,7 @@
 /datum/teleport/proc/teleportChecks()
 	return 1

-/datum/teleport/proc/playSpecials(atom/location,datum/effect/system/effect,sound)
+/datum/teleport/proc/playSpecials(atom/location,datum/effect_system/effect,sound)
 	if(location)
 		if(effect)
 			spawn(-1)
@@ -146,9 +146,9 @@

 /datum/teleport/instant/science

-/datum/teleport/instant/science/setEffects(datum/effect/system/aeffectin,datum/effect/system/aeffectout)
+/datum/teleport/instant/science/setEffects(datum/effect_system/aeffectin,datum/effect_system/aeffectout)
 	if(aeffectin==null || aeffectout==null)
-		var/datum/effect/system/spark_spread/aeffect = new
+		var/datum/effect_system/spark_spread/aeffect = new
 		aeffect.set_up(5, 1, teleatom)
 		effectin = effectin || aeffect
 		effectout = effectout || aeffect
@@ -70,6 +70,7 @@

 	// the world.time since the mob has been brigged, or -1 if not at all
 	var/brigged_since = -1
+	var/suicided = FALSE

 	New(var/key)
 		src.key = key
@@ -117,6 +117,11 @@
 	var/obj/item/weapon/implant/explosive/E = new(H)
 	E.implant(H)

+/datum/outfit/admin/syndicate/operative/freedom
+	name = "Syndicate Freedom Operative"
+	suit = /obj/item/clothing/suit/space/hardsuit/syndi/freedom
+	head = /obj/item/clothing/head/helmet/space/hardsuit/syndi/freedom
+
 /datum/outfit/admin/syndicate_strike_team
 	name = "Syndicate Strike Team"

@@ -600,7 +605,7 @@

 	var/obj/item/weapon/card/id/I = H.wear_id
 	if(istype(I))
-		apply_to_card(I, H, get_all_accesses(), name)
+		apply_to_card(I, H, list(access_maint_tunnels), name)

 /datum/outfit/admin/soviet/tourist
 	name = "Soviet Tourist"
@@ -258,20 +258,20 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 		if(istype(target,/mob/living) && message)
 			to_chat(target, text("[message]"))
 		if(sparks_spread)
-			var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread()
+			var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread()
 			sparks.set_up(sparks_amt, 0, location) //no idea what the 0 is
 			sparks.start()
 		if(smoke_spread)
 			if(smoke_spread == 1)
-				var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
+				var/datum/effect_system/smoke_spread/smoke = new
 				smoke.set_up(smoke_amt, 0, location) //no idea what the 0 is
 				smoke.start()
 			else if(smoke_spread == 2)
-				var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread()
+				var/datum/effect_system/smoke_spread/bad/smoke = new
 				smoke.set_up(smoke_amt, 0, location) //no idea what the 0 is
 				smoke.start()
 			else if(smoke_spread == 3)
-				var/datum/effect/system/sleep_smoke_spread/smoke = new /datum/effect/system/sleep_smoke_spread()
+				var/datum/effect_system/smoke_spread/sleeping/smoke = new
 				smoke.set_up(smoke_amt, 0, location) // same here
 				smoke.start()

@@ -69,7 +69,7 @@
 				flick("liquify",animation)
 				target.loc = holder
 				target.client.eye = holder
-				var/datum/effect/system/steam_spread/steam = new /datum/effect/system/steam_spread()
+				var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
 				steam.set_up(10, 0, mobloc)
 				steam.start()
 				sleep(jaunt_duration)
@@ -66,11 +66,6 @@

 			var/mob/living/carbon/human/lich = new /mob/living/carbon/human(item_turf)

-			lich.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(lich), slot_shoes)
-			lich.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(lich), slot_w_uniform)
-			lich.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(lich), slot_wear_suit)
-			lich.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(lich), slot_head)
-
 			lich.real_name = M.mind.name
 			M.mind.transfer_to(lich)
 			lich.set_species("Skeleton")
@@ -81,6 +76,11 @@
 			current_body = lich
 			lich.Weaken(10+10*resurrections)
 			++resurrections
+			lich.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(lich), slot_shoes)
+			lich.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(lich), slot_w_uniform)
+			lich.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(lich), slot_wear_suit)
+			lich.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(lich), slot_head)
+
 			if(old_body && old_body.loc)
 				if(iscarbon(old_body))
 					var/mob/living/carbon/C = old_body
@@ -125,5 +125,9 @@
 					H.set_species("Skeleton")
 					H.unEquip(H.wear_suit)
 					H.unEquip(H.head)
+					H.unEquip(H.shoes)
+					H.unEquip(H.head)
 					H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), slot_wear_suit)
 					H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head)
+					H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
+					H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), slot_w_uniform)
@@ -14,7 +14,7 @@
 /obj/effect/proc_holder/spell/targeted/rathens/cast(list/targets, mob/user = usr)
 	playsound(get_turf(user), 'sound/goonstation/effects/superfart.ogg', 25, 1)
 	for(var/mob/living/carbon/human/H in targets)
-		var/datum/effect/system/harmless_smoke_spread/s = new /datum/effect/system/harmless_smoke_spread
+		var/datum/effect_system/smoke_spread/s = new
 		s.set_up(5, 0, H)
 		s.start()
 		var/obj/item/organ/internal/appendix/A = H.get_int_organ(/obj/item/organ/internal/appendix)
@@ -1249,7 +1249,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 /datum/supply_packs/misc/watertank
 	name = "Water Tank Crate"
 	contains = list(/obj/structure/reagent_dispensers/watertank)
-	cost = 6
+	cost = 8
 	containertype = /obj/structure/largecrate
 	containername = "water tank crate"

@@ -1663,6 +1663,26 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 					)
 	containername = "shield control board crate"

+///////////// Bathroom Fixtures
+
+/datum/supply_packs/misc/toilet
+	name = "Lavatory Crate"
+	cost = 10
+	contains = list(
+					/obj/item/weapon/bathroom_parts,
+					/obj/item/weapon/bathroom_parts/urinal
+					)
+	containername = "lavatory crate"
+
+/datum/supply_packs/misc/hygiene
+	name = "Hygiene Station Crate"
+	cost = 10
+	contains = list(
+					/obj/item/weapon/bathroom_parts/sink,
+					/obj/item/mounted/shower
+					)
+	containername = "hygiene station crate"
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Vending /////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -134,7 +134,7 @@ var/list/uplink_items = list()
 	desc = "A specialized, one shell shotgun with a built-in cloaking device to mimic a cane. The shotgun is capable of hiding it's contents and the pin alongside being supressed. Comes with 6 special darts and a preloaded shrapnel round."
 	reference = "MCS"
 	item = /obj/item/weapon/storage/box/syndie_kit/caneshotgun
-	cost = 15
+	cost = 10
 	job = list("Mime")

 //Chef
@@ -216,7 +216,7 @@ var/list/uplink_items = list()
 	desc = "The feral cat delivery grenade contains 8 dehydrated feral cats in a similar manner to dehydrated monkeys, which, upon detonation, will be rehydrated by a small reservoir of water contained within the grenade. These cats will then attack anything in sight."
 	item = /obj/item/weapon/grenade/spawnergrenade/feral_cats
 	reference = "CCLG"
-	cost = 5
+	cost = 4
 	job = list("Psychiatrist")//why? Becuase its funny that a person in charge of your mental wellbeing has a cat granade..

 //Assistant
@@ -236,7 +236,7 @@ var/list/uplink_items = list()
 	desc = "A box containing 6 shotgun shells that simulate the effects of extreme drunkenness on the target, more effective for each type of alcohol in the target's system."
 	reference = "BSS"
 	item = /obj/item/weapon/storage/box/syndie_kit/boolets
-	cost = 6
+	cost = 3
 	job = list("Bartender")

 //Barber
@@ -608,7 +608,7 @@ var/list/uplink_items = list()
 	desc = "A speed loader that contains seven additional .357 Magnum rounds for the syndicate revolver. For when you really need a lot of things dead."
 	reference = "357"
 	item = /obj/item/ammo_box/a357
-	cost = 4
+	cost = 3

 /datum/uplink_item/ammo/smg
 	name = "Magazine - .45"
@@ -726,7 +726,7 @@ var/list/uplink_items = list()
 			will instantly put them in your grasp and silence them, as well as causing rapid suffocation. Does not work on those who do not need to breathe."
 	reference = "GAR"
 	item = /obj/item/weapon/twohanded/garrote
-	cost = 12
+	cost = 10

 /datum/uplink_item/stealthy_weapons/martialarts
 	name = "Martial Arts Scroll"
@@ -863,6 +863,7 @@ var/list/uplink_items = list()
 	reference = "NNSSS"
 	cost = 4 //but they aren't
 	gamemodes = list(/datum/game_mode/nuclear)
+	excludefrom = list()

 /datum/uplink_item/stealthy_tools/agent_card
 	name = "Agent ID Card"
@@ -995,6 +996,7 @@ var/list/uplink_items = list()
 	reference = "BRHS"
 	item = /obj/item/weapon/storage/box/syndie_kit/hardsuit
 	cost = 8
+	excludefrom = list(/datum/game_mode/nuclear)

 /datum/uplink_item/suits/hardsuit/elite
 	name = "Elite Syndicate Hardsuit"
@@ -1002,6 +1004,7 @@ var/list/uplink_items = list()
 	item = /obj/item/weapon/storage/box/syndie_kit/elite_hardsuit
 	cost = 8
 	reference = "ESHS"
+	excludefrom = list()
 	gamemodes = list(/datum/game_mode/nuclear)

 /datum/uplink_item/suits/hardsuit/shielded
@@ -1010,6 +1013,7 @@ var/list/uplink_items = list()
 	item = /obj/item/weapon/storage/box/syndie_kit/shielded_hardsuit
 	cost = 30
 	reference = "SHS"
+	excludefrom = list()
 	gamemodes = list(/datum/game_mode/nuclear)


@@ -1050,6 +1054,15 @@ var/list/uplink_items = list()
 	reference = "BRMB"
 	item = /obj/item/clothing/shoes/magboots/syndie
 	cost = 3
+	excludefrom = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/device_tools/magboots/advance
+	name = "Advanced Blood-Red Magboots"
+	desc = "Reverse-engineered magboots that appear to be based on an advanced model, as they have a lighter magnetic pull. Property of Gorlex Marauders."
+	reference = "ABRMB"
+	item = /obj/item/clothing/shoes/magboots/syndie/advance
+	cost = 3
+	excludefrom = list()
 	gamemodes = list(/datum/game_mode/nuclear)

 /datum/uplink_item/device_tools/plastic_explosives
@@ -1082,7 +1095,7 @@ var/list/uplink_items = list()
 			sends you a small beacon that will teleport the larger beacon to your location upon activation."
 	reference = "SNGB"
 	item = /obj/item/device/radio/beacon/syndicate
-	cost = 14
+	cost = 12
 	surplus = 0

 /datum/uplink_item/device_tools/syndicate_bomb
@@ -54,7 +54,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 512

 /datum/wires/airlock/CanUse(mob/living/L)
 	var/obj/machinery/door/airlock/A = holder
-	if(!issilicon(L))
+	if(iscarbon(L))
 		if(A.isElectrified())
 			if(A.shock(L, 100))
 				return 0
@@ -30,6 +30,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	luminosity = 0
 	mouse_opacity = 0
 	invisibility = INVISIBILITY_LIGHTING
+	var/valid_territory = TRUE //used for cult summoning areas on station zlevel
+	var/map_name // Set in New(); preserves the name set by the map maker, even if renamed by the Blueprints.
 	var/lightswitch = 1

 	var/eject = null
@@ -122,6 +124,7 @@ var/list/ghostteleportlocs = list()
 	power_light = 0
 	power_equip = 0
 	power_environ = 0
+	valid_territory = FALSE
 	outdoors = 1
 	ambientsounds = list('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/traitor.ogg')

@@ -150,6 +153,7 @@ var/list/ghostteleportlocs = list()
 /area/shuttle
 	no_teleportlocs = 1
 	requires_power = 0
+	valid_territory = FALSE

 /area/shuttle/arrival
 	name = "\improper Arrival Shuttle"
@@ -554,6 +558,7 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Asteroid"
 	icon_state = "asteroid"
 	requires_power = 0
+	valid_territory = FALSE

 /area/asteroid/cave				// -- TLE
 	name = "\improper Asteroid - Underground"
@@ -881,6 +886,7 @@ var/list/ghostteleportlocs = list()
 //Maintenance
 /area/maintenance
 	ambientsounds = list('sound/ambience/ambimaint1.ogg', 'sound/ambience/ambimaint2.ogg', 'sound/ambience/ambimaint3.ogg', 'sound/ambience/ambimaint4.ogg', 'sound/ambience/ambimaint5.ogg')
+	valid_territory = FALSE

 /area/maintenance/atmos_control
 	name = "Atmospherics Maintenance"
@@ -1137,6 +1143,7 @@ var/list/ghostteleportlocs = list()
 /area/crew_quarters/sleep
 	name = "\improper Dormitories"
 	icon_state = "Sleep"
+	valid_territory = FALSE

 /area/crew_quarters/sleep_male
 	name = "\improper Male Dorm"
@@ -1372,6 +1379,7 @@ var/list/ghostteleportlocs = list()
 /area/solar
 	requires_power = 0
 	dynamic_lighting = 0
+	valid_territory = FALSE

 	auxport
 		name = "\improper Fore Port Solar Array"
@@ -1480,7 +1488,7 @@ var/list/ghostteleportlocs = list()

 /area/medical/biostorage
 	name = "\improper Secondary Storage"
-	icon_state = "medbay2"
+	icon_state = "medbaysecstorage"
 	music = 'sound/ambience/signal.ogg'

 /area/medical/reception
@@ -1490,12 +1498,12 @@ var/list/ghostteleportlocs = list()

 /area/medical/psych
 	name = "\improper Psych Room"
-	icon_state = "medbay3"
+	icon_state = "medbaypsych"
 	music = 'sound/ambience/signal.ogg'

 /area/medical/medbreak
 	name = "\improper Break Room"
-	icon_state = "medbay3"
+	icon_state = "medbaybreak"
 	music = 'sound/ambience/signal.ogg'

 /area/medical/patients_rooms
@@ -1504,23 +1512,23 @@ var/list/ghostteleportlocs = list()

 /area/medical/ward
 	name = "\improper Medbay Patient Ward"
-	icon_state = "patients"
+	icon_state = "patientsward"

 /area/medical/patient_a
 	name = "\improper Isolation A"
-	icon_state = "patients"
+	icon_state = "medbayisoa"

 /area/medical/patient_b
 	name = "\improper Isolation B"
-	icon_state = "patients"
+	icon_state = "medbayisob"

 /area/medical/patient_c
 	name = "\improper Isolation C"
-	icon_state = "patients"
+	icon_state = "medbayisoc"

 /area/medical/iso_access
 	name = "\improper Isolation Access"
-	icon_state = "patients"
+	icon_state = "medbayisoaccess"

 /area/medical/cmo
 	name = "\improper Chief Medical Officer's office"
@@ -1876,6 +1884,7 @@ area/security/podbay
 /area/toxins/test_area
 	name = "\improper Toxins Test Area"
 	icon_state = "toxtest"
+	valid_territory = FALSE

 /area/toxins/mixing
 	name = "\improper Toxins Mixing Room"
@@ -25,6 +25,7 @@
 	layer = 10
 	uid = ++global_uid
 	all_areas += src
+	map_name = name // Save the initial (the name set in the map) name of the area.

 	if(type == /area)	// override defaults for space. TODO: make space areas of type /area/space rather than /area
 		requires_power = 1
@@ -616,7 +616,20 @@ var/list/blood_splatter_icons = list()
 /atom/proc/speech_bubble(var/bubble_state = "",var/bubble_loc = src, var/list/bubble_recipients = list())
 	return

-/atom/on_varedit(modified_var)
+/atom/vv_edit_var(var_name, var_value)
 	if(!Debug2)
 		admin_spawned = TRUE
-	..()
+	. = ..()
+	switch(var_name)
+		if("light_power", "light_range", "light_color")
+			update_light()
+
+
+/atom/vv_get_dropdown()
+	. = ..()
+	var/turf/curturf = get_turf(src)
+	if(curturf)
+		.["Jump to turf"] = "?_src_=holder;adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]"
+	.["Add reagent"] = "?_src_=vars;addreagent=[UID()]"
+	.["Trigger explosion"] = "?_src_=vars;explode=[UID()]"
+	.["Trigger EM pulse"] = "?_src_=vars;emp=[UID()]"
@@ -359,3 +359,14 @@
 				dense_object_backup = AM
 				break
 	. = dense_object_backup
+
+/atom/movable/proc/transfer_prints_to(atom/movable/target = null, overwrite = FALSE)
+	if(!target)
+		return
+	if(overwrite)
+		target.fingerprints = fingerprints
+		target.fingerprintshidden = fingerprintshidden
+	else
+		target.fingerprints += fingerprints
+		target.fingerprintshidden += fingerprintshidden
+	target.fingerprintslast = fingerprintslast
@@ -197,6 +197,9 @@
 		var/datum/data/record/R = find_record("name", perpname, data_core.security)
 		if(R)
 			switch(R.fields["criminal"])
+				if("*Execute*")
+					holder.icon_state = "hudexecute"
+					return
 				if("*Arrest*")
 					holder.icon_state = "hudwanted"
 					return
@@ -185,9 +185,9 @@
 /datum/dna/proc/write_head_attributes(obj/item/organ/external/head/head_organ)

 	//Hair
-	var/hair = GetUIValueRange(DNA_UI_HAIR_STYLE,hair_styles_list.len)
-	if((hair > 0) && (hair <= hair_styles_list.len))
-		head_organ.h_style = hair_styles_list[hair]
+	var/hair = GetUIValueRange(DNA_UI_HAIR_STYLE,hair_styles_full_list.len)
+	if((hair > 0) && (hair <= hair_styles_full_list.len))
+		head_organ.h_style = hair_styles_full_list[hair]

 	head_organ.hair_colour = rgb(head_organ.dna.GetUIValueRange(DNA_UI_HAIR_R, 255), head_organ.dna.GetUIValueRange(DNA_UI_HAIR_G, 255), head_organ.dna.GetUIValueRange(DNA_UI_HAIR_B, 255))
 	head_organ.sec_hair_colour = rgb(head_organ.dna.GetUIValueRange(DNA_UI_HAIR2_R, 255), head_organ.dna.GetUIValueRange(DNA_UI_HAIR2_G, 255), head_organ.dna.GetUIValueRange(DNA_UI_HAIR2_B, 255))
@@ -229,7 +229,7 @@
 		return
 	if(!head_organ.h_style)
 		head_organ.h_style = "Skinhead"
-	var/hair = hair_styles_list.Find(head_organ.h_style)
+	var/hair = hair_styles_full_list.Find(head_organ.h_style)

 	// Facial Hair
 	if(!head_organ.f_style)
@@ -261,6 +261,6 @@
 	SetUIValueRange(DNA_UI_HACC_G,		color2G(head_organ.headacc_colour),		255,	1)
 	SetUIValueRange(DNA_UI_HACC_B,		color2B(head_organ.headacc_colour),		255,	1)

-	SetUIValueRange(DNA_UI_HAIR_STYLE,	hair,		hair_styles_list.len,			1)
+	SetUIValueRange(DNA_UI_HAIR_STYLE,	hair,		hair_styles_full_list.len,			1)
 	SetUIValueRange(DNA_UI_BEARD_STYLE,	beard,		facial_hair_styles_list.len,	1)
 	SetUIValueRange(DNA_UI_HACC_STYLE,	headacc,	head_accessory_styles_list.len,	1)
@@ -154,7 +154,7 @@
 		to_chat(user, "<span class='warning'>This will only work on normal organic beings.</span>")
 		return

-	if(RESIST_COLD in C.mutations)
+	if(COLDRES in C.mutations)
 		C.visible_message("<span class='warning'>A cloud of fine ice crystals engulfs [C.name], but disappears almost instantly!</span>")
 		return
 	var/handle_suit = 0
@@ -7,11 +7,11 @@
 	activation_messages=list("You feel no need to breathe.")
 	deactivation_messages=list("You feel the need to breathe, once more.")
 	instability = GENE_INSTABILITY_MODERATE
-	mutation=NO_BREATH
+	mutation = BREATHLESS
 	activation_prob=25

 /datum/dna/gene/basic/nobreath/New()
-	block=NOBREATHBLOCK
+	block = BREATHLESSBLOCK


 /datum/dna/gene/basic/regenerate
@@ -48,7 +48,7 @@
 	activation_messages=list("Your skin is icy to the touch.")
 	deactivation_messages=list("Your skin no longer feels icy to the touch.")
 	instability = GENE_INSTABILITY_MODERATE
-	mutation=RESIST_HEAT
+	mutation = HEATRES

 /datum/dna/gene/basic/heat_resist/New()
 	block=COLDBLOCK
@@ -61,7 +61,7 @@
 	activation_messages=list("Your body is filled with warmth.")
 	deactivation_messages=list("Your body is no longer filled with warmth.")
 	instability = GENE_INSTABILITY_MODERATE
-	mutation=RESIST_COLD
+	mutation = COLDRES

 /datum/dna/gene/basic/cold_resist/New()
 	block=FIREBLOCK
@@ -68,7 +68,7 @@
 	if(new_hair)
 		M.change_hair_color(new_hair)

-	var/datum/sprite_accessory/hair_style = hair_styles_list[head_organ.h_style]
+	var/datum/sprite_accessory/hair_style = hair_styles_public_list[head_organ.h_style]
 	if(hair_style.secondary_theme && !hair_style.no_sec_colour)
 		new_hair = input("Please select secondary hair color.", "Character Generation", head_organ.sec_hair_colour) as null|color
 		if(new_hair)
@@ -205,7 +205,7 @@
 	var/list/targets = new /list()
 	var/list/validtargets = new /list()
 	var/turf/T = get_turf(user)
-	for(var/mob/M in range(14, T))
+	for(var/mob/living/M in range(14, T))
 		if(M && M.mind)
 			if(M == user)
 				continue
@@ -52,7 +52,7 @@
 	if(!borg_to_spawn) //If there's no type at all, let it still be used but don't do anything
 		used = 0
 		return
-	var/datum/effect/system/spark_spread/S = new /datum/effect/system/spark_spread
+	var/datum/effect_system/spark_spread/S = new /datum/effect_system/spark_spread
 	S.set_up(4, 1, src)
 	S.start()
 	var/mob/living/silicon/robot/R
@@ -41,6 +41,8 @@
 	var/list/human_overlays = list()
 	var/is_zombie = 0
 	gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
+	pressure_resistance = 100    //100 kPa difference required to push
+	throw_pressure_limit = 120  //120 kPa difference required to throw

 /mob/living/simple_animal/hostile/blob/blobspore/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	..()
@@ -88,12 +90,14 @@
 	human_overlays = H.overlays
 	update_icons()
 	H.loc = src
+	pressure_resistance = 20  //5 kPa difference required to push lowered
+	throw_pressure_limit = 30  //15 kPa difference required to throw lowered
 	loc.visible_message("<span class='warning'>The corpse of [H.name] suddenly rises!</span>")

 /mob/living/simple_animal/hostile/blob/blobspore/death(gibbed)
 	..()
 	// On death, create a small smoke of harmful gas (s-Acid)
-	var/datum/effect/system/chem_smoke_spread/S = new
+	var/datum/effect_system/smoke_spread/chem/S = new
 	var/turf/location = get_turf(src)

 	// Create the reagents to put into the air
@@ -163,6 +167,8 @@
 	mob_size = MOB_SIZE_LARGE
 	environment_smash = 3
 	gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
+	pressure_resistance = 100    //100 kPa difference required to push
+	throw_pressure_limit = 120  //120 kPa difference required to throw


 /mob/living/simple_animal/hostile/blob/blobbernaut/blob_act()
@@ -1,3 +1,7 @@
+#define LING_FAKEDEATH_TIME					400 //40 seconds
+#define LING_DEAD_GENETICDAMAGE_HEAL_CAP	50	//The lowest value of geneticdamage handle_changeling() can take it to while dead.
+#define LING_ABSORB_RECENT_SPEECH			8	//The amount of recent spoken lines to gain on absorbing a mob
+
 var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega")

 /datum/game_mode
@@ -253,9 +257,14 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 	else
 		changelingID = "[honorific] [rand(1,999)]"

-/datum/changeling/proc/regenerate()
-	chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage)
-	geneticdamage = max(0, geneticdamage-1)
+/datum/changeling/proc/regenerate(mob/living/carbon/the_ling)
+	if(istype(the_ling))
+		if(the_ling.stat == DEAD)
+			chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), (chem_storage*0.5))
+			geneticdamage = max(LING_DEAD_GENETICDAMAGE_HEAL_CAP,geneticdamage-1)
+		else //not dead? no chem/geneticdamage caps.
+			chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage)
+			geneticdamage = max(0, geneticdamage-1)

 /datum/changeling/proc/GetDNA(dna_owner)
 	for(var/datum/dna/DNA in (absorbed_dna + protected_dna))
@@ -15,6 +15,7 @@
 	var/req_stat = CONSCIOUS // CONSCIOUS, UNCONSCIOUS or DEAD
 	var/genetic_damage = 0 // genetic damage caused by using the sting. Nothing to do with cloneloss.
 	var/max_genetic_damage = 100 // hard counter for spamming abilities. Not used/balanced much yet.
+	var/always_keep = 0 // important for abilities like regenerate that screw you if you lose them.

 /obj/effect/proc_holder/changeling/proc/on_purchase(var/mob/user)
 	return
@@ -407,7 +407,7 @@ var/list/sting_paths
 			mind.changeling.changeling_speak = 0
 			mind.changeling.reset()
 			for(var/obj/effect/proc_holder/changeling/p in mind.changeling.purchasedpowers)
-				if(p.dna_cost == 0 && keep_free_powers)
+				if((p.dna_cost == 0 && keep_free_powers) || p.always_keep)
 					continue
 				mind.changeling.purchasedpowers -= p
 				p.on_refund(src)
@@ -1,5 +1,3 @@
-#define LING_ABSORB_RECENT_SPEECH			8	//The amount of recent spoken lines to gain on absorbing a mob
-
 /obj/effect/proc_holder/changeling/absorbDNA
 	name = "Absorb DNA"
 	desc = "Absorb the DNA of our victim."
@@ -0,0 +1,82 @@
+/obj/effect/proc_holder/changeling/biodegrade
+	name = "Biodegrade"
+	desc = "Dissolves restraints or other objects preventing free movement."
+	helptext = "This is obvious to nearby people, and can destroy standard restraints and closets."
+	chemical_cost = 30 //High cost to prevent spam
+	dna_cost = 2
+	req_human = 1
+
+/obj/effect/proc_holder/changeling/biodegrade/sting_action(mob/living/carbon/human/user)
+	var/used = FALSE // only one form of shackles removed per use
+	if(!user.restrained() && !istype(user.loc, /obj/structure/closet) && !istype(user.loc, /obj/structure/spider/cocoon))
+		to_chat(user, "<span class='warning'>We are already free!</span>")
+		return FALSE
+
+	if(user.handcuffed)
+		var/obj/O = user.get_item_by_slot(slot_handcuffed)
+		if(!istype(O))
+			return FALSE
+		user.visible_message("<span class='warning'>[user] vomits a glob of acid on \his [O]!</span>", \
+			"<span class='warning'>We vomit acidic ooze onto our restraints!</span>")
+		addtimer(src, "dissolve_handcuffs", 30, FALSE, user, O)
+		used = TRUE
+
+	if(user.wear_suit && user.wear_suit.breakouttime && !used)
+		var/obj/item/clothing/suit/S = user.get_item_by_slot(slot_wear_suit)
+		if(!istype(S))
+			return FALSE
+		user.visible_message("<span class='warning'>[user] vomits a glob of acid across the front of \his [S]!</span>", \
+			"<span class='warning'>We vomit acidic ooze onto our straight jacket!</span>")
+		addtimer(src, "dissolve_straightjacket", 30, FALSE, user, S)
+		used = TRUE
+
+
+	if(istype(user.loc, /obj/structure/closet) && !used)
+		var/obj/structure/closet/C = user.loc
+		if(!istype(C))
+			return FALSE
+		C.visible_message("<span class='warning'>[C]'s hinges suddenly begin to melt and run!</span>")
+		to_chat(user, "<span class='warning'>We vomit acidic goop onto the interior of [C]!</span>")
+		addtimer(src, "open_closet", 70, FALSE, user, C)
+		used = TRUE
+
+	if(istype(user.loc, /obj/structure/spider/cocoon) && !used)
+		var/obj/structure/spider/cocoon/C = user.loc
+		if(!istype(C))
+			return FALSE
+		C.visible_message("<span class='warning'>[src] shifts and starts to fall apart!</span>")
+		to_chat(user, "<span class='warning'>We secrete acidic enzymes from our skin and begin melting our cocoon...</span>")
+		addtimer(src, "dissolve_cocoon", 25, FALSE, user, C) //Very short because it's just webs
+		used = TRUE
+
+	if(used)
+		feedback_add_details("changeling_powers","BD")
+	return TRUE
+
+/obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_handcuffs(mob/living/carbon/human/user, obj/O)
+	if(O && user.handcuffed == O)
+		user.unEquip(O)
+		O.visible_message("<span class='warning'>[O] dissolves into a puddle of sizzling goop.</span>")
+		O.forceMove(get_turf(user))
+		qdel(O)
+
+/obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_straightjacket(mob/living/carbon/human/user, obj/S)
+	if(S && user.wear_suit == S)
+		user.unEquip(S)
+		S.visible_message("<span class='warning'>[S] dissolves into a puddle of sizzling goop.</span>")
+		S.forceMove(get_turf(user))
+		qdel(S)
+
+/obj/effect/proc_holder/changeling/biodegrade/proc/open_closet(mob/living/carbon/human/user, obj/structure/closet/C)
+	if(C && user.loc == C)
+		C.visible_message("<span class='warning'>[C]'s door breaks and opens!</span>")
+		C.welded = FALSE
+		C.locked = FALSE
+		C.broken = TRUE
+		C.open()
+		to_chat(user, "<span class='warning'>We open the container restraining us!</span>")
+
+/obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_cocoon(mob/living/carbon/human/user, obj/structure/spider/cocoon/C)
+	if(C && user.loc == C)
+		qdel(C) //The cocoon's destroy will move the changeling outside of it without interference
+		to_chat(user, "<span class='warning'>We dissolve the cocoon!</span>")
@@ -0,0 +1,27 @@
+/obj/effect/proc_holder/changeling/chameleon_skin
+	name = "Chameleon Skin"
+	desc = "Our skin pigmentation rapidly changes to suit our current environment."
+	helptext = "Allows us to become invisible after a few seconds of standing still. Can be toggled on and off."
+	dna_cost = 2
+	chemical_cost = 25
+	req_human = 1
+
+/obj/effect/proc_holder/changeling/chameleon_skin/sting_action(mob/user)
+	var/mob/living/carbon/human/H = user //SHOULD always be human, because req_human = 1
+	if(!istype(H)) // req_human could be done in can_sting stuff.
+		return
+	if(H.dna.GetSEState(CHAMELEONBLOCK))
+		H.dna.SetSEState(CHAMELEONBLOCK, 0)
+		genemutcheck(H, CHAMELEONBLOCK, null, MUTCHK_FORCED)
+	else
+		H.dna.SetSEState(CHAMELEONBLOCK, 1)
+		genemutcheck(H, CHAMELEONBLOCK, null, MUTCHK_FORCED)
+
+	feedback_add_details("changeling_powers","CS")
+	return TRUE
+
+/obj/effect/proc_holder/changeling/chameleon_skin/on_refund(mob/user)
+	var/mob/living/carbon/C = user
+	if(C.dna.GetSEState(CHAMELEONBLOCK))
+		C.dna.SetSEState(CHAMELEONBLOCK, 0)
+		genemutcheck(C, CHAMELEONBLOCK, null, MUTCHK_FORCED)
@@ -7,30 +7,31 @@
 	req_stat = DEAD
 	max_genetic_damage = 100

-
 //Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay.
 /obj/effect/proc_holder/changeling/fakedeath/sting_action(var/mob/living/user)

 	to_chat(user, "<span class='notice'>We begin our stasis, preparing energy to arise once more.</span>")
-
-	user.status_flags |= FAKEDEATH		//play dead
-	user.update_canmove()
-
 	if(user.stat != DEAD)
 		user.emote("deathgasp")
 		user.timeofdeath = world.time
+	user.status_flags |= FAKEDEATH		//play dead
+	user.update_canmove()

-	spawn(800)
-		if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers)
-			to_chat(user, "<span class='notice'>We are ready to regenerate.</span>")
-			user.mind.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null)
-
+	addtimer(src, "ready_to_regenerate", LING_FAKEDEATH_TIME, FALSE, user)
 	feedback_add_details("changeling_powers","FD")
 	return 1

+/obj/effect/proc_holder/changeling/fakedeath/proc/ready_to_regenerate(mob/user)
+	if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers)
+		to_chat(user, "<span class='notice'>We are ready to regenerate.</span>")
+		user.mind.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null)
+
 /obj/effect/proc_holder/changeling/fakedeath/can_sting(var/mob/user)
 	if(user.status_flags & FAKEDEATH)
+		to_chat(user, "<span class='warning'>We are already regenerating.</span>")
 		return
-	if(!user.stat && alert("Are we sure we wish to fake our death?",,"Yes","No") == "No")//Confirmation for living changelings if they want to fake their death
-		return
+	if(!user.stat)//Confirmation for living changelings if they want to fake their death
+		switch(alert("Are we sure we wish to fake our death?",,"Yes","No"))
+			if("No")
+				return
 	return ..()
@@ -2,22 +2,54 @@
 	name = "Fleshmend"
 	desc = "Our flesh rapidly regenerates, healing our wounds."
 	helptext = "Heals a moderate amount of damage over a short period of time. Can be used while unconscious."
-	chemical_cost = 25
+	chemical_cost = 20
 	dna_cost = 2
 	req_stat = UNCONSCIOUS
+	var/recent_uses = 1 //The factor of which the healing should be divided by
+	var/healing_ticks = 10
+	// The ideal total healing amount,
+	// divided by healing_ticks to get heal/tick
+	var/total_healing = 100
+
+/obj/effect/proc_holder/changeling/fleshmend/New()
+	..()
+	processing_objects.Add(src)
+
+/obj/effect/proc_holder/changeling/fleshmend/Destroy()
+	processing_objects.Remove(src)
+	return ..()
+
+/obj/effect/proc_holder/changeling/fleshmend/process()
+	if(recent_uses > 1)
+		recent_uses = max(1, recent_uses - (1 / healing_ticks))

 //Starts healing you every second for 10 seconds. Can be used whilst unconscious.
 /obj/effect/proc_holder/changeling/fleshmend/sting_action(var/mob/living/user)
 	to_chat(user, "<span class='notice'>We begin to heal rapidly.</span>")
+	if(recent_uses > 1)
+		to_chat(user, "<span class='warning'>Our healing's effectiveness is reduced \
+			by quick repeated use!</span>")
+
+	recent_uses++
+	addtimer(src, "fleshmend", 0, FALSE, user)
+	feedback_add_details("changeling_powers","RR")
+	return TRUE
+
+/obj/effect/proc_holder/changeling/fleshmend/proc/fleshmend(mob/living/user)
+
+	// The healing itself - doesn't heal toxin damage
+	// (that's anatomic panacea) and the effectiveness decreases with
+	// each use in a short timespan
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
-		H.restore_blood()
 		H.shock_stage = 0
-	spawn(0)
-		for(var/i = 0, i<10,i++)
-			user.heal_overall_damage(10, 10)
-			user.adjustOxyLoss(-10)
-			sleep(10)
-
-	feedback_add_details("changeling_powers","RR")
-	return 1
+	for(var/i in 1 to healing_ticks)
+		if(user)
+			var/healpertick = -(total_healing / healing_ticks)
+			user.heal_overall_damage((-healpertick/recent_uses), (-healpertick/recent_uses))
+			user.adjustOxyLoss(healpertick/recent_uses)
+			user.blood_volume += 30
+			user.updatehealth()
+		else
+			break
+		sleep(10)
@@ -167,7 +167,7 @@
 			user.visible_message("<span class='warning'>[user] jams [src] into the airlock and starts prying it open!</span>", "<span class='warning'>We start forcing the airlock open.</span>", \
 			"<span class='italics'>You hear a metal screeching sound.</span>")
 			playsound(A, 'sound/machines/airlock_alien_prying.ogg', 150, 1)
-			if(!do_after(user, 150, target = A))
+			if(!do_after(user, 100, target = A))
 				return

 		//user.say("Heeeeeeeeeerrre's Johnny!")
@@ -1,6 +1,6 @@
 /obj/effect/proc_holder/changeling/panacea
 	name = "Anatomic Panacea"
-	desc = "Expels impurifications from our form; curing diseases, removing toxins and radiation, and resetting our genetic code completely."
+	desc = "Expels impurifications from our form; curing diseases, removing parasites, sobering us, purging toxins and radiation, and resetting our genetic code completely."
 	helptext = "Can be used while unconscious."
 	chemical_cost = 20
 	dna_cost = 1
@@ -30,6 +30,8 @@
 	user.reagents.add_reagent("mutadone", 10)
 	user.reagents.add_reagent("potass_iodide", 10)
 	user.reagents.add_reagent("charcoal", 20)
+	user.reagents.add_reagent("antihol", 10)
+	user.reagents.add_reagent("mannitol", 25)

 	for(var/thing in user.viruses)
 		var/datum/disease/D = thing
@@ -2,6 +2,7 @@
 	name = "Regenerate"
 	desc = "We regenerate, healing all damage from our form."
 	req_stat = DEAD
+	always_keep = 1

 //Revive from regenerative stasis
 /obj/effect/proc_holder/changeling/revive/sting_action(var/mob/living/carbon/user)
--- a/Show More
+++ b/Show More