Merge branch 'master' into tweaklandia

GainStation13/code/machinery/doors/airlock_types.dm

@@ -7,6 +7,17 @@
 	if(isnull(stuckage_weight) || (stuckage_weight < 10))
 		return ..() // They aren't able to get stuck
 
+	var/chance_to_get_stuck = L?.client?.prefs?.stuckage_chance * 100
+	if(chance_to_get_stuck && L.fatness > stuckage_weight)
+		if(prob(chance_to_get_stuck))
+			L.doorstuck = 1
+			L.visible_message("<span class'danger'>[L] gets stuck in the doorway!</span>")
+			to_chat(L, "<span class='danger'>As you attempt to pass through  \the [src], your ample curves get wedged in the narrow opening. You find yourself stuck in the [src] frame, struggling to free yourself from the tight squeeze.</span>")
+			L.Stun(55, updating = TRUE, ignore_canstun = TRUE)
+			addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/door/airlock/, AsyncDoorstuckCall), L), 55)
+		return ..()
+
+
 	if(L.fatness > (stuckage_weight * 2))
 		if(rand(1, 3) == 1)
 			L.doorstuck = 1

GainStation13/code/modules/cargo/packs.dm

@@ -9,6 +9,12 @@
 	contains = list(/obj/item/vending_refill/mealdor)
 	crate_name = "meal vendor supply crate"
 
+/datum/supply_pack/engineering/energy_harvester_board
+	name = "Energy Harvester Board"
+	desc = "Engineering made some crazy power device that seems to be creating massive amounts of energy out of thin air? With the parts found in this crate, you'll be able to make some sweet cash out of the engineers hard labor. Half of the credits made by this machine go to the engineering budget."
+	cost = 5000
+	contains = list(/obj/item/circuitboard/machine/energy_harvester)
+	crate_name = "Energy Harvester Board supply crate"
 
 /datum/supply_pack/organic/strangeseeds
 	name = "Strange Seeds Crate"
@@ -23,4 +29,4 @@
 					/obj/item/seeds/random,
 					/obj/item/seeds/random)
 	crate_name = "strange seeds crate"
-	crate_type = /obj/structure/closet/crate/hydroponics
+	crate_type = /obj/structure/closet/crate/hydroponics

GainStation13/code/modules/client/preferences/preferences.dm

@@ -27,6 +27,8 @@
 	var/weight_gain_permanent = FALSE
 	/// At what weight will you start to get stuck in airlocks?
 	var/stuckage = FALSE
+	// Percentage chance to get stuck in doors. Setting this to 0 will make the chance depend on the person's weight
+	var/stuckage_chance = 0
 	/// At what weight will you start to break chairs?
 	var/chair_breakage = FALSE
 	/// Are items that only affect those at high weights able to affect the player?

GainStation13/code/modules/power/energy_harvester.dm

@@ -0,0 +1,212 @@
+#define DRAIN_MODIFIER 0.0125
+#define CREDIT_CONVERSION_EFFICIENCY 0.0000025
+
+
+/obj/machinery/power/energy_harvester
+	desc = "A Device which upon connection to a node, will harvest the energy and send it to engineerless stations in return for credits, derived from a syndicate powersink model. The instructions say to never use more than 4 harvesters at a time."
+	name = "Energy Harvesting Module"
+	density = TRUE
+	use_power = NO_POWER_USE
+	icon = 'GainStation13/icons/obj/energy_harvester.dmi'			// by AlManiak
+	icon_state = "off"
+	circuit = /obj/item/circuitboard/machine/energy_harvester
+	var/datum/looping_sound/generator/soundloop
+
+
+	var/maximum_net_drain_percentage = 0.05
+	var/set_power_drain = 0.05
+	var/credit_conversion_rate = 0.000005
+	var/power_available = 0
+	var/active = FALSE
+
+/obj/machinery/power/energy_harvester/Initialize(mapload)
+	. = ..()
+	soundloop = new(src, active)
+	RefreshParts()
+	if(anchored)
+		if(connect_to_network())
+			power_available = avail()
+
+/obj/machinery/power/energy_harvester/Destroy()
+	disconnect_from_network()
+	QDEL_NULL(soundloop)
+	return ..()
+
+/obj/machinery/power/energy_harvester/RefreshParts()
+	var/capacitor_rating = 0
+	var/manipulator_rating = 0
+
+	for(var/obj/item/stock_parts/capacitor/capacitor in component_parts)
+		capacitor_rating += capacitor.rating
+	maximum_net_drain_percentage = capacitor_rating * DRAIN_MODIFIER
+
+	for(var/obj/item/stock_parts/manipulator/manipulator in component_parts)
+		manipulator_rating += manipulator.rating
+	credit_conversion_rate = manipulator_rating * CREDIT_CONVERSION_EFFICIENCY
+
+/obj/machinery/power/energy_harvester/process()
+	if(!active)
+		return
+
+	if(!is_operational())
+		return
+
+	if(!powernet)
+		src.visible_message("<span class='alert'>[src] buzzes. Seems like it's not connected to a powernet.</span>")
+		playsound(src, 'sound/machines/buzz-two.ogg', 50)
+		active = FALSE
+		icon_state = "off"
+		set_light(0)
+		soundloop.stop()
+		return
+
+	power_available = avail()
+	if(power_available <= 0)
+		src.visible_message("<span class='alert'>[src] buzzes. Seems like there is no energy in the connected powernet.</span>")
+		playsound(src, 'sound/machines/buzz-two.ogg', 50)
+		active = FALSE
+		icon_state = "off"
+		set_light(0)
+		soundloop.stop()
+		return
+
+	var/power_drain = power_available * set_power_drain
+	add_load(power_drain)
+	var/credits_earned = credit_conversion_rate * power_drain
+
+	var/datum/bank_account/engineering_budget = SSeconomy.get_dep_account(ACCOUNT_ENG)
+	if(engineering_budget)
+		engineering_budget.adjust_money(credits_earned / 2)
+
+	var/datum/bank_account/cargo_budget = SSeconomy.get_dep_account(ACCOUNT_CAR)
+	if(cargo_budget)
+		cargo_budget.adjust_money(credits_earned / 2)
+
+
+
+/obj/machinery/power/energy_harvester/default_unfasten_wrench(mob/user, obj/item/I, time = 20)
+	. = ..()
+	if(. == SUCCESSFUL_UNFASTEN)
+		if(anchored)
+			if(connect_to_network())
+				power_available = avail()
+		else
+			disconnect_from_network()
+			power_available = 0
+
+/obj/machinery/power/energy_harvester/screwdriver_act(mob/living/user, obj/item/I)
+	if(..())
+		return TRUE
+
+	if(!active)
+		default_deconstruction_screwdriver(user, "open", "off", I)
+		return TRUE
+
+	return FALSE
+
+/obj/machinery/power/energy_harvester/wrench_act(mob/living/user, obj/item/I)
+	if(panel_open)
+		default_unfasten_wrench(user, I)
+		return TRUE
+
+	return FALSE
+
+/obj/machinery/power/energy_harvester/crowbar_act(mob/living/user, obj/item/I)
+	if(panel_open)
+		default_deconstruction_crowbar(I)
+		return TRUE
+
+	return FALSE
+
+/obj/machinery/power/energy_harvester/connect_to_network()
+	. = ..()
+
+	if(!.)
+		return FALSE
+	
+	if(too_many_harvesters_in_network())
+		src.visible_message("<span class='alert'>[src] buzzes. Seems like there are too many energy harvesters connected to this powernet.</span>")
+		playsound(src, 'sound/machines/buzz-two.ogg', 50)
+		disconnect_from_network()
+		return FALSE
+	
+	return TRUE
+
+/obj/machinery/power/energy_harvester/proc/too_many_harvesters_in_network()
+	var/counter = 0
+	for(var/machine in powernet.nodes)
+		if(istype(machine, /obj/machinery/power/energy_harvester))
+			counter += 1
+			if(counter > 4)
+				return TRUE
+
+	return FALSE
+
+/obj/machinery/power/energy_harvester/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "EnergyHarvester", name)
+		ui.open()
+
+/obj/machinery/power/energy_harvester/ui_data(mob/user)
+	var/list/data = list()
+	data["active"] = active
+
+	data["power_available"] = power_available
+	data["set_power_drain"] = set_power_drain * 100
+	data["power_drain"] = power_available * set_power_drain * active
+	data["credit_conversion_rate"] = credit_conversion_rate
+	data["maximum_drain"] = maximum_net_drain_percentage * 100
+
+	return data
+
+/obj/machinery/power/energy_harvester/ui_act(action, params)
+	if(..())
+		return
+
+	switch(action)
+		if("power")
+			if(panel_open)
+				return
+			if(!anchored)
+				return
+			if(!active && !powernet)
+				src.visible_message("<span class='alert'>[src] buzzes. Seems like it's not connected to a powernet.</span>")
+				playsound(src, 'sound/machines/buzz-two.ogg', 50)
+				return
+
+			if(active)
+				active = FALSE
+				icon_state = "off"
+				set_light(0)
+				soundloop.stop()
+			else
+				power_available = avail()
+				if(power_available <= 0)
+					return
+				active = TRUE
+				icon_state = "on"
+				set_light(1, 1, "#9999FF")
+				soundloop.start()
+			. = TRUE
+
+		if("drain_percentage")
+			var/target = params["target"]
+			if(text2num(target) != null)
+				target = text2num(target)
+				. = TRUE
+			if(.)
+				set_power_drain = clamp(target, 1, maximum_net_drain_percentage * 100)
+				set_power_drain /= 100
+
+/obj/item/circuitboard/machine/energy_harvester
+	name = "Energy Harvester (Machine Board)"
+	build_path = /obj/machinery/power/energy_harvester
+	needs_anchored = FALSE
+	req_components = list(
+		/obj/item/stock_parts/capacitor = 4,
+		/obj/item/stock_parts/manipulator = 2)
+
+
+#undef DRAIN_MODIFIER
+#undef CREDIT_CONVERSION_EFFICIENCY

GainStation13/code/modules/research/designs/ipc_designs.dm

@@ -0,0 +1,53 @@
+/////////////////////////////
+/////Synth and IPC Organs////
+/////////////////////////////
+
+/datum/design/ipc_heart
+	name = "IPC heart"
+	desc = "Allows for the construction of an IPC heart."
+	id = "ipc_heart"
+	build_type = PROTOLATHE | MECHFAB
+	materials = list(/datum/material/glass = 400, /datum/material/iron = 800, /datum/material/gold = 300)
+	build_path = /obj/item/organ/heart/ipc
+	category = list("Misc", "Medical Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/ipc_liver
+	name = "IPC reagent processing liver"
+	desc = "Allows for the construction of an IPC reagent processing liver."
+	id = "ipc_liver"
+	build_type = PROTOLATHE | MECHFAB
+	materials = list(/datum/material/plasma = 100, /datum/material/iron = 800, /datum/material/glass = 300, /datum/material/silver = 500, /datum/material/gold = 400)
+	build_path = /obj/item/organ/liver/ipc
+	category = list("Misc", "Medical Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/ipc_ears
+	name = "IPC auditory sensors"
+	desc = "Allows for the construction of an IPC auditory sensors."
+	id = "ipc_ears"
+	build_type = PROTOLATHE | MECHFAB
+	materials = list(/datum/material/gold = 400, /datum/material/iron = 800)
+	build_path = /obj/item/organ/ears/ipc
+	category = list("Misc", "Medical Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/ipc_tongue
+	name = "IPC positronic voicebox"
+	desc = "Allows for the construction of an IPC positronic voicebox."
+	id = "ipc_tongue"
+	build_type = PROTOLATHE | MECHFAB
+	materials = list(/datum/material/gold = 400, /datum/material/iron = 800)
+	build_path = /obj/item/organ/tongue/robot/ipc
+	category = list("Misc", "Medical Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/ipc_eyes
+	name = "IPC eyes"
+	desc = "Allows for the construction of an IPC eyes."
+	id = "ipc_eyes"
+	build_type = PROTOLATHE | MECHFAB
+	materials = list(/datum/material/glass = 500, /datum/material/iron = 800, /datum/material/glass = 300,)
+	build_path = /obj/item/organ/eyes/ipc
+	category = list("Misc", "Medical Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE

GainStation13/code/modules/research/techweb/robotic_nodes.dm

@@ -0,0 +1,11 @@
+//////////////////////////////
+/////Any new robotic nodes////
+//////////////////////////////
+
+/datum/techweb_node/ipc_tech
+	id = "ipc_tech"
+	display_name = "IPC. parts"
+	description = "IPC. parts research."
+	prereq_ids = list("biotech")
+	design_ids = list("ipc_eyes", "ipc_stomach", "ipc_heart", "ipc_liver", "ipc_ears", "ipc_tongue", "ci-power-cord" )
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)

_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm

@@ -323,8 +323,8 @@
 /turf/open/floor/plating,
 /area/engineering/main)
 "ur" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
 	},
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /turf/open/floor/plating,
@@ -472,8 +472,7 @@
 /area/engineering/main)
 "Im" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4;
-	pixel_y = 5
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/engineering/main)
@@ -546,13 +545,6 @@
 "Oj" = (
 /turf/closed/wall/r_wall,
 /area/space/nearstation)
-"Ow" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4;
-	pixel_y = 5
-	},
-/turf/open/floor/plasteel,
-/area/engineering/main)
 "Po" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -1043,7 +1035,7 @@ Un
 Im
 Un
 Un
-Ow
+mf
 Un
 Un
 to

_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm

@@ -132,6 +132,10 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/engineering/main)
+"lL" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/engineering/main)
 "lY" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
@@ -197,6 +201,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/engineering/main)
+"vz" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/engineering/main)
 "xx" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -1275,9 +1286,9 @@ MJ
 MJ
 "}
 (26,1,1) = {"
-fh
-kh
-mB
+Pg
+vz
+lL
 ZY
 Tr
 rT

_maps/RandomRuins/StationRuins/Box/Engine/engine_rbmk.dmm

@@ -336,6 +336,9 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/engine,
 /area/engineering/main)
 "kR" = (
@@ -1310,12 +1313,6 @@
 	},
 /turf/closed/wall/r_wall,
 /area/engineering/main)
-"Ve" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engineering/main)
 "Vi" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
 /turf/open/floor/engine,
@@ -1406,9 +1403,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 5
-	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/engine,
 /area/engineering/main)
 "YM" = (
@@ -1809,7 +1804,7 @@ yf
 "}
 (13,1,1) = {"
 uR
-Ve
+bQ
 uj
 gF
 JS

_maps/RandomRuins/StationRuins/Box/Engine/engine_singulo.dmm

@@ -672,6 +672,10 @@
 	},
 /turf/open/floor/engine,
 /area/engineering/main)
+"MC" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/engineering/main)
 "MD" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/effect/turf_decal/stripes/line{
@@ -718,6 +722,13 @@
 	},
 /turf/open/floor/engine,
 /area/engineering/main)
+"OS" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/engineering/main)
 "Pg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel,
@@ -1585,9 +1596,9 @@ MJ
 MJ
 "}
 (26,1,1) = {"
-fh
-kh
-mB
+Pg
+OS
+MC
 ZY
 kC
 mZ

_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm

@@ -197,6 +197,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/engineering/main)
+"hk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/engineering/main)
 "ht" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
@@ -680,6 +687,10 @@
 	},
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"KV" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/engineering/main)
 "Lr" = (
 /obj/structure/table,
 /obj/item/clothing/gloves/color/yellow,
@@ -1734,9 +1745,9 @@ MJ
 MJ
 "}
 (26,1,1) = {"
-fh
-kh
-mB
+Pg
+hk
+KV
 ZY
 Tr
 rT

_maps/map_files/BoxStation/BoxStation.dmm

@@ -358,12 +358,12 @@
 "agT" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/preopen{id = "hos"},/obj/structure/cable{icon_state = "2-8"},/obj/structure/cable{icon_state = "2-4"},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plating,/area/command/heads_quarters/hos)
 "agU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/security/office)
 "agV" = (/obj/machinery/door/window/eastright{dir = 8; name = "Holding Cell"; req_access_txt = "2"},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/button/flasher{id = "waitingflash"; pixel_x = 6; pixel_y = 24},/turf/open/floor/plasteel,/area/security/prison)
-"agW" = (/obj/structure/disposalpipe/segment{dir = 6},/turf/open/floor/plasteel,/area/security/office)
+"agW" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
 "agX" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/preopen{id = "executionfireblast"},/obj/machinery/door/firedoor,/obj/structure/cable{icon_state = "1-8"},/obj/structure/cable,/turf/open/floor/plating,/area/security/execution/transfer)
 "agY" = (/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{icon_state = "0-8"},/obj/machinery/power/apc{areastring = "/area/security/prison/cells"; damage_deflection = 21; desc = "A control terminal for the area's electrical systems. It's secured with a durable antitampering plasteel cage."; dir = 4; name = "Armored Prison Wing Cells APC"; pixel_x = 24},/turf/open/floor/plasteel,/area/security/prison/cells)
 "agZ" = (/obj/structure/table,/obj/machinery/microwave,/turf/open/floor/plasteel/white,/area/security/prison/upper)
-"aha" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/landmark/start/security_officer,/obj/structure/chair{dir = 8},/turf/open/floor/plasteel,/area/security/office)
-"ahb" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 4; sortType = 7},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/effect/turf_decal/loading_area{dir = 8},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/office)
+"aha" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/landmark/start/security_officer,/obj/structure/chair{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
+"ahb" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 4; sortType = 7},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/effect/turf_decal/loading_area{dir = 8},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/office)
 "ahc" = (/obj/machinery/door/window/eastright{base_state = "left"; dir = 8; icon_state = "left"; name = "Security Delivery"; req_access_txt = "1"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/security/office)
 "ahd" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; dir = 8; freq = 1400; location = "Security"},/obj/structure/plasticflaps/opaque,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/security/office)
 "ahe" = (/obj/effect/turf_decal/stripes/line{dir = 5},/turf/open/floor/plating/airless,/area/space/nearstation)
@@ -387,12 +387,12 @@
 "ahw" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/disposalpipe/segment{dir = 6},/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plasteel,/area/security/office)
 "ahx" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/preopen{id = "hos"},/obj/structure/cable{icon_state = "0-8"},/turf/open/floor/plating,/area/command/heads_quarters/hos)
 "ahy" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/landmark/start/prisoner,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/button/door{id = "permacells2"; name = "Privacy Shutters"; pixel_x = 25},/turf/open/floor/plasteel/dark,/area/security/prison/cells)
-"ahz" = (/obj/item/paper_bin/bundlenatural{pixel_x = 6; pixel_y = 4},/obj/item/paper_bin{pixel_x = -6; pixel_y = 4},/obj/item/pen/fountain,/obj/item/folder/red,/obj/structure/disposalpipe/segment{dir = 4},/obj/item/pen,/obj/structure/table,/turf/open/floor/plasteel,/area/security/office)
-"ahA" = (/obj/structure/disposalpipe/junction/yjunction{dir = 1},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
+"ahz" = (/obj/item/paper_bin/bundlenatural{pixel_x = 6; pixel_y = 4},/obj/item/paper_bin{pixel_x = -6; pixel_y = 4},/obj/item/pen/fountain,/obj/item/folder/red,/obj/structure/disposalpipe/segment{dir = 4},/obj/item/pen,/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
+"ahA" = (/obj/structure/disposalpipe/junction/yjunction{dir = 1},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office)
 "ahB" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/airalarm{dir = 8; pixel_x = 24},/turf/open/floor/plasteel/dark,/area/security/range)
-"ahC" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
-"ahD" = (/obj/structure/cable{icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 10},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
-"ahE" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
+"ahC" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office)
+"ahD" = (/obj/structure/cable{icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 10},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office)
+"ahE" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office)
 "ahF" = (/obj/machinery/airalarm{pixel_y = 23},/obj/machinery/light{dir = 1},/obj/structure/cable{icon_state = "2-4"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/prison)
 "ahG" = (/obj/effect/spawner/lootdrop/prison_contraband,/obj/structure/closet/crate,/obj/item/stack/license_plates/empty/fifty,/obj/item/stack/license_plates/empty/fifty,/obj/item/stack/license_plates/empty/fifty,/obj/item/stack/license_plates/empty/fifty,/turf/open/floor/plating,/area/security/prison/upper)
 "ahH" = (/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/maintenance/fore/secondary)
@@ -502,7 +502,7 @@
 "ajH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/flora/ausbushes/sparsegrass,/turf/open/floor/grass,/area/security/courtroom)
 "ajI" = (/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/security/courtroom)
 "ajJ" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/maintenance/solars/port/fore)
-"ajK" = (/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper,/turf/open/floor/plating,/area/maintenance/solars/port/fore)
+"ajK" = (/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper,/obj/structure/fans/tiny,/turf/open/floor/plating,/area/maintenance/solars/port/fore)
 "ajL" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/structure/sign/warning/electricshock{pixel_y = 32},/turf/open/floor/plasteel,/area/hallway/primary/fore)
 "ajM" = (/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/prison/cells)
 "ajN" = (/obj/machinery/light/small{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/obj/item/radio/intercom{desc = "Talk through this. It looks like it has been modified to not broadcast."; name = "Prison Intercom (General)"; pixel_x = -27; pixel_y = -27; prison_radio = 1},/obj/machinery/flasher{id = "Cell 3"; pixel_x = -24; pixel_y = -36},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/obj/structure/bed,/obj/item/bedsheet/yellow,/turf/open/floor/plasteel,/area/security/brig)
@@ -622,7 +622,7 @@
 "alY" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/meter,/turf/open/floor/plating,/area/maintenance/fore/secondary)
 "alZ" = (/obj/structure/railing,/turf/open/indestructible/hotelwood,/area/security/courtroom)
 "ama" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/maintenance/solars/starboard/fore)
-"amb" = (/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper,/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/turf/open/floor/plating,/area/maintenance/solars/starboard/fore)
+"amb" = (/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper,/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/obj/structure/fans/tiny,/turf/open/floor/plating,/area/maintenance/solars/starboard/fore)
 "amc" = (/obj/structure/chair{dir = 1},/turf/open/floor/plating,/area/maintenance/starboard/fore)
 "amd" = (/obj/structure/chair/stool{pixel_y = 8},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/fore)
 "ame" = (/obj/structure/cable{icon_state = "1-4"},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/fore)
@@ -1580,7 +1580,7 @@
 "aEJ" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel,/area/commons/dorms)
 "aEK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/closed/wall,/area/commons/toilet)
 "aEL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/carpet/red,/area/service/bar)
-"aEM" = (/obj/machinery/airalarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/freezer,/area/commons/toilet)
+"aEM" = (/obj/machinery/airalarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/open/floor/plasteel/freezer,/area/commons/toilet)
 "aEN" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/kirbyplants/random,/turf/open/floor/plasteel,/area/command/gateway)
 "aEP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/starboard/fore)
 "aEQ" = (/obj/machinery/door/airlock{name = "Service Hall"; req_one_access_txt = "25;26;35;28"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/hallway/secondary/service)
@@ -3052,7 +3052,7 @@
 "bhQ" = (/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plating/airless,/area/space/nearstation)
 "bhR" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/security/office)
 "bhS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/security/office)
-"bhT" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 4; sortType = 8},/turf/open/floor/plasteel,/area/security/office)
+"bhT" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 4; sortType = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
 "bhU" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 1},/obj/machinery/atmospherics/components/binary/pump{dir = 4; layer = 2.4},/turf/open/floor/plating,/area/security/execution/transfer)
 "bhV" = (/obj/effect/landmark/start/security_officer,/obj/effect/turf_decal/tile/red{dir = 1},/obj/structure/chair{dir = 4},/turf/open/floor/plasteel,/area/security/office)
 "bhW" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/machinery/camera{c_tag = "Prisoner Processing"; dir = 8},/obj/machinery/airalarm{dir = 8; pixel_x = 24},/turf/open/floor/plasteel,/area/security/processing)
@@ -3065,19 +3065,19 @@
 "bid" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel,/area/security/office)
 "bie" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
 "bif" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
-"big" = (/obj/effect/landmark/start/security_officer,/obj/structure/chair{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/open/floor/plasteel,/area/security/office)
-"bih" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/book/manual/gato_spacelaw,/obj/item/book/manual/gato_spacelaw,/turf/open/floor/plasteel,/area/security/office)
+"big" = (/obj/effect/landmark/start/security_officer,/obj/structure/chair{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/security/office)
+"bih" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/book/manual/gato_spacelaw,/obj/item/book/manual/gato_spacelaw,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
 "bii" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/preopen{id = "Prison Gate"; name = "prison blast door"},/obj/structure/cable{icon_state = "0-2"},/obj/machinery/door/poddoor/shutters/preopen{id = "Prison Gate"; name = "Prison Lockdown Shutters"},/turf/open/floor/plating,/area/security/prison/upper)
-"bij" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/security/office)
+"bij" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/open/floor/plasteel,/area/security/office)
 "bik" = (/obj/structure/closet/crate/bin,/obj/effect/spawner/lootdrop/prison_contraband,/obj/item/trash/sosjerky,/obj/item/trash/boritos,/obj/item/trash/can,/obj/effect/turf_decal/tile/green{dir = 8},/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/item/radio/intercom{desc = "Talk through this. It looks like it has been modified to not broadcast."; name = "Prison Intercom (General)"; pixel_x = -27; pixel_y = -27; prison_radio = 1},/turf/open/floor/plasteel,/area/security/prison/upper)
 "bil" = (/obj/structure/noticeboard{dir = 1; pixel_y = -27},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office)
 "bim" = (/obj/machinery/light_switch{pixel_y = -23},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office)
 "bin" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office)
-"bio" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
-"bip" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
-"biq" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/open/floor/plasteel,/area/security/office)
+"bio" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/security/office)
+"bip" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office)
+"biq" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/turf/open/floor/plasteel,/area/security/office)
 "bir" = (/obj/effect/turf_decal/delivery,/obj/machinery/door/poddoor/shutters/window{id = "armory2"},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory)
-"bis" = (/obj/machinery/power/apc{areastring = "/area/security/office"; dir = 4; name = "Security Office APC"; pixel_x = 24},/obj/structure/cable{icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/office)
+"bis" = (/obj/machinery/power/apc{areastring = "/area/security/office"; dir = 4; name = "Security Office APC"; pixel_x = 24},/obj/structure/cable{icon_state = "0-8"},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/office)
 "bit" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/cafeteria,/area/security/prison/upper)
 "biu" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/firealarm{pixel_y = 24},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/security/prison/cells)
 "biv" = (/obj/structure/chair{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/cafeteria,/area/security/prison/upper)
@@ -3363,7 +3363,7 @@
 "bnS" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/flora/ausbushes/ywflowers,/turf/open/floor/grass,/area/hallway/secondary/exit)
 "bnT" = (/obj/machinery/light{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 4},/obj/structure/chair{dir = 8},/turf/open/floor/plasteel,/area/hallway/secondary/exit)
 "bnU" = (/obj/machinery/light{dir = 4},/turf/open/floor/grass,/area/hallway/secondary/exit)
-"bnV" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Port Docking Bay 2"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry)
+"bnV" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Port Docking Bay 2"},/obj/effect/turf_decal/delivery,/obj/structure/fans/tiny,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry)
 "bnW" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/secondary/entry)
 "bnX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/closed/wall,/area/crew_quarters/fitness/sauna)
 "bnY" = (/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central)
@@ -3565,8 +3565,8 @@
 "brZ" = (/obj/machinery/vending/mealdor,/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit)
 "bsa" = (/obj/machinery/vending/cola/random,/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit)
 "bsb" = (/obj/machinery/vending/cigarette,/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit)
-"bsc" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Port Docking Bay 4"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry)
-"bsd" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Port Docking Bay 3"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry)
+"bsc" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Port Docking Bay 4"},/obj/effect/turf_decal/delivery,/obj/structure/fans/tiny,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry)
+"bsd" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Port Docking Bay 3"},/obj/effect/turf_decal/delivery,/obj/structure/fans/tiny,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry)
 "bse" = (/obj/machinery/conveyor{id = "garbage"},/turf/open/floor/plating,/area/maintenance/disposal)
 "bsf" = (/obj/structure/disposalpipe/trunk{dir = 2},/obj/machinery/disposal/deliveryChute{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; layer = 3},/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plating,/area/maintenance/disposal)
 "bsg" = (/obj/machinery/mineral/stacking_machine{input_dir = 1; stack_amt = 10},/turf/open/floor/plating,/area/maintenance/disposal)
@@ -4088,7 +4088,7 @@
 "bCe" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/door/firedoor/heavy,/obj/machinery/door/poddoor/shutters/preopen{id = "rnd2"; name = "research lab shutters"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/white,/area/science/lab)
 "bCf" = (/turf/closed/wall/r_wall,/area/science/circuit)
 "bCg" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/structure/sign/warning/securearea{pixel_x = -32},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/starboard)
-"bCh" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Supply Dock Airlock"; req_access_txt = "31"},/turf/open/floor/plating,/area/cargo/storage)
+"bCh" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Supply Dock Airlock"; req_access_txt = "31"},/obj/structure/fans/tiny,/turf/open/floor/plating,/area/cargo/storage)
 "bCi" = (/turf/open/floor/plating,/area/cargo/storage)
 "bCj" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/obj/machinery/door/airlock/external{dir = 4; name = "Supply Dock Airlock"; req_access_txt = "31"},/turf/open/floor/plating,/area/cargo/storage)
 "bCk" = (/obj/effect/turf_decal/stripes/line{dir = 9},/turf/open/floor/plasteel,/area/cargo/storage)
@@ -4133,10 +4133,10 @@
 "bCZ" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/camera{c_tag = "Medbay West"; network = list("ss13","medbay")},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/airalarm{pixel_y = 23},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "bDa" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "bDb" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
-"bDc" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/medical/medbay/central)
+"bDc" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "bDd" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
-"bDe" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel/white,/area/medical/medbay/central)
-"bDf" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
+"bDe" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
+"bDf" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "bDg" = (/obj/structure/cable{icon_state = "1-8"},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "bDh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "bDi" = (/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
@@ -4351,7 +4351,7 @@
 "bHl" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel/white/corner{dir = 8},/area/medical/medbay/central)
 "bHm" = (/obj/structure/chair/comfy/brown,/turf/open/floor/carpet/blue,/area/medical/medbay/central)
 "bHn" = (/obj/structure/table/wood,/obj/item/flashlight/lamp/green{pixel_x = -4; pixel_y = 14},/obj/machinery/airalarm{pixel_y = 23},/obj/item/folder/white{pixel_x = 6; pixel_y = -1},/turf/open/floor/carpet/blue,/area/medical/medbay/central)
-"bHo" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/open/floor/plasteel/white,/area/medical/surgery)
+"bHo" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/surgery)
 "bHp" = (/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/turf/open/floor/plasteel/white/side{dir = 8},/area/medical/medbay/central)
 "bHq" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "bHr" = (/obj/structure/sign/warning/nosmoking,/turf/closed/wall,/area/medical/medbay/central)
@@ -4496,7 +4496,7 @@
 "bKc" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/carpet/blue,/area/medical/medbay/central)
 "bKd" = (/obj/structure/chair/sofa/left{desc = "More inviting than the average couch."; dir = 8; name = "comfy couch"},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/carpet/blue,/area/medical/medbay/central)
 "bKe" = (/obj/machinery/airalarm{dir = 4; pixel_x = -22},/obj/machinery/shower{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
-"bKf" = (/obj/effect/landmark/start/medical_doctor,/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white,/area/medical/surgery)
+"bKf" = (/obj/effect/landmark/start/medical_doctor,/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel/white,/area/medical/surgery)
 "bKg" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/medical/medbay/central)
 "bKh" = (/obj/machinery/atmospherics/pipe/manifold4w/general/visible,/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central6"},/turf/open/floor/plasteel,/area/medical/medbay/central)
 "bKi" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/medical/medbay/central)
@@ -4710,7 +4710,7 @@
 "bOi" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/maintenance/aft)
 "bOj" = (/obj/machinery/vending/cigarette,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/hallway/primary/central)
 "bOk" = (/obj/structure/disposalpipe/segment,/obj/machinery/light/small{dir = 8},/obj/structure/table,/obj/item/storage/backpack/duffelbag/med/surgery,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/medical/surgery)
-"bOl" = (/obj/machinery/computer/operating,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white/side,/area/medical/surgery)
+"bOl" = (/obj/machinery/computer/operating,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white/side,/area/medical/surgery)
 "bOm" = (/obj/item/stack/sheet/glass{amount = 20; pixel_x = -3; pixel_y = 6},/obj/item/stack/sheet/metal/fifty,/obj/structure/rack,/turf/open/floor/plating,/area/maintenance/department/medical/morgue)
 "bOn" = (/obj/structure/table,/obj/item/storage/backpack/duffelbag/med/surgery,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white/side,/area/medical/surgery)
 "bOo" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/computer/operating,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/medical/surgery)
@@ -4777,10 +4777,10 @@
 "bPx" = (/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plating,/area/maintenance/aft)
 "bPy" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating,/area/maintenance/aft)
 "bPz" = (/obj/structure/disposalpipe/segment,/obj/structure/curtain{pixel_y = -32},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/turf/open/floor/plasteel/white/side{dir = 4},/area/medical/surgery)
-"bPA" = (/obj/structure/curtain{pixel_y = -32},/obj/structure/table/optable,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/turf/open/floor/plasteel/white,/area/medical/surgery)
+"bPA" = (/obj/structure/curtain{pixel_y = -32},/obj/structure/table/optable,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel/white,/area/medical/surgery)
 "bPB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/medical/morgue)
-"bPC" = (/obj/structure/curtain{pixel_y = -32},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/turf/open/floor/plasteel/white,/area/medical/surgery)
-"bPD" = (/obj/structure/curtain{pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/table/optable,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/turf/open/floor/plasteel/white/side{dir = 8},/area/medical/surgery)
+"bPC" = (/obj/structure/curtain{pixel_y = -32},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/surgery)
+"bPD" = (/obj/structure/curtain{pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/table/optable,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white/side{dir = 8},/area/medical/surgery)
 "bPE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/medical/surgery)
 "bPF" = (/obj/structure/table,/obj/structure/bedsheetbin{pixel_x = 2},/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "bPG" = (/obj/effect/landmark/start/medical_doctor,/turf/open/floor/plasteel/white,/area/medical/medbay/central)
@@ -4861,7 +4861,7 @@
 "bRd" = (/obj/structure/disposalpipe/segment{dir = 10},/turf/open/floor/plating,/area/maintenance/aft)
 "bRg" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/power/apc{areastring = "/area/medical/surgery"; dir = 8; name = "Treatment Center APC"; pixel_x = -25},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plasteel/white,/area/medical/surgery)
 "bRh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/plasteel/white,/area/medical/surgery)
-"bRi" = (/obj/structure/table,/obj/item/clothing/gloves/color/latex,/obj/item/clothing/gloves/color/latex,/obj/item/clothing/suit/apron/surgical,/obj/item/clothing/suit/apron/surgical,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/surgery)
+"bRi" = (/obj/structure/table,/obj/item/clothing/gloves/color/latex,/obj/item/clothing/gloves/color/latex,/obj/item/clothing/suit/apron/surgical,/obj/item/clothing/suit/apron/surgical,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/medical/surgery)
 "bRj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/turf/open/floor/plasteel/white,/area/medical/surgery)
 "bRk" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plasteel/white,/area/medical/surgery)
 "bRl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/medical/surgery)
@@ -4934,7 +4934,7 @@
 "bSC" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/maintenance/aft)
 "bSD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "1-4"},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white/side{dir = 4},/area/medical/surgery)
 "bSE" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white,/area/medical/surgery)
-"bSF" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white/side{dir = 8},/area/medical/surgery)
+"bSF" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white/side{dir = 8},/area/medical/surgery)
 "bSG" = (/obj/effect/turf_decal/tile/blue{dir = 1},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "bSH" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "bSI" = (/obj/machinery/vending/wallmed{pixel_x = 28},/obj/machinery/camera{c_tag = "Medbay Recovery Room"; dir = 8; network = list("ss13","medbay")},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
@@ -5949,7 +5949,7 @@
 "cml" = (/obj/effect/turf_decal/bot,/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "Mix to Turbine"},/turf/open/floor/plasteel,/area/engineering/atmos)
 "cmm" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/open/floor/plasteel,/area/engineering/atmos)
 "cmn" = (/obj/machinery/computer/atmos_control/tank/toxin_tank{dir = 8},/obj/effect/turf_decal/stripes/line{dir = 4},/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/open/floor/plasteel,/area/engineering/atmos)
-"cmo" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/open/floor/plating,/area/engineering/atmos)
+"cmo" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "cmp" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/orange/visible,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/open/space,/area/space/nearstation)
 "cmq" = (/obj/effect/spawner/structure/window/plasma/reinforced,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 10},/turf/open/floor/plating/airless,/area/engineering/atmos)
 "cmr" = (/obj/machinery/air_sensor/atmos/toxin_tank,/turf/open/floor/engine/plasma,/area/engineering/atmos)
@@ -6485,7 +6485,7 @@
 "cwF" = (/obj/structure/cable{icon_state = "0-8"},/obj/structure/lattice/catwalk,/turf/open/space,/area/solars/port/aft)
 "cwG" = (/obj/structure/lattice/catwalk,/turf/open/space,/area/solars/port/aft)
 "cwH" = (/obj/structure/cable{icon_state = "0-4"},/obj/structure/lattice/catwalk,/turf/open/space,/area/solars/port/aft)
-"cwI" = (/obj/structure/cable{icon_state = "4-8"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Solar Maintenance"; req_access_txt = "10; 13"},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/aft)
+"cwI" = (/obj/structure/cable{icon_state = "4-8"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Solar Maintenance"; req_access_txt = "10; 13"},/obj/structure/fans/tiny,/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/aft)
 "cwJ" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/aft)
 "cwK" = (/obj/structure/cable{icon_state = "4-8"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/obj/machinery/door/airlock/external{dir = 4; name = "Solar Maintenance"; req_access_txt = "10; 13"},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/aft)
 "cwL" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/aft)
@@ -6495,7 +6495,7 @@
 "cwP" = (/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/catwalk_floor,/area/maintenance/port/aft)
 "cwQ" = (/obj/structure/cable{icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 5},/turf/open/floor/catwalk_floor,/area/maintenance/port/aft)
 "cwR" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/catwalk_floor,/area/maintenance/port/aft)
-"cwS" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 8; sortType = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/simple_animal/pet/cat,/turf/open/floor/catwalk_floor,/area/maintenance/port/aft)
+"cwS" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 8; sortType = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/simple_animal/opossum/poppy{dir = 4},/turf/open/floor/catwalk_floor,/area/maintenance/port/aft)
 "cwT" = (/obj/structure/cable{icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/catwalk_floor,/area/maintenance/port/aft)
 "cwU" = (/obj/machinery/shieldgen,/turf/open/floor/plating,/area/engineering/main)
 "cwV" = (/obj/machinery/vending/engineering,/turf/open/floor/plating,/area/engineering/main)
@@ -6520,7 +6520,7 @@
 "cxo" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/layer_manifold,/turf/open/floor/plating,/area/engineering/atmos)
 "cxp" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/open/floor/plating,/area/engineering/atmos)
 "cxq" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/engineering/atmos)
-"cxr" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/closed/wall/r_wall,/area/engineering/atmos)
+"cxr" = (/obj/machinery/atmospherics/pipe/layer_manifold,/turf/closed/wall/r_wall,/area/engineering/atmos)
 "cxs" = (/obj/structure/window/reinforced{dir = 1},/turf/open/space/basic,/area/space)
 "cxt" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/orange/visible,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/open/space,/area/space/nearstation)
 "cxu" = (/obj/machinery/door/window/northright{req_access_txt = "24"},/obj/machinery/door/window/southleft{req_access_txt = "24"},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/open/floor/plating,/area/engineering/atmos)
@@ -6843,7 +6843,7 @@
 "cDB" = (/obj/structure/table,/obj/item/weldingtool,/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/maintenance/starboard/aft)
 "cDC" = (/obj/structure/rack,/obj/effect/spawner/lootdrop/maintenance,/obj/structure/disposalpipe/segment{dir = 10},/turf/open/floor/plating,/area/maintenance/starboard/aft)
 "cDD" = (/obj/machinery/space_heater,/turf/open/floor/plating,/area/maintenance/starboard/aft)
-"cDE" = (/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/turf/open/floor/plating,/area/maintenance/solars/starboard/aft)
+"cDE" = (/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/obj/structure/fans/tiny,/turf/open/floor/plating,/area/maintenance/solars/starboard/aft)
 "cDF" = (/obj/machinery/power/port_gen/pacman,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/cable{icon_state = "1-2"},/obj/effect/turf_decal/stripes/line{dir = 9},/turf/open/floor/plasteel,/area/engineering/main)
 "cDG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/engineering/main)
 "cDH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{icon_state = "1-4"},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/engineering/main)
@@ -7237,6 +7237,7 @@
 "eZw" = (/turf/open/floor/plasteel/freezer,/area/crew_quarters/fitness/sauna)
 "faO" = (/obj/effect/turf_decal/bot,/obj/structure/closet/crate/secure/weapon{desc = "A secure clothing crate."; name = "formal uniform crate"; req_access = "3"},/obj/item/clothing/under/rank/security/officer/formal,/obj/item/clothing/under/rank/security/officer/formal,/obj/item/clothing/under/rank/security/officer/formal,/obj/item/clothing/under/rank/security/officer/formal,/obj/item/clothing/under/rank/security/officer/formal,/obj/item/clothing/under/rank/security/warden/formal,/obj/item/clothing/under/rank/security/head_of_security/formal,/obj/item/clothing/suit/armor/navyblue,/obj/item/clothing/suit/armor/navyblue,/obj/item/clothing/suit/armor/navyblue,/obj/item/clothing/suit/armor/navyblue,/obj/item/clothing/suit/armor/navyblue,/obj/item/clothing/suit/armor/vest/warden/navyblue,/obj/item/clothing/suit/armor/hos/navyblue,/obj/item/clothing/head/beret/sec/navyofficer,/obj/item/clothing/head/beret/sec/navyofficer,/obj/item/clothing/head/beret/sec/navyofficer,/obj/item/clothing/head/beret/sec/navyofficer,/obj/item/clothing/head/beret/sec/navyofficer,/obj/item/clothing/head/beret/sec/navywarden,/obj/item/clothing/head/beret/sec/navyhos,/turf/open/floor/plasteel/dark,/area/security/office)
 "ffH" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/structure/toilet{dir = 4},/obj/structure/window/reinforced/tinted{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/plasteel/dark,/area/security/prison/cells)
+"fho" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "fls" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/grass,/area/security/courtroom)
 "fmC" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/landmark/start/prisoner,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/button/door{id = "permacells4"; name = "Privacy Shutters"; pixel_y = 25},/turf/open/floor/plasteel/dark,/area/security/prison/cells)
 "fmH" = (/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/hallway/primary/starboard)
@@ -7675,6 +7676,7 @@
 "tmt" = (/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/dark,/area/medical/paramedic)
 "tnQ" = (/obj/machinery/microwave,/obj/structure/table,/turf/open/floor/plasteel/cafeteria,/area/maintenance/port/fore)
 "toG" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/plating,/area/security/prison/upper)
+"tqG" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/closed/wall,/area/medical/surgery)
 "trI" = (/obj/structure/table/reinforced,/obj/structure/reagent_dispensers/servingdish,/turf/open/floor/plasteel,/area/security/prison/upper)
 "trU" = (/obj/structure/bed,/obj/item/bedsheet/medical,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
 "tsD" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "2-4"},/obj/machinery/light{dir = 8; light_color = "#e8eaff"},/turf/open/floor/plasteel,/area/security/prison/cells)
@@ -7791,6 +7793,7 @@
 "xdc" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/sign/warning/vacuum/external{pixel_y = 32},/turf/open/floor/plating,/area/security/processing)
 "xen" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/freezer,/area/crew_quarters/fitness/sauna)
 "xeR" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plasteel,/area/maintenance/fore/secondary)
+"xgh" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/closed/wall,/area/medical/surgery)
 "xgz" = (/obj/structure/chair,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/security/processing)
 "xiB" = (/obj/effect/landmark/start/warden,/turf/open/floor/plasteel/showroomfloor,/area/security/warden)
 "xkX" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/catwalk_floor,/area/maintenance/department/medical/morgue)
@@ -7969,8 +7972,8 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbwubtobwvbuWbwwbwxbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabwybwzbwAbwBbwCbwDbvdbvdbvdbwEbvdbvdbwFbwGbwHbtPbwIbwJbtPbwKbwLbwMbswbwNbeVbwObwPbbfbtUbwQbwRbwRbwRbwRbwSbwTbwRaadaaaaAxaEnaHbaEobwUaEqaAxbaWbaWbaWbwVbwWbwXbwYbwZaZDbxaaZDbxbaIPbxcbfvbxdbxebxfbxgbxhbfvbxibunbvLbvQbxkbrtbxlberoaMbxmbxnberbxobxpbxqbxrbxsbxybxybxubxyxkXxkXxkXaDybxzbqIbxAbxBbxCbxDbxEbxFbxGbxHbxIbxJbxKbxLaRhbfLbrSbxMbxNbfSbxObxPbxQbxRbgRbxSbfSbxTbxUbxVbwtbxWbwtatJatJaaabhraaaaaaatJaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbxXbtobtobtobdrbdrbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabwybxYbxZbyabybcpacpacpacpabybbybbybbycbsqbydbyebyfbygbyhbyibeVbyjbswbykbeVbqCbylbjXbtUbtUbwRbymbynbyobcxbypbwRaaaaaaaAxaFybyqbyrbysaFCaAxhmEdNEwPPcnlbpjlzeaZDbyuaZDbyvaZDbxbaIPbywbfvbyxbxebyybsHbyzbfvbqGamDbyAbyBbyCbrtbyDberbfDbxvbxtberbfBbyFbfBbyHbyIbyJbyJbyJbyJbyJbyJbyJbyJbyLbyMbfIbfIbfIbfIbfIbyNbyObtcbyPbxLbxLbyQbyRbyNbySbyTbyUbyVbyWbyXbyYbyZbzabzbbfSbzcbfSbzdbzebzebzebzebzebzebzfatJatJatJatJiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaatJaaaaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaabzgbwybwybzhbxZbzibvdbzjdjRdjRbzjbvdbvdbvdbzkbsqbzlbzmbznbzobzpbeVbeVbzqaZJbeVbeVbzrbzsbztbzubzvbzwbzxbzybzzbzAbzBbwRbzCbwRaAxaAxbzDaHcbzEaAxaAxgpLwFFrDkbzFbzGbzHaZDbzIaZDbzJaZDbxbaIPbywbfvbzKbxebzLbzMbzNbfvbzObunbzPbyBbuubzQbqGbqGbzRbzSbzTbzUbzVbzWbzXbzYrFabAabAbbAcbAdbAebAfbAgbAhbuAbAibAjbAkbAlbAmbAnbAobApbAqbArbAsbAtbxLbAubAvbAwbAxaSxbyVbAybAzbAAbABbgRbACbADbAEbAFbAGjkMjkMjkMjkMbAHbAIbAJaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
-byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabAKbALbAKbAMbANbAObAPbAQxtbxtbxtbbvdbARbvdbASbsqbATbAUbAVbAWbAXbAYbtPbBabBbbBcbBdbBebylbjXasFbBfbBgbBhbBibBjbzAbBkbwRbBlbBmaTBbBnbBovzbbBpbBqaTBaZDaZDbBrbBsbBtbBrbBrbBrbBrbBubBrbBvaLzbBwbfvbfvbBxbBybBzbfvbfvbrtbBAbBBbjnbBDbBCbBEbjnbBFbyEbrtbrtbrtbyEbrtbrsbzZbAabBGbBHbBIbBJbBKbBLbAhbBMbBNbBObBPbBPbBPbBQbBRbBSbBTbBUbBVbBWbBXbBYbBZbCabuJbCbbyVbyVbCcbCdbCebCcbyVbCfbCfbCfbCfbCfbCfbCfbCfbCfbCgbAJaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
-byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJatJatJbhratJbhrbhratJbhraaaaaaaaaaaaaaaaaaaaabChbCibCjbCkbvdbzibvdbzjdjRbClbzjbvdbvdbCmbsqbsqbeVbCobCpbCqbCrbCrbswbCtbCubCvbCwbBebylbjXasJbCxbCybCzbCAbCAbCBbCCbCDbCEbCFaTBbCGbCHbCIbCJbCKaTBaadaadbBrbCLbCMbCNbCObCPbCQbCRbBrbnYaIPbCSbCTbCUbCVbCWbCXbCYbCZbDabDbbDcbDdbDdbDdbDdbDdbDebDfbDdbDdbDdbDgbusbDhbDibAabDjbDkbDlbDlbDmbDnbAhbuAbAibDobDpbDqbDrbDsbDtbDubtcbDvbtcbtcbtcbDwbyNbDxbDybDzbDAbDBbDCbDDbDEbDFbDGbDHbDIbDJbDKbDLbDKbDMbDNbDObDPbAJatJatJatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
+byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabAKbALbAKbAMbANbAObAPbAQxtbxtbxtbbvdbARbvdbASbsqbATbAUbAVbAWbAXbAYbtPbBabBbbBcbBdbBebylbjXasFbBfbBgbBhbBibBjbzAbBkbwRbBlbBmaTBbBnbBovzbbBpbBqaTBaZDaZDbBrbBsbBtbBrbBrbBrbBrbBubBrbBvaLzbBwbfvbfvbBxbBybBzbfvbfvbrtbBAbBBbjnbBDbBCbBEbjnbBFfhobrtbrtbrtbyEbrtbrsbzZbAabBGbBHbBIbBJbBKbBLbAhbBMbBNbBObBPbBPbBPbBQbBRbBSbBTbBUbBVbBWbBXbBYbBZbCabuJbCbbyVbyVbCcbCdbCebCcbyVbCfbCfbCfbCfbCfbCfbCfbCfbCfbCgbAJaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
+byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJatJatJbhratJbhrbhratJbhraaaaaaaaaaaaaaaaaaaaabChbCibCjbCkbvdbzibvdbzjdjRbClbzjbvdbvdbCmbsqbsqbeVbCobCpbCqbCrbCrbswbCtbCubCvbCwbBebylbjXasJbCxbCybCzbCAbCAbCBbCCbCDbCEbCFaTBbCGbCHbCIbCJbCKaTBaadaadbBrbCLbCMbCNbCObCPbCQbCRbBrbnYaIPbCSbCTbCUbCVbCWbCXbCYbCZbDabDbbDccmocmocmocmocmobDebDfbDdbDdbDdbDgbusbDhbDibAabDjbDkbDlbDlbDmbDnbAhbuAbAibDobDpbDqbDrbDsbDtbDubtcbDvbtcbtcbtcbDwbyNbDxbDybDzbDAbDBbDCbDDbDEbDFbDGbDHbDIbDJbDKbDLbDKbDMbDNbDObDPbAJatJatJatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabzgbwybwybDQbvdbzibvddgbdgbdgbdgbbvdbvdbDRbDSbDTbeVbDUbDVbDWbDXbDXbDXbDYbDZbCvbCwbBebylbjXbEabBfbwRbEbbEcbEdbEebEfbEgbEhbEiaTBbEjbCHbEkbElbEmaTBaaaaaabBrbEnbEobEpbEqbErbErbEsbEtbEubEvbEwbExbEybEzbEAbEBbEBbECbEDbEEbEFbEGbEHbEIbEJbEKbELbEMbHqbrtbENbEObEObEPbAabAabAabEQbERbESbBKbDnbAhbETbAibfLbyNbyNbyNbyNbyNbyNbyNbyNbyNbEUbEVbEUbyNbEWbEXbEYbEZbEZbEZbFabFbbFcbFdbFebFfbFgbFhbFibFhbFjbFkbFlbFmbFnbwtbFobFobwtaadiWgiWgiWgaadiWgiWgiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaabFpbChbCibCjbxYbFqbvebFrbwDbvdbFqbvdbvdbvdbDRbFsbFtbeVbFubFvbFwbswbswbswbFxbswbCvbCwbBebylbjXbFybFzbwRbFAbFBbFCbFDbypbwRbFEbFFaTBbFGbFHaMZbjWbFIaTBaaaaaabBrbFJbFKbFLbFMbFNbFObFPbBrbFQaIPbFRbqGbqGbFTbFUbFVbqGbqGbFWbfzbfzbFWbqGbFWbqGbFWbqGbFWbqGbfzbfzbEObFZbDlbGabGbbAabEQbGcbGdbGebGfbAhbGgbGhbGibGjbGkbEZbEZbGlbEZbEZbGmbGnbGobGpbGqbEZbGrbGsbGtbGubGubGubGvbGvbGvbGvbGwbGxbGybGzbGAbGzbGBbGCbCfriRbGEbGFbGGbGHbwtaadaaaaaaaaaatJaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabGIbGJbGIbGKbGLbGKbGKbGKbGKbGKbGKbGMbvdbDRbFsbGNbeVbGObGPbGQbGRbswbGTbGSpYcbGUbBdbBebylaKebGVbBfbwRbGWbGXbGYbGZbHabwRaTBaTBaTBaTBbHbbHcbHdaTBaTBaTBaTBbBrbHebHfbHgbHhbFNbFObFPbBrbHiaIPaxxbqGbHjbHkbHlbHmbHnbqGvnpbrtbHpbLvbHrbHsbHtbHuhoZbHvbqGbrtbHwbEObHxbDlbHybHzbHAbHBbHCbHDbHDbHEbHFbHGbHHbHIbHJbHKbHLbHMbHLbHLbHNbHLbHLbHObHPbHLbHLbHQbHRbHSbHTbHUbHVbHWbHXbHYbHZbGwbIabGybGzbIbbGzbGBbIcbCfriRbAJbIdbIebIfbwtaaaaaaaaaaaaatJaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
@@ -7979,11 +7982,11 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaFcbKVbKWbKXaFcaFcaFcbKYbKZbKZaFcaFcbLabLbbLcbLdbLebLfbLgbLhbLibIobxbbLjaIPmMXthejqfaIPaIPbLkaIPbylaIPmMXthejqfaIPbLlbLmbLnaIPmMXthejqfaIPaIPaIPaLzaIPaIPmMXthejqfbJYbLobjXbqGbLpbLqbLrbLsbLtbqGbLubrtmIMbLvbqGbLwbLxbLybLxbLzbqGbrtbHwbEObEObEObEObEObAhbAhbAhbAhbAhbAhbLAwHdbLCbJbbLDbLEbLFbLGbLHbLIbJbbLJbLKbLLbLMbLNbJgbCabLObLPbLQbLRbLSbLSbLTbLUbLVbCfbLWbLXbLYbLZbLYbMabLWbCfriRbAJbMbbIebMcbwtaadaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaFcaFcbMdaFcaFcbMebMfbMgbMhbMibMjbMkbMlbMmbMnbMobMpbMqbMrbMsbMtbIobMubMvbMwaKlbMwbMxbMwbMwbMybMwbMzbfQbMAbMBbfQbMCbMDbMEbMFbMGbMHbMIbMJbMJbMKbMJbMLbMMbMJbMNbMObMPbMQbfQbMRbqGbMSbMTbMUbqGbqGbqGbFWbMVbFWbqGbqGbqGbqGbqGbqGbqGbqGbrtbrtbMWbMXbMYbMZbNabNbbNcbNdbNebNfbNbbNgbNhbNibJbbKubNjbNkbNlbNmbNnbJbbNobNpbNqbNrbNsbJgbCabNtbNubGvbNvbNwbNxbNybNzbNAbCfbNBbNCbNDbNEbNDbNCbNFbCfbNGbNHbNIbIebIfbwtaaaaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeDWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaabhratJbhrbhratJbhratJbNJbhrbhrbhrbNJatJatJatJatJatJatJbMkaZybMgbNKbNLbNMbNNbNObNPbNQbNRbNSbNTbNUbNVaTRbIobNWbNXbNYbNZbIobOabObaITaITaITaITbOcbOcbOcbOcbOcbOcbOcbOcbOcbOcbOdaHpbOebOfbOfbOfbOfbOfbOgbOfbOfbOfbOfbOhbOibOhaIUaKfbOjbFYbOkbOlbFYbOnbOobOpbOqbrtbOrbyBbOsbOtbOubOvbOwbOxbyBbutbrtbrtbrtbrtbrtbBFbOybOzbOAbOzbOBbNbbOCwHdbODbODbODbODbODbODbODbODbODbOEbOEbOEbOEbOEbOEbOFbOGbOHbGvbGvbGvbGvbGvbGvbGvbCfbCfbCfbCfbCfbCfbCfbCfbCfriRbAJbOIbOJbwtbwtaadatJaaeaaeaaeaaeaaeaaeaaeaaeaaeaadaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
-byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgatJatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabOKbOLbOMbONbOObOPbOQbORbOSbOTbOUbOVbOWbOXbOYbOZbPabPabPabPabPabPbbPcbObaaaaaaaadaaabOcbPdbPebPfbPgbPhbPibPjbPkbOcbPlbPmbPnbOfbPobPpbPqbPrbPsbPtbPubPvbPwbPxbPybOhbOhbOhbOhbFYbPzbPAbFYbPCbPDbPEbPFbEBbPHbPIbEBbEBbEBbPJbrtbPKbPLbPMbPNbPNbPObPPbPQbPRbOybPSbPTbPUbPVbNbbOCwHdbODbPWbPWbPWbPXbPWbPWhLRbODbPYbPYbPZbPYbPYbOEbQabQbbQcbQdbQebQfbQgbQhbQibQjbQkbQlbQmbQnbQobQpbQqbQrbQrbQsbQtbQebQebwtaadaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
+byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgatJatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabOKbOLbOMbONbOObOPbOQbORbOSbOTbOUbOVbOWbOXbOYbOZbPabPabPabPabPabPbbPcbObaaaaaaaadaaabOcbPdbPebPfbPgbPhbPibPjbPkbOcbPlbPmbPnbOfbPobPpbPqbPrbPsbPtbPubPvbPwbPxbPybOhbOhbOhbOhbFYbPzbPAxghbPCbPDbPEbPFbEBbPHbPIbEBbEBbEBbPJbrtbPKbPLbPMbPNbPNbPObPPbPQbPRbOybPSbPTbPUbPVbNbbOCwHdbODbPWbPWbPWbPXbPWbPWhLRbODbPYbPYbPZbPYbPYbOEbQabQbbQcbQdbQebQfbQgbQhbQibQjbQkbQlbQmbQnbQobQpbQqbQrbQrbQsbQtbQebQebwtaadaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabOKbQubQvbQwaFcaFcbKZbKZbKZbKZaFcaFcbQxbMmbQybQzbQAbQBbQCbQDaDObQEbQFbQGaadbQHbQIbQJbQKbQLbQMbQNbQMbQObQMbQMbQMbOcbQPbQQbQRbOfbQSbQTbQUbQVbQWbQXbQYbOfbOfbQZbRabRbbRcbRdcpHcyzbRgbRhbRibRjbRkbRlbRmbRnbRocqsbRqbzXbrtbrtbrtbRsbqGbqGbqGbqGbqGbRtbRubRvbOybRwbRxbOzbRybNbbOCwHdbODbPWbPWbPWbPWbPWbPWbPWbODbRzbRAbRBbRCbRDbREbRFbRGbQcbRHbRIbRJbRJbRJbRJbRJbRJbRKbRLbRMbQobwtbRNbRObRPbRPbRQbRRbRSbQeatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadbRTbRUbRTaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabKZbKZbKZbKZbiRbRWbRXbRXbRXbRXbRYbRZbSabSbbScsbObSebIkbObbSfbObbObbSgbShaaabSibSjbSkbSlbQMbQMbSmbQMbSnbSobSpbQMbOcbQPbQQaTWbOfbSqbSrbSsbStbSubSvbSwbOfbLAbSxbSybSzbSAbSBbSCbRpbSDbSEbKfbHobSFbUnbSGbSHbSIbqGbSJbrtbrtbrtbrtbSKbqGtdxbuzbSNbSObrtbVQbSRbSSbSTbOzbSUbSVbSWbSXbSYbODbPWbPWbSZbPWbPWbPWbPWbODbTabTbbTbbTcbTdbTebTfbTgbQcbThbTibRJbRJbRJbTjbTkbTlbTlbTlbTlbTmbTnbTobTpbTqbTrbTsbTtbTubRIatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadbRUbRTbTvbRTbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabTwbTxbTybTzbIkbTAbTBbTBbTCbTDbTEbTFbTBbSbbSdbTHbSdbIkbTJbTKbTLbOblrDbShaadbSibTMbTNbTObTPbTQbTPbTPbTRbTSbTTbTTbTUbTVbTWbTXbOfbOfbOfbOfbOfbTYbTZbOfbOfbUabUbbUcbUdbUcbUebUdbFYbUgbUhbUibUjbUkbFYbUlbUmbUlbqGbUobUpbUqbUrbUsbUtbqGtrUbrtbrtbUvbrtbUwbUxbUybUzbUAbUBbUCbNbbOCbLBbODbODbUDbPWbPWbUEbUDbODbODbUFbUGbUHbUHbUIbOEbUJbUKbQcbULbRIbRJbRJbUMbUNbUObRJbUPbUQbURbUSbUTbUUbUVbUWbUXbUYbUZbVabRIatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaadaadbVbbRUbVcbVdbVebRUbVbaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
-byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacatJaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVfbVgwkmhatbVibVjbVhbTBbVkbTBbTBbTBbTBbTBbVlbTGfEcbTIbIkbVnbTLbVobOblrDbShaaabSibVpbVqbVrbQMbQMbVsbQMbVtbVubVvbVwbOcbVxbVybVzbVAqTAqTAqTAqTAbVCbVDqTAqTAbVEbVFbVGbVHbVIbVJbVKbVLbVLbVLbVLbVLbVLbVLbExbExbExbVMbVMbVMbVMbVMbVMbVNbVObqGbqGaYQbqGbVPbVQbunbNbbNbbNbbNbbNbbNbbOCbLBbODbVRbVSbVTbVUbVVbVWbVXbVYbUFbUGbVZbUHbUIbOEbWabWbbQcbWcbQebWdbWebWfbWgbWhbWibRJbRJbWjbQobWkbWlbWmbQebWnbWobWobQebQeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatJaadaadbRUbRUbWpbWqbWqbWqbWrbRUbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
+byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacatJaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVfbVgwkmhatbVibVjbVhbTBbVkbTBbTBbTBbTBbTBbVlbTGfEcbTIbIkbVnbTLbVobOblrDbShaaabSibVpbVqbVrbQMbQMbVsbQMbVtbVubVvbVwbOcbVxbVybVzbVAqTAqTAqTAqTAbVCbVDqTAqTAbVEbVFbVGbVHbVIbVJbVKbVLbVLbVLbVLtqGbVLbVLbExbExbExbVMbVMbVMbVMbVMbVMbVNbVObqGbqGaYQbqGbVPbVQbunbNbbNbbNbbNbbNbbNbbOCbLBbODbVRbVSbVTbVUbVVbVWbVXbVYbUFbUGbVZbUHbUIbOEbWabWbbQcbWcbQebWdbWebWfbWgbWhbWibRJbRJbWjbQobWkbWlbWmbQebWnbWobWobQebQeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatJaadaadbRUbRUbWpbWqbWqbWqbWrbRUbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgatJbhratJbhrbhratJbhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabTwbWsbWtbWubWvbWwbWxbWxbWxbWybWzbWAbWBlkPbWCbWDbVmbIkbObbObbObbOblrDbWFaadbWGbQIbWHbQKbWIbQMbWJbQMbQMbQMbWKbWLbWMbWNbWObWPbWQbWRbWRbWRbWRbWSbWRbWTbWUbWVbWWbWXbWYbWZbXabXbiDWbXdiDWiDWiDWiDWiDWiDWbXcbXcbXciDWiDWiDWiDWbXebXfbSLusxbWEbXibXjbPQbSQbXkbXleLcbXmbXnbXobWWbWXbXpbODbXqbXrbXsbXtbXubXvbXwbVYbVYbVYbVYbVYbVYbXxbXybXzbXAbXBbQebQobQobQobQobXCbQobXDbRJbRJbQobXEbXFbXGbQebXHbXIbXJbXKbXLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabXMbXNbXMbWqbXObWqbXPbXQbRTaadaadaadeDWaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabTwbTwbTwbTwbIkbIkbTwbTwbTwbTwbIkbIkbTwbTwbTwbIkbIkbIkbXRbObaaabXSbXTbShaaaaaaaadaaabOcbXUbXVbXWbXXbQMbXYbQMbQMbOcbXZbYabYbbYcbYdbYebYfbYgbYhbYdbYdbYdbYdbYdbYibYjbYdbYdbYkbYdbYlbYdbYdbYdbYdbYdbOhbOhbOhbOhbOhbOhbOhbOhwHdbXffWDbUubYobYpbYqnSibYrbYsbYtbYubYubYvbYubYurpGbYxbODbYybYzbYAbYzbYzbYzbYBbYCbYDbYEbYFbYGbYHbYIbYJbUKbQcbYKaadbYLbYMbYNbYObYPbYObYQbYRbYSbQobYTbYUbYVbQebQebQebQebQebQeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatJaadaadbRUbRUbYWbWqbWqbWqbYXbRUbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadbYYaaaaaaaaaaaaaaaaaaaaFaadaoBaadaaFaadbXSbTLbXSaadbXSlrDbShaadbYZbZabZabZabZabZabZabZabZabZabZbbZcbZdbZebYabZfbZgbYdbYebYfbYgbYhbYdbYdbZhbZibZjbZkbZlbZmbZnbZobZpbZqbZrbZsbZtbZubYdaadaadaadaadaadaadaadbOhwHdbZvccdccdccdwfAbZwbZwbZxbZybZwbZwbZwbZwbZwbZwbZvbZzbZAbZBbZCbZDbZCbZEbZCbZFbZGbZHbZGbZGbZGbZGbZIbZJbZKbQcbYKaadbYLbZLbZMbZNbZObZPbZQbZRbZSbQobZTbYUbZUbXEbZVbZWbZXbZYaadatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadbVbbRUbZZcaacabcacbVbaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
@@ -7997,7 +8000,7 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGby
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaachXchYchYchYchYchZciaciacibciccidciecifcigcihciibObcijbObbObbObbObbObcikbObbObbWFbXTcilcilcilcilcilcilcilcilcimcimcimcimcimbXRcinbObchnchocgsciocipciqcircisceucitciucivceuciwcixciycizciAciBciCciDbZuchBciEciFceCceDcbYciGfUccgGcaBaadcccciHbOhbOhbOhwHdbZvciIcaKcaKciJciKciLcaGchNcaGciMbZvwHdbODciNcgTcgTciOciPbYzciQcePciRciSbPWbPWbPWbVYciTciUciVcdHciWcdHcdHcdHciXciYciZcjacjbcjccjdcjecjfrWbbXEccDbXEaadaadatJatJbXEaPaaPaaPaaPaevKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaadaaeaoBaadaoBaoBbXSbXSbXSbTLcjgcjhcjicjjcjkbObbTLbObcjlcjmcjlcjncjogOkcjpbWFbXTcilcjqcjrcjscjtcjucjvcjqcjwcjxcjycjzcimcimcinbObcjAchocgscjBcjCcjDcjDcjEcjFcjFcjFcjFbYdcjGcjHcjIcjIcjIcjJbZuchzcjKcjLcjMcjNcjOcjPcaBcaBcaBcaBcaBaadcccciHcjQcjRbLAwHdcaCcjScjTcjUcjVcjWcjXcjYchNcjYcjZbZvwHdbODckabPWbPWckbckcbYzcfUbYzcfVckdbPWckecfXbVYckfckgckhckickjckkcklcklckmcknckockpckqckrckscktcjfrWbbXEccDbXEbXEbXEaadaadaadaadaadaadatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaadaaeaaeaaeaaeaaeckubTLckvbTLckwckxcjhckybTLckzbTLbObcjlckAcjlckBckCcjlckDbWFbXTcilcjqckEckFckGckHckIcjqckJckKckLggkckNcimcinbObchnchocgsbYdckObYdckPckQcjFckRckSckTbYdckUcfAckVcjIckWciDckXckYckZclacgDclbcjOclccbYcldcleclfcaBaadbOhciHbOhclgclhwHdbZvclicljclkcllclmcljclnchNclnclocckwHdbODbPWbPWbPWclpclqcePclrbYzcgRclscgTcgTcgUbODcltcluclvclwcltcltclxclyclzclAclBclCclDclEcjfclFcjfrWbbXEclGbXEclHbXEatJcsjaadaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
-byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaaaaoBaoBaoBaadaadbXSbXSbXSclIclJclKclLclMccHbObbObclNcjlclOclPcnRcnRclRclRbWFbXTcilclSclTclUckGclVclSclSckJclWclXclYclZcimcinbObchnchoaYncjFcmbcmccmccmdcjFcmfcmgcmhbYdbZucfAcmicmjckWcmkckXckYcmlcmmcgDcmncmocmpcmqcmrcmscmtcaBaadbOhciHbOhbUcbUcbLBbZvbZwcmucmvbZwcmwbZwbZwbZwbZwbZwbZvwHdbODbVYbVYbVYbVYchQcmxcfUcmychQbVYbVYbVYbVYbODcmzcmAcmzcmBcmzcltclxclycmCcmDcjfcmEcmFcmEcjfcmGcjfrWbbXEcmHcmIcblbZYatJaaaatJaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
+byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaaaaoBaoBaoBaadaadbXSbXSbXSclIclJclKclLclMccHbObbObclNcjlclOclPcnRcnRclRclRbWFbXTcilclSclTclUckGclVclSclSckJclWclXclYclZcimcinbObchnchoaYncjFcmbcmccmccmdcjFcmfcmgcmhbYdbZucfAcmicmjckWcmkckXckYcmlcmmcgDcmncjOcmpcmqcmrcmscmtcaBaadbOhciHbOhbUcbUcbLBbZvbZwcmucmvbZwcmwbZwbZwbZwbZwbZwbZvwHdbODbVYbVYbVYbVYchQcmxcfUcmychQbVYbVYbVYbVYbODcmzcmAcmzcmBcmzcltclxclycmCcmDcjfcmEcmFcmEcjfcmGcjfrWbbXEcmHcmIcblbZYatJaaaatJaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaadaadaadbXScmJcmKcmKcmLcjkbXRbObcmMcmNcjlcmOclPcnRcnRmUPpmpbShbXTcilclSclScmScmTcmUcmVcmWcmXcmYcmZcnacnbcimcinbObcnccndcnecjFcnfcngcnhcnicnjcnjcnjcnjcbOcbQcfAckVcjIckWcnpckXcmkcnqchBcnrcnsceCcntcnucnvbfoclecaBaadcccciHcnwbOhcnxbLBcnycgIcgIcnzbZwcnAcnBcnCbOhcnDcnEbOCwHdbODciNcgTcgTcnFciPbYzciQcePcnGcnHbPWbPWbPWbODcnIcmzcmzcmzcmzcltcnJcnJcnKcmDcjfcnLcnLcnLcnLcnLcjfrWbbXEcnMcbmcnNbZYatJaaaatJaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaQaaQaaQaaQaaQaaQaaQaaQaaYaaQaaQaaQaaQaaQaaaaaabObbObbObbObbObbObcnObObbObbObbObcnPcnQcjlcmOclPcnRcnRcmOcmRbShbXTcilcnScnTcnUcnVcjqcmSapccnWaWYcnXcnYcnZcimcoacobcoccodcgscjFcoecnkcogcohcoicojcokcolbYdbZuconcjIcjIcjIcoobZucopcoqchBchCbZucdtcorcoscaBcaBcaBcaBaadccccotcoubOhcovcowcoxiDWcoycozbOhcoAcoBcoCbOhcoDbYubYwcoEbODckackebPWcoFckcbYzcfUbYzcfVcoGbPWbPWcfXbODcoHcmzcoIcoJcoKcoLcoMcoNcoOcmDcjfcnLcoPcoQcnLcnLcjfrWbbXEcoScoTccDbZYatJaaaatJaaaaaaaaahAVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG
 byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaaaadaaaaadaaaaadaaaacfaaaaadaaaaadaaaaaQaadaadbObcoUcoVbTLcoWbTLbTLbTLbTLbXRbObcoXcoYcoZkJiclPcnRcnRjXNjXNbShbXTcilcpccpdcmUcmUcmUcpecpfcpgcphcpicpjcpkcimbObbObcplcpmcpncjFcjFcpobnZcohcprcprcprcprbYdcnncnocptcpucpvcpwcpxcpycpzclacgDcpAcjOclccnucpBcpCcpCcaBaadcccbLAciHbOhbOhcpDbKtbOhcpEwKnbOhbOhcpGbOhbOhwKncpHbSXcpIbODbPWbPWbPWcpJcpKcePclrbYzcgRcpLcgTcgTcgUbODcmzcmzcpMcmzcmzcltcnJcnJcpNcpOcjfcnLcnLcpPcnLcnLcjfrWbbXEbXEbXEccDbXEaadaaaatJaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG

_maps/map_files/KiloStation/KiloStation.dmm

@@ -19417,7 +19417,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 8
 	},
-/obj/effect/spawner/structure/window/reinforced,
 /turf/closed/wall,
 /area/engineering/atmos)
 "aHy" = (
@@ -20287,7 +20286,7 @@
 	},
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/closed/wall,
+/turf/open/floor/plating,
 /area/engineering/atmos)
 "aIP" = (
 /obj/effect/turf_decal/delivery,
@@ -20770,7 +20769,6 @@
 /area/engineering/atmos)
 "aJI" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible,
-/obj/effect/spawner/structure/window/reinforced,
 /turf/closed/wall,
 /area/engineering/atmos)
 "aJJ" = (
@@ -50278,7 +50276,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/effect/spawner/structure/window/reinforced,
-/turf/closed/wall,
+/turf/open/floor/plating,
 /area/engineering/atmos)
 "bGp" = (
 /obj/effect/turf_decal/tile/red{
@@ -51349,7 +51347,7 @@
 	dir = 4
 	},
 /obj/effect/spawner/structure/window/reinforced,
-/turf/closed/wall,
+/turf/open/floor/plating,
 /area/engineering/atmos)
 "bIc" = (
 /obj/effect/turf_decal/delivery,
@@ -51367,7 +51365,7 @@
 	},
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/closed/wall,
+/turf/open/floor/plating,
 /area/engineering/atmos)
 "bIf" = (
 /obj/structure/table,
@@ -59146,7 +59144,7 @@
 /obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
-/turf/closed/wall,
+/turf/open/floor/plating,
 /area/engineering/atmos)
 "bUN" = (
 /turf/open/floor/plating/airless,
@@ -66230,6 +66228,7 @@
 	name = "Engineering External Airlock";
 	req_one_access_txt = "10;24"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/dark,
 /area/engineering/main)
 "cgI" = (
@@ -67948,6 +67947,7 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/dark,
 /area/engineering/atmos)
 "cjn" = (
@@ -72590,9 +72590,6 @@
 	pixel_y = -32
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm{
-	pixel_y = 24
-	},
 /turf/open/floor/plating,
 /area/engineering/atmos)
 "csg" = (
@@ -72621,6 +72618,9 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm{
+	pixel_y = 24
+	},
 /turf/open/floor/plating,
 /area/engineering/atmos)
 "csj" = (
@@ -72953,7 +72953,7 @@
 /turf/open/floor/engine,
 /area/engineering/gravity_generator)
 "csK" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
 	dir = 1
 	},
 /obj/machinery/light/small{
@@ -74844,7 +74844,8 @@
 /area/maintenance/port/fore)
 "cwz" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/on{
-	dir = 1
+	dir = 1;
+	volume_rate = 200
 	},
 /obj/machinery/light/small{
 	dir = 4
@@ -75325,6 +75326,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/dark,
 /area/maintenance/disposal)
 "cxq" = (
@@ -75483,7 +75485,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/effect/spawner/structure/window/reinforced,
-/turf/closed/wall,
+/turf/open/floor/plating,
 /area/engineering/atmos)
 "cxU" = (
 /obj/structure/disposalpipe/segment{
@@ -81359,6 +81361,14 @@
 	},
 /turf/open/floor/mineral/calorite,
 /area/space/nearstation)
+"edN" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/engineering/atmos)
 "eeU" = (
 /obj/item/kirbyplants,
 /turf/open/floor/wood,
@@ -84143,6 +84153,11 @@
 	icon_state = "wood-broken4"
 	},
 /area/ruin/space/djstation)
+"sUA" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/opossum/poppy,
+/turf/open/floor/plating,
+/area/maintenance/aft)
 "sWL" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -112140,7 +112155,7 @@ bUM
 bUS
 cxT
 bGC
-cxT
+edN
 cBH
 cjs
 aks
@@ -114955,7 +114970,7 @@ bFc
 cbd
 bGJ
 cdr
-bGG
+sUA
 ssF
 cgF
 chz

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -42566,7 +42566,7 @@
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
 "bKZ" = (
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+/obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
 /obj/effect/spawner/structure/window/reinforced,
@@ -44227,7 +44227,7 @@
 /area/engineering/atmos)
 "bPf" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+/obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
 /obj/effect/spawner/structure/window/reinforced,
@@ -45485,7 +45485,7 @@
 "bSi" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+/obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
 /turf/open/floor/plating,
@@ -46422,7 +46422,7 @@
 "bUz" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
+/obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
 /turf/open/floor/plating,
@@ -46699,7 +46699,7 @@
 /area/engineering/atmos)
 "bVl" = (
 /obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+/obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
@@ -49367,6 +49367,7 @@
 	name = "Atmospherics External Access";
 	req_access_txt = "24"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/maintenance/disposal/incinerator)
 "cdm" = (
@@ -50275,6 +50276,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/engineering/main)
 "chw" = (
@@ -51067,6 +51069,7 @@
 	name = "Telecommunications External Access";
 	req_access_txt = "61"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/tcommsat/computer)
 "clB" = (
@@ -55614,8 +55617,13 @@
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
 "dKs" = (
-/turf/open/floor/catwalk_floor,
-/area/space/station_ruins)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external{
+	name = "Port Docking Bay 1"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/dark,
+/area/hallway/secondary/entry)
 "dLY" = (
 /obj/structure/table,
 /obj/item/assembly/igniter,
@@ -57171,6 +57179,16 @@
 	},
 /turf/closed/wall,
 /area/science/mixing)
+"gMM" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external{
+	name = "Port Docking Bay 1"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/dark,
+/area/hallway/secondary/entry)
 "gMO" = (
 /obj/structure/plasticflaps/opaque,
 /turf/open/floor/plating,
@@ -58073,6 +58091,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/office)
+"iIx" = (
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/engineering/atmos)
 "iJi" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 5
@@ -58185,7 +58211,7 @@
 /area/maintenance/department/security/brig)
 "iSL" = (
 /obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/open/floor/plating,
 /area/engineering/atmos)
 "iTE" = (
@@ -60204,6 +60230,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/storage)
+"nmB" = (
+/mob/living/simple_animal/opossum/poppy,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
 "nnf" = (
 /obj/structure/rack,
 /obj/item/stack/packageWrap,
@@ -60991,6 +61021,7 @@
 	name = "Solar Maintenance";
 	req_access_txt = "10; 13"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/maintenance/solars/starboard)
 "oDP" = (
@@ -62581,6 +62612,7 @@
 	name = "Solar Maintenance";
 	req_access_txt = "10; 13"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/maintenance/solars/port)
 "rKL" = (
@@ -70732,7 +70764,7 @@ uIu
 uIu
 uIu
 uIu
-dKs
+aaa
 uIu
 uIu
 uIu
@@ -84514,14 +84546,14 @@ aZy
 aFS
 aGS
 aGW
-aHv
+gMM
 aaa
 aaa
 aaa
 aaa
 aaa
 aaa
-aGS
+dKs
 aGW
 aHv
 aIF
@@ -86056,14 +86088,14 @@ aZA
 aGn
 aGS
 aGW
-aHv
+gMM
 aaa
 aaa
 aaa
 aaa
 aaa
 aaa
-aGS
+dKs
 aGW
 aHv
 aJg
@@ -90470,7 +90502,7 @@ bva
 bva
 bva
 tvP
-bDi
+nmB
 wRk
 bva
 bva
@@ -101263,7 +101295,7 @@ myn
 bVX
 bWM
 bXv
-bWc
+iSL
 tmi
 bZL
 caB
@@ -102291,7 +102323,7 @@ bVh
 bVY
 bWM
 bXy
-bWc
+iSL
 bZe
 bZL
 caE
@@ -103319,7 +103351,7 @@ bVi
 bMe
 bWP
 bXy
-bQO
+iIx
 bZe
 bZN
 caH

code/modules/atmospherics/gasmixtures/auxgm.dm

@@ -186,6 +186,6 @@ GLOBAL_DATUM_INIT(gas_data, /datum/auxgm, new)
 	appearance_flags = TILE_BOUND
 	vis_flags = NONE
 
-/obj/effect/overlay/gas/Initialize(mapload, state)
+/obj/effect/overlay/gas/New(state)
 	. = ..()
-	icon_state = state
+	icon_state = state

code/modules/client/preferences.dm

@@ -328,6 +328,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		wl_rate = 0.5
 	if(isnull(stuckage))
 		stuckage = 0
+	if (stuckage_chance == null)
+		stuckage_chance = 0
 	if(isnull(max_weight))
 		max_weight = 0
 	if(isnull(chair_breakage))
@@ -1422,6 +1424,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat +="<td width='300px' height='300px' valign='top'>"
 					dat += "<h2>GS13 Gameplay Preferences</h2>"
 					dat += "<b>Stuckage (at what weight will you get stuck in doors?):</b><a href='?_src_=prefs;preference=stuckage'>[stuckage == FALSE ? "Disabled" : stuckage]</a><BR>"
+					if(stuckage)
+						dat += "<b>Stuckage Chance :</b> <a href='?_src_=prefs;preference=stuckage_chance;task=input'>[stuckage_chance]</a><br>"
 					dat += "<b>Chair Breakage (at what weight will you break chairs?):</b><a href='?_src_=prefs;preference=chair_breakage'>[chair_breakage == FALSE ? "Disabled" : chair_breakage]</a><BR>"
 					dat += "<br></br>"
 					dat += "This preference will allow items that work based on weight to work to you, <b>usually to your detriment.</b> <BR>"
@@ -3021,6 +3025,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					var/new_wl_rate = input(user, "Choose your weight loss rate from 0.1 (10%) to 2 (200%).\n Decimals such as 0.2 indicate 20% rate.\nDefault recommended rate is 0.5 (50%)", "Character Preference", wl_rate) as num|null
 					if (new_wl_rate)
 						wl_rate = max(min(round(text2num(new_wl_rate),0.01),2),0)
+				
+				if("stuckage_chance")
+					var/new_stuckage_chance = input(user, "Choose your chance to get stuck in doors from 0.1 (10%) to 1 (100%).\nDecimals such as 0.2 indicate 20% chance.\nSetting this to 0 restores default values.", "Character Preference", stuckage_chance) as num|null
+					if(new_stuckage_chance)
+						stuckage_chance = clamp(new_stuckage_chance, 0.1, 1)
+					else
+						stuckage_chance = 0
 
 				if("marking_down")
 					// move the specified marking down

code/modules/client/preferences_savefile.dm

@@ -952,6 +952,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["helplessness_clothing_back"] >> helplessness_clothing_back
 	S["helplessness_no_buckle"] >> helplessness_no_buckle
 	S["stuckage"] >> stuckage
+	S["stuckage_chance"] >> stuckage_chance
 	S["chair_breakage"] >> chair_breakage
 	S["fatness_vulnerable"] >> fatness_vulnerable
 	S["extreme_fatness_vulnerable"] >> extreme_fatness_vulnerable
@@ -1247,6 +1248,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["helplessness_clothing_back"], helplessness_clothing_back)
 	WRITE_FILE(S["helplessness_no_buckle"], helplessness_no_buckle)
 	WRITE_FILE(S["stuckage"], stuckage)
+	WRITE_FILE(S["stuckage_chance"], stuckage_chance)
 	WRITE_FILE(S["chair_breakage"], chair_breakage)
 	WRITE_FILE(S["fatness_vulnerable"], fatness_vulnerable)
 	WRITE_FILE(S["extreme_fatness_vulnerable"], extreme_fatness_vulnerable)

code/modules/surgery/organs/eyes.dm

@@ -240,6 +240,7 @@
 /obj/item/organ/eyes/robotic/glow
 	name = "High Luminosity Eyes"
 	desc = "Special glowing eyes, used by snowflakes who want to be special."
+	flash_protect = 2 // GS13 EDIT Non-organic eyes should be protected from welding flash.
 	left_eye_color = "000"
 	right_eye_color = "000"
 	actions_types = list(/datum/action/item_action/organ_action/use, /datum/action/item_action/organ_action/toggle)
@@ -429,6 +430,7 @@
 	name = "ipc eyes"
 	icon_state = "cybernetic_eyeballs"
 	organ_flags = ORGAN_SYNTHETIC // GS13 = Fixes IPC organs decaying, we hope.
+	flash_protect = 2 // GS13 EDIT Non-organic eyes should be protected from welding flash.
 
 /obj/item/organ/eyes/ipc/emp_act(severity)
 	. = ..()

tgstation.dme

@@ -4062,6 +4062,7 @@
 #include "GainStation13\code\modules\mob\living\species.dm"
 #include "GainStation13\code\modules\mob\living\vore\eating\trasheat_lists.dm"
 #include "GainStation13\code\modules\mod\modules\modules_fat.dm"
+#include "GainStation13\code\modules\power\energy_harvester.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\dwarverndrinks.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\fatty_drinks.dm"
@@ -4127,6 +4128,8 @@
 #include "GainStation13\icons\obj\vairous_weapons.dm"
 #include "GainStation13\icons\obj\structure\beds.dm"
 #include "GainStation13\icons\obj\structure\flora.dm"
+#include "GainStation13\code\modules\research\techweb\robotic_nodes.dm"
+#include "GainStation13\code\modules\research\designs\ipc_designs.dm"
 #include "hyperstation\code\datums\mood_events\events.dm"
 #include "hyperstation\code\game\objects\railings.dm"
 #include "hyperstation\code\game\objects\structures\bench.dm"

tgui/packages/tgui/interfaces/EnergyHarvester.js

@@ -0,0 +1,57 @@
+import { round, toFixed } from 'common/math';
+import { formatPower } from '../format';
+import { useBackend } from '../backend';
+import { AnimatedNumber, Button, LabeledList, Slider, Section } from '../components';
+import { Window } from '../layouts';
+
+const POWER_MUL = 1e3;
+
+export const EnergyHarvester = (props, context) => {
+  const { act, data } = useBackend(context);
+  return(
+    <Window width={340} height={350}>
+      <Window.Content>
+        <Section title="Status">
+          <LabeledList>
+            <LabeledList.Item label="Power in connected wire">
+              {formatPower(data.power_available)}
+            </LabeledList.Item>
+            <LabeledList.Item label="Current power drain">
+              {formatPower(data.power_drain)}
+            </LabeledList.Item>
+            <LabeledList.Item label="Conversion rate (KW per credit)">
+              <AnimatedNumber 
+                value = {1/data.credit_conversion_rate}
+                format={value => round(value, 0)}
+              />
+            </LabeledList.Item>
+          </LabeledList>
+        </Section>
+        <Section title="Controls" buttons={
+          (<Button 
+            icon={data.active ? 'power-off' : 'times'}
+            content={data.active ? 'On' : 'Off'}
+            selected={data.active}
+            onClick={() => act('power')}
+          />)
+          }
+        >
+          <LabeledList>
+            <LabeledList.Item label="Power Drained Percent">
+              <Slider
+                value = {data.set_power_drain}
+                minValue = {1}
+                maxValue = {data.maximum_drain}
+                step={1}
+                stepPixelSize={200 / data.maximum_drain}
+                onDrag={(e, value) => act('drain_percentage', {
+                  target: value,
+                })}
+                />
+            </LabeledList.Item>
+          </LabeledList>
+        </Section>
+      </Window.Content>
+    </Window>
+  );
+};