From bd0fc928ddcfd9fab0e726ea95cc55f6f347e760 Mon Sep 17 00:00:00 2001
From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com>
Date: Mon, 1 Apr 2024 19:54:58 +0200
Subject: [PATCH 01/11] TEG suddenly starts working, the public is shocked!
 (#1521)

* Fixes and updates the TEG (#81044)

Fixes thermoelectric generators so they work again
Pipes can be connected to it, the machine can be rotated
Adds the ventcrawl movement flags as a defined bitfield
I also gave it a TGUI menu, it was small so it is pretty insignificant.
I added a little bit more text to error messages to make it clearer why
the thermoelectric generator isn't functional.
I also repathed generator to thermoelectric_generator because
'generator' is a keyword and is highlighted in green which makes people
using vscode a little confused what it's meant to be.

Old

![image](https://github.com/tgstation/tgstation/assets/53777086/0fe0651b-4d48-474b-869f-2f665757a0bc)

New

https://github.com/tgstation/tgstation/assets/53777086/064a5dda-5407-4817-b090-d22eb6c4aab8

This is one of the things I had to move to TGUI in
https://hackmd.io/XLt5MoRvRxuhFbwtk4VAUA
I was originally gonna remove it, but in the spirit of feature freeze I
thought I should at least give it a try.
This fixes many issues with it and gives it a new better UI that won't
stop updating easily so you can actually watch the changes as it
happens.
The TEG may not be obtainable in-game but it can still be mapped in or
give by admins, letting it function as intended is still a massive
benefit.

Closes https://github.com/tgstation/tgstation/issues/75738

:cl: JohnFulpWillard, Unit2E teaching me the TEG
fix: The TEG now works again (still unobtainable by regular means
though).
fix: the TEG and its circulators can now be rotated counterclockwise
again.
refactor: The TEG now uses a TGUI interface rather than the old HTML
one.
/:cl:

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* monkestation specific fixes

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 _maps/RandomRuins/SpaceRuins/shuttlerelic.dmm |   2 +-
 _maps/templates/medium_shuttle4.dmm           |   2 +-
 code/__DEFINES/atmospherics/atmos_piping.dm   |  10 +-
 .../machines/machine_circuitboards.dm         |   4 +-
 .../components/binary_devices/circulator.dm   |  75 ++----
 .../machinery/pipes/layermanifold.dm          |   2 +-
 code/modules/power/generator.dm               | 232 ------------------
 .../modules/power/thermoelectric_generator.dm | 222 +++++++++++++++++
 .../research/ordnance/tank_compressor.dm      |   3 -
 tgstation.dme                                 |   2 +-
 .../interfaces/ThermoElectricGenerator.tsx    |  80 ++++++
 11 files changed, 341 insertions(+), 293 deletions(-)
 delete mode 100644 code/modules/power/generator.dm
 create mode 100644 code/modules/power/thermoelectric_generator.dm
 create mode 100644 tgui/packages/tgui/interfaces/ThermoElectricGenerator.tsx

diff --git a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm
index 86ea8c855cc8..71074aa4451f 100644
--- a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm
+++ b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm
@@ -74,7 +74,7 @@
 /turf/open/floor/oldshuttle,
 /area/ruin/space/has_grav/powered)
 "t" = (
-/obj/machinery/power/generator,
+/obj/machinery/power/thermoelectric_generator,
 /turf/open/floor/oldshuttle,
 /area/ruin/space/has_grav/powered)
 "u" = (
diff --git a/_maps/templates/medium_shuttle4.dmm b/_maps/templates/medium_shuttle4.dmm
index 0071a71a1e99..67a5617da6b5 100644
--- a/_maps/templates/medium_shuttle4.dmm
+++ b/_maps/templates/medium_shuttle4.dmm
@@ -54,7 +54,7 @@
 /turf/open/floor/oldshuttle,
 /area/ruin/powered/shuttle/medium_4)
 "r" = (
-/obj/machinery/power/generator,
+/obj/machinery/power/thermoelectric_generator,
 /turf/open/floor/oldshuttle,
 /area/ruin/powered/shuttle/medium_4)
 "s" = (
diff --git a/code/__DEFINES/atmospherics/atmos_piping.dm b/code/__DEFINES/atmospherics/atmos_piping.dm
index 3d864e6485f7..bdbf845a02f0 100644
--- a/code/__DEFINES/atmospherics/atmos_piping.dm
+++ b/code/__DEFINES/atmospherics/atmos_piping.dm
@@ -84,8 +84,14 @@
 
 // Ventcrawling bitflags, handled in var/vent_movement
 ///Allows for ventcrawling to occur. All atmospheric machines have this flag on by default. Cryo is the exception
-#define VENTCRAWL_ALLOWED	(1<<0)
+#define VENTCRAWL_ALLOWED (1<<0)
 ///Allows mobs to enter or leave from atmospheric machines. On for passive, unary, and scrubber vents.
 #define VENTCRAWL_ENTRANCE_ALLOWED (1<<1)
 ///Used to check if a machinery is visible. Called by update_pipe_vision(). On by default for all except cryo.
-#define VENTCRAWL_CAN_SEE	(1<<2)
+#define VENTCRAWL_CAN_SEE (1<<2)
+
+DEFINE_BITFIELD(vent_movement, list(
+	"Ventcrawl Allowed" = VENTCRAWL_ALLOWED,
+	"Ventcrawl Entrance Allowed" = VENTCRAWL_ENTRANCE_ALLOWED,
+	"Ventcrawl Can See" = VENTCRAWL_CAN_SEE,
+))
diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
index 454441552506..89f3edfb4c8a 100644
--- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
@@ -222,10 +222,10 @@
 		/datum/stock_part/manipulator = 1)
 	needs_anchored = FALSE
 
-/obj/item/circuitboard/machine/generator
+/obj/item/circuitboard/machine/thermoelectric_generator
 	name = "Thermo-Electric Generator"
 	greyscale_colors = CIRCUIT_COLOR_ENGINEERING
-	build_path = /obj/machinery/power/generator
+	build_path = /obj/machinery/power/thermoelectric_generator
 	req_components = list()
 
 /obj/item/circuitboard/machine/ntnet_relay
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
index 9a4623ef49a1..819f9d0f5659 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
@@ -5,27 +5,23 @@
 	name = "circulator/heat exchanger"
 	desc = "A gas circulator pump and heat exchanger."
 	icon_state = "circ-off-0"
-
-	var/active = FALSE
-
-	var/last_pressure_delta = 0
 	pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
-
+	vent_movement = VENTCRAWL_CAN_SEE
 	density = TRUE
-
 	circuit = /obj/item/circuitboard/machine/circulator
 
+	var/active = FALSE
+	var/last_pressure_delta = 0
 	var/flipped = 0
+	///Which circulator mode we are on, the generator requires one of each to work.
 	var/mode = CIRCULATOR_HOT
-	var/obj/machinery/power/generator/generator
+	///The generator we are connected to.
+	var/obj/machinery/power/thermoelectric_generator/generator
 
 /obj/machinery/atmospherics/components/binary/circulator/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/simple_rotation)
 
-/obj/machinery/atmospherics/components/binary/circulator/AltClick(mob/user)
-	return ..() // This hotkey is BLACKLISTED since it's used by /datum/component/simple_rotation
-
 //default cold circ for mappers
 /obj/machinery/atmospherics/components/binary/circulator/cold
 	mode = CIRCULATOR_COLD
@@ -49,25 +45,18 @@
 		return null
 
 	//Calculate necessary moles to transfer using PV = nRT
-	if(air2.temperature>0)
-		var/pressure_delta = (input_starting_pressure - output_starting_pressure)/2
-
-		var/transfer_moles = (pressure_delta*air1.volume)/(air2.temperature * R_IDEAL_GAS_EQUATION)
-
-		last_pressure_delta = pressure_delta
-
-		//Actually transfer the gas
-		var/datum/gas_mixture/removed = air2.remove(transfer_moles)
-
-		update_parents()
-
-		return removed
-
-	else
+	if(air2.temperature <= 0)
 		last_pressure_delta = 0
+		return
+	var/pressure_delta = (input_starting_pressure - output_starting_pressure)/2
+	var/transfer_moles = (pressure_delta*air1.volume)/(air2.temperature * R_IDEAL_GAS_EQUATION)
+	last_pressure_delta = pressure_delta
+	//Actually transfer the gas
+	var/datum/gas_mixture/removed = air2.remove(transfer_moles)
+	update_parents()
+	return removed
 
 /obj/machinery/atmospherics/components/binary/circulator/process_atmos()
-	..()
 	update_appearance()
 
 /obj/machinery/atmospherics/components/binary/circulator/update_icon_state()
@@ -86,13 +75,13 @@
 
 /obj/machinery/atmospherics/components/binary/circulator/wrench_act(mob/living/user, obj/item/I)
 	if(!panel_open)
+		balloon_alert(user, "open the panel!")
 		return
 	set_anchored(!anchored)
 	I.play_tool_sound(src)
 	if(generator)
 		disconnectFromGenerator()
-	to_chat(user, span_notice("You [anchored?"secure":"unsecure"] [src]."))
-
+	balloon_alert(user, "[anchored ? "secure" : "unsecure"]")
 
 	var/obj/machinery/atmospherics/node1 = nodes[1]
 	var/obj/machinery/atmospherics/node2 = nodes[2]
@@ -145,20 +134,22 @@
 	if(generator)
 		disconnectFromGenerator()
 	mode = !mode
-	to_chat(user, span_notice("You set [src] to [mode ? "cold" : "hot"] mode."))
+	balloon_alert(user, "set to [mode ? "cold" : "hot"]")
 	return TRUE
 
 /obj/machinery/atmospherics/components/binary/circulator/screwdriver_act(mob/user, obj/item/I)
-	if(..())
-		return TRUE
+	if(!anchored)
+		balloon_alert(user, "anchor it down!")
+		return
 	toggle_panel_open()
 	I.play_tool_sound(src)
-	to_chat(user, span_notice("You [panel_open ? "open" : "close"] the panel on [src]."))
+	balloon_alert(user, "panel [panel_open ? "open" : "closed"]")
 	return TRUE
 
 /obj/machinery/atmospherics/components/binary/circulator/crowbar_act(mob/user, obj/item/I)
-	default_deconstruction_crowbar(I)
-	return TRUE
+	if(default_deconstruction_crowbar(I))
+		return TRUE
+	return ..()
 
 /obj/machinery/atmospherics/components/binary/circulator/on_deconstruction()
 	if(generator)
@@ -176,19 +167,3 @@
 	..()
 	pixel_x = 0
 	pixel_y = 0
-
-/obj/machinery/atmospherics/components/binary/circulator/verb/circulator_flip()
-	set name = "Flip"
-	set category = "Object"
-	set src in oview(1)
-
-	if(!ishuman(usr))
-		return
-
-	if(anchored)
-		to_chat(usr, span_danger("[src] is anchored!"))
-		return
-
-	flipped = !flipped
-	to_chat(usr, span_notice("You flip [src]."))
-	update_appearance()
diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
index 9a3abdb16c5d..0e5678ae3f33 100644
--- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
@@ -98,7 +98,7 @@
 	normalize_cardinal_directions()
 	find_all_connections()
 
-/obj/machinery/atmospherics/pipe/layer_manifold/set_piping_layer()
+/obj/machinery/atmospherics/pipe/layer_manifold/set_piping_layer(new_layer)
 	piping_layer = PIPING_LAYER_DEFAULT
 
 /obj/machinery/atmospherics/pipe/layer_manifold/pipeline_expansion()
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
deleted file mode 100644
index 5442131817b8..000000000000
--- a/code/modules/power/generator.dm
+++ /dev/null
@@ -1,232 +0,0 @@
-/obj/machinery/power/generator
-	name = "thermoelectric generator"
-	desc = "It's a high efficiency thermoelectric generator."
-	icon_state = "teg"
-	density = TRUE
-	use_power = NO_POWER_USE
-
-	circuit = /obj/item/circuitboard/machine/generator
-
-	var/obj/machinery/atmospherics/components/binary/circulator/cold_circ
-	var/obj/machinery/atmospherics/components/binary/circulator/hot_circ
-
-	var/lastgen = 0
-	var/lastgenlev = -1
-	var/lastcirc = "00"
-
-
-/obj/machinery/power/generator/Initialize(mapload)
-	. = ..()
-	AddComponent(/datum/component/simple_rotation)
-	find_circs()
-	connect_to_network()
-	SSair.start_processing_machine(src)
-	update_appearance()
-
-/obj/machinery/power/generator/Destroy()
-	kill_circs()
-	SSair.stop_processing_machine(src)
-	return ..()
-
-/obj/machinery/power/generator/update_overlays()
-	. = ..()
-	if(machine_stat & (NOPOWER|BROKEN))
-		return
-
-	var/L = min(round(lastgenlev / 100000), 11)
-	if(L != 0)
-		. += mutable_appearance('icons/obj/power.dmi', "teg-op[L]")
-	if(hot_circ && cold_circ)
-		. += "teg-oc[lastcirc]"
-
-
-#define GENRATE 800 // generator output coefficient from Q
-
-/obj/machinery/power/generator/process_atmos()
-
-	if(!cold_circ || !hot_circ)
-		return
-
-	if(powernet)
-		var/datum/gas_mixture/cold_air = cold_circ.return_transfer_air()
-		var/datum/gas_mixture/hot_air = hot_circ.return_transfer_air()
-
-		if(cold_air && hot_air)
-
-			var/cold_air_heat_capacity = cold_air.heat_capacity()
-			var/hot_air_heat_capacity = hot_air.heat_capacity()
-
-			var/delta_temperature = hot_air.temperature - cold_air.temperature
-
-
-			if(delta_temperature > 0 && cold_air_heat_capacity > 0 && hot_air_heat_capacity > 0)
-				var/efficiency = 0.65
-
-				var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity)
-
-				var/heat = energy_transfer*(1-efficiency)
-				lastgen += energy_transfer*efficiency
-
-				hot_air.temperature = hot_air.temperature - energy_transfer/hot_air_heat_capacity
-				cold_air.temperature = cold_air.temperature + heat/cold_air_heat_capacity
-
-				//add_avail(lastgen) This is done in process now
-		// update icon overlays only if displayed level has changed
-
-		if(hot_air)
-			var/datum/gas_mixture/hot_circ_air1 = hot_circ.airs[1]
-			hot_circ_air1.merge(hot_air)
-
-		if(cold_air)
-			var/datum/gas_mixture/cold_circ_air1 = cold_circ.airs[1]
-			cold_circ_air1.merge(cold_air)
-
-		update_appearance()
-
-	var/circ = "[cold_circ?.last_pressure_delta > 0 ? "1" : "0"][hot_circ?.last_pressure_delta > 0 ? "1" : "0"]"
-	if(circ != lastcirc)
-		lastcirc = circ
-		update_appearance()
-
-	src.updateDialog()
-
-/obj/machinery/power/generator/process()
-	//Setting this number higher just makes the change in power output slower, it doesnt actualy reduce power output cause **math**
-	var/power_output = round(lastgen / 10)
-	add_avail(power_output)
-	lastgenlev = power_output
-	lastgen -= power_output
-	..()
-
-/obj/machinery/power/generator/proc/get_menu(include_link = TRUE)
-	var/t = ""
-	if(!powernet)
-		t += "<span class='bad'>Unable to connect to the power network!</span>"
-	else if(cold_circ && hot_circ)
-		var/datum/gas_mixture/cold_circ_air1 = cold_circ.airs[1]
-		var/datum/gas_mixture/cold_circ_air2 = cold_circ.airs[2]
-		var/datum/gas_mixture/hot_circ_air1 = hot_circ.airs[1]
-		var/datum/gas_mixture/hot_circ_air2 = hot_circ.airs[2]
-
-		t += "<div class='statusDisplay'>"
-
-		t += "Output: [display_power(lastgenlev)]"
-
-		t += "<BR>"
-
-		t += "<B><font color='blue'>Cold loop</font></B><BR>"
-		t += "Temperature Inlet: [round(cold_circ_air2.temperature, 0.1)] K / Outlet: [round(cold_circ_air1.temperature, 0.1)] K<BR>"
-		t += "Pressure Inlet: [round(cold_circ_air2.return_pressure(), 0.1)] kPa /  Outlet: [round(cold_circ_air1.return_pressure(), 0.1)] kPa<BR>"
-
-		t += "<B><font color='red'>Hot loop</font></B><BR>"
-		t += "Temperature Inlet: [round(hot_circ_air2.temperature, 0.1)] K / Outlet: [round(hot_circ_air1.temperature, 0.1)] K<BR>"
-		t += "Pressure Inlet: [round(hot_circ_air2.return_pressure(), 0.1)] kPa / Outlet: [round(hot_circ_air1.return_pressure(), 0.1)] kPa<BR>"
-
-		t += "</div>"
-	else if(!hot_circ && cold_circ)
-		t += "<span class='bad'>Unable to locate hot circulator!</span>"
-	else if(hot_circ && !cold_circ)
-		t += "<span class='bad'>Unable to locate cold circulator!</span>"
-	else
-		t += "<span class='bad'>Unable to locate any parts!</span>"
-	if(include_link)
-		t += "<BR><A href='?src=[REF(src)];close=1'>Close</A>"
-
-	return t
-
-/obj/machinery/power/generator/ui_interact(mob/user)
-	. = ..()
-	var/datum/browser/popup = new(user, "teg", "Thermo-Electric Generator", 460, 300)
-	popup.set_content(get_menu())
-	popup.open()
-
-/obj/machinery/power/generator/Topic(href, href_list)
-	if(..())
-		return
-	if( href_list["close"] )
-		usr << browse(null, "window=teg")
-		usr.unset_machine()
-		return FALSE
-	return TRUE
-
-
-
-/obj/machinery/power/generator/proc/find_circs()
-	kill_circs()
-	var/list/circs = list()
-	var/obj/machinery/atmospherics/components/binary/circulator/C
-	var/circpath = /obj/machinery/atmospherics/components/binary/circulator
-	if(dir == NORTH || dir == SOUTH)
-		C = locate(circpath) in get_step(src, EAST)
-		if(C && C.dir == WEST)
-			circs += C
-
-		C = locate(circpath) in get_step(src, WEST)
-		if(C && C.dir == EAST)
-			circs += C
-
-	else
-		C = locate(circpath) in get_step(src, NORTH)
-		if(C && C.dir == SOUTH)
-			circs += C
-
-		C = locate(circpath) in get_step(src, SOUTH)
-		if(C && C.dir == NORTH)
-			circs += C
-
-	if(circs.len)
-		for(C in circs)
-			if(C.mode == CIRCULATOR_COLD && !cold_circ)
-				cold_circ = C
-				C.generator = src
-			else if(C.mode == CIRCULATOR_HOT && !hot_circ)
-				hot_circ = C
-				C.generator = src
-
-/obj/machinery/power/generator/wrench_act(mob/living/user, obj/item/I)
-	. = ..()
-	if(!panel_open)
-		return
-	set_anchored(!anchored)
-	I.play_tool_sound(src)
-	if(!anchored)
-		kill_circs()
-	connect_to_network()
-	to_chat(user, span_notice("You [anchored?"secure":"unsecure"] [src]."))
-	return TRUE
-
-/obj/machinery/power/generator/multitool_act(mob/living/user, obj/item/I)
-	. = ..()
-	if(!anchored)
-		return
-	find_circs()
-	to_chat(user, span_notice("You update [src]'s circulator links."))
-	return TRUE
-
-/obj/machinery/power/generator/screwdriver_act(mob/user, obj/item/I)
-	if(..())
-		return TRUE
-	toggle_panel_open()
-	I.play_tool_sound(src)
-	to_chat(user, span_notice("You [panel_open?"open":"close"] the panel on [src]."))
-	return TRUE
-
-/obj/machinery/power/generator/crowbar_act(mob/user, obj/item/I)
-	default_deconstruction_crowbar(I)
-	return TRUE
-
-/obj/machinery/power/generator/AltClick(mob/user)
-	return ..() // This hotkey is BLACKLISTED since it's used by /datum/component/simple_rotation
-
-/obj/machinery/power/generator/on_deconstruction()
-	kill_circs()
-
-/obj/machinery/power/generator/proc/kill_circs()
-	if(hot_circ)
-		hot_circ.generator = null
-		hot_circ = null
-	if(cold_circ)
-		cold_circ.generator = null
-		cold_circ = null
-
-#undef GENRATE
diff --git a/code/modules/power/thermoelectric_generator.dm b/code/modules/power/thermoelectric_generator.dm
new file mode 100644
index 000000000000..6b0fed607c23
--- /dev/null
+++ b/code/modules/power/thermoelectric_generator.dm
@@ -0,0 +1,222 @@
+#define TEG_EFFICIENCY 0.65
+
+/obj/machinery/power/thermoelectric_generator
+	name = "thermoelectric generator"
+	desc = "It's a high efficiency thermoelectric generator."
+	icon_state = "teg"
+	base_icon_state = "teg"
+	density = TRUE
+	use_power = NO_POWER_USE
+	circuit = /obj/item/circuitboard/machine/thermoelectric_generator
+
+	///The cold circulator machine, containing cold gas for the mix.
+	var/obj/machinery/atmospherics/components/binary/circulator/cold_circ
+	///The hot circulator machine, containing very hot gas for the mix.
+	var/obj/machinery/atmospherics/components/binary/circulator/hot_circ
+	///The amount of power the generator is currently producing.
+	var/lastgen = 0
+	///The amount of power the generator has last produced.
+	var/lastgenlev = -1
+	/**
+	 * Used in overlays for the TEG, basically;
+	 * one number is for the cold mix, one is for the hot mix
+	 * If the cold mix has pressure in it, then the first number is 1, else 0
+	 * If the hot mix has pressure in it, then the second number is 1, else 0
+	 * Neither has pressure: 00
+	 * Only cold has pressure: 10
+	 * Only hot has pressure: 01
+	 * Both has pressure: 11
+	 */
+	var/last_pressure_overlay = "00"
+
+/obj/machinery/power/thermoelectric_generator/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/simple_rotation)
+	find_circulators()
+	connect_to_network()
+	SSair.start_processing_machine(src)
+	update_appearance()
+
+/obj/machinery/power/thermoelectric_generator/Destroy()
+	null_circulators()
+	SSair.stop_processing_machine(src)
+	return ..()
+
+/obj/machinery/power/thermoelectric_generator/on_deconstruction()
+	null_circulators()
+
+/obj/machinery/power/thermoelectric_generator/update_overlays()
+	. = ..()
+	if(machine_stat & (NOPOWER|BROKEN))
+		return
+
+	var/level = min(round(lastgenlev / 100000), 11)
+	if(level)
+		. += mutable_appearance('icons/obj/power.dmi', "[base_icon_state]-op[level]")
+	if(hot_circ && cold_circ)
+		. += "[base_icon_state]-oc[last_pressure_overlay]"
+
+/obj/machinery/power/thermoelectric_generator/wrench_act(mob/living/user, obj/item/tool)
+	if(!panel_open)
+		balloon_alert(user, "open the panel!")
+		return
+	set_anchored(!anchored)
+	tool.play_tool_sound(src)
+	if(anchored)
+		connect_to_network()
+	else
+		null_circulators()
+	balloon_alert(user, "[anchored ? "secure" : "unsecure"]")
+	return TRUE
+
+/obj/machinery/power/thermoelectric_generator/multitool_act(mob/living/user, obj/item/tool)
+	. = ..()
+	if(!anchored)
+		return
+	find_circulators()
+	balloon_alert(user, "circulators updated")
+	return TRUE
+
+/obj/machinery/power/thermoelectric_generator/screwdriver_act(mob/user, obj/item/tool)
+	if(!anchored)
+		balloon_alert(user, "anchor it down!")
+		return
+	toggle_panel_open()
+	tool.play_tool_sound(src)
+	balloon_alert(user, "panel [panel_open ? "open" : "closed"]")
+	return TRUE
+
+/obj/machinery/power/thermoelectric_generator/crowbar_act(mob/living/user, obj/item/tool)
+	default_deconstruction_crowbar(tool)
+	return TRUE
+
+/obj/machinery/power/thermoelectric_generator/process()
+	//Setting this number higher just makes the change in power output slower, it doesnt actualy reduce power output cause **math**
+	var/power_output = round(lastgen / 10)
+	add_avail(power_output)
+	lastgenlev = power_output
+	lastgen -= power_output
+
+/obj/machinery/power/thermoelectric_generator/process_atmos()
+	if(!cold_circ || !hot_circ)
+		return
+	if(!powernet)
+		return
+
+	var/datum/gas_mixture/cold_air = cold_circ.return_transfer_air()
+	var/datum/gas_mixture/hot_air = hot_circ.return_transfer_air()
+	if(cold_air && hot_air)
+		var/cold_air_heat_capacity = cold_air.heat_capacity()
+		var/hot_air_heat_capacity = hot_air.heat_capacity()
+		var/delta_temperature = hot_air.temperature - cold_air.temperature
+		if(delta_temperature > 0 && cold_air_heat_capacity > 0 && hot_air_heat_capacity > 0)
+			var/efficiency = TEG_EFFICIENCY
+			var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity)
+			var/heat = energy_transfer*(1-efficiency)
+			lastgen += energy_transfer*efficiency
+			hot_air.temperature = hot_air.temperature - energy_transfer/hot_air_heat_capacity
+			cold_air.temperature = cold_air.temperature + heat/cold_air_heat_capacity
+
+	if(hot_air)
+		var/datum/gas_mixture/hot_circ_air1 = hot_circ.airs[1]
+		hot_circ_air1.merge(hot_air)
+
+	if(cold_air)
+		var/datum/gas_mixture/cold_circ_air1 = cold_circ.airs[1]
+		cold_circ_air1.merge(cold_air)
+
+	var/current_pressure = "[cold_circ?.last_pressure_delta > 0 ? "1" : "0"][hot_circ?.last_pressure_delta > 0 ? "1" : "0"]"
+	if(current_pressure != last_pressure_overlay)
+		//this requires an update to overlays.
+		last_pressure_overlay = current_pressure
+
+	update_appearance(UPDATE_ICON)
+
+/obj/machinery/power/thermoelectric_generator/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "ThermoElectricGenerator", name)
+		ui.open()
+
+/obj/machinery/power/thermoelectric_generator/ui_data(mob/user)
+	var/list/data = list()
+	data["error_message"] = null
+	if(!powernet)
+		data["error_message"] = "Unable to connect to the power network!"
+		return data
+	if(!cold_circ && !hot_circ)
+		data["error_message"] = "Unable to locate any parts! Multitool the machine to sync to nearby parts."
+		return data
+	if(!cold_circ)
+		data["error_message"] = "Unable to locate cold circulator!"
+		return data
+	if(!hot_circ)
+		data["error_message"] = "Unable to locate hot circulator!"
+		return data
+
+	var/datum/gas_mixture/cold_circ_air1 = cold_circ.airs[1]
+	var/datum/gas_mixture/cold_circ_air2 = cold_circ.airs[2]
+
+	var/datum/gas_mixture/hot_circ_air1 = hot_circ.airs[1]
+	var/datum/gas_mixture/hot_circ_air2 = hot_circ.airs[2]
+
+	data["last_power_output"] = display_power(lastgenlev)
+
+	var/list/cold_data = list()
+	cold_data["temperature_inlet"] = round(cold_circ_air2.temperature, 0.1)
+	cold_data["temperature_outlet"] = round(cold_circ_air1.temperature, 0.1)
+	cold_data["pressure_inlet"] = round(cold_circ_air2.return_pressure(), 0.1)
+	cold_data["pressure_outlet"] = round(cold_circ_air1.return_pressure(), 0.1)
+	data["cold_data"] = list(cold_data)
+
+	var/list/hot_data = list()
+	hot_data["temperature_inlet"] = round(hot_circ_air2.temperature, 0.1)
+	hot_data["temperature_outlet"] = round(hot_circ_air1.temperature, 0.1)
+	hot_data["pressure_inlet"] = round(hot_circ_air2.return_pressure(), 0.1)
+	hot_data["pressure_outlet"] = round(hot_circ_air1.return_pressure(), 0.1)
+	data["hot_data"] = list(hot_data)
+
+	return data
+
+///Finds and connects nearby valid circulators to the machine, nulling out previous ones.
+/obj/machinery/power/thermoelectric_generator/proc/find_circulators()
+	null_circulators()
+	var/list/valid_circulators = list()
+
+	if(dir & (NORTH|SOUTH))
+		var/obj/machinery/atmospherics/components/binary/circulator/east_circulator = locate() in get_step(src, EAST)
+		if(east_circulator && east_circulator.dir == WEST)
+			valid_circulators += east_circulator
+		var/obj/machinery/atmospherics/components/binary/circulator/west_circulator = locate() in get_step(src, WEST)
+		if(west_circulator && west_circulator.dir == EAST)
+			valid_circulators += west_circulator
+	else
+		var/obj/machinery/atmospherics/components/binary/circulator/north_circulator = locate() in get_step(src, NORTH)
+		if(north_circulator && north_circulator.dir == SOUTH)
+			valid_circulators += north_circulator
+		var/obj/machinery/atmospherics/components/binary/circulator/south_circulator = locate() in get_step(src, SOUTH)
+		if(south_circulator && south_circulator.dir == NORTH)
+			valid_circulators += south_circulator
+
+	if(!valid_circulators.len)
+		return
+
+	for(var/obj/machinery/atmospherics/components/binary/circulator/circulators as anything in valid_circulators)
+		if(circulators.mode == CIRCULATOR_COLD && !cold_circ)
+			cold_circ = circulators
+			circulators.generator = src
+			continue
+		if(circulators.mode == CIRCULATOR_HOT && !hot_circ)
+			hot_circ = circulators
+			circulators.generator = src
+
+///Removes hot and cold circulators from the generator, nulling them.
+/obj/machinery/power/thermoelectric_generator/proc/null_circulators()
+	if(hot_circ)
+		hot_circ.generator = null
+		hot_circ = null
+	if(cold_circ)
+		cold_circ.generator = null
+		cold_circ = null
+
+#undef TEG_EFFICIENCY
diff --git a/code/modules/research/ordnance/tank_compressor.dm b/code/modules/research/ordnance/tank_compressor.dm
index 44d1505b0865..52cadfa08e20 100644
--- a/code/modules/research/ordnance/tank_compressor.dm
+++ b/code/modules/research/ordnance/tank_compressor.dm
@@ -85,9 +85,6 @@
 	update_appearance()
 	return TRUE
 
-/obj/machinery/atmospherics/components/binary/circulator/get_node_connects()
-	return list(turn(dir, 180), dir) // airs[2] is input which is facing dir, airs[1] is output which is facing the other side of dir
-
 /obj/machinery/atmospherics/components/binary/tank_compressor/screwdriver_act(mob/living/user, obj/item/tool)
 	if(active || inserted_tank)
 		return FALSE
diff --git a/tgstation.dme b/tgstation.dme
index c81bd82abf6d..6eca3c3f05b4 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4817,7 +4817,6 @@
 #include "code\modules\power\cell.dm"
 #include "code\modules\power\energy_accumulator.dm"
 #include "code\modules\power\floodlight.dm"
-#include "code\modules\power\generator.dm"
 #include "code\modules\power\gravitygenerator.dm"
 #include "code\modules\power\monitor.dm"
 #include "code\modules\power\multiz.dm"
@@ -4829,6 +4828,7 @@
 #include "code\modules\power\smes.dm"
 #include "code\modules\power\solar.dm"
 #include "code\modules\power\terminal.dm"
+#include "code\modules\power\thermoelectric_generator.dm"
 #include "code\modules\power\tracker.dm"
 #include "code\modules\power\apc\apc_appearance.dm"
 #include "code\modules\power\apc\apc_attack.dm"
diff --git a/tgui/packages/tgui/interfaces/ThermoElectricGenerator.tsx b/tgui/packages/tgui/interfaces/ThermoElectricGenerator.tsx
new file mode 100644
index 000000000000..ae55eb81fd84
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/ThermoElectricGenerator.tsx
@@ -0,0 +1,80 @@
+import { useBackend } from '../backend';
+import { Box, Divider, Section } from '../components';
+import { Window } from '../layouts';
+
+type Data = {
+  error_message: string | null;
+  last_power_output: string | null;
+  cold_data: CirculatorData[];
+  hot_data: CirculatorData[];
+};
+
+type CirculatorData = {
+  temperature_inlet: number | null;
+  temperature_outlet: number | null;
+  pressure_inlet: number | null;
+  pressure_outlet: number | null;
+};
+
+export const ThermoElectricGenerator = (props, context) => {
+  const { act, data } = useBackend<Data>(context);
+  const {
+    error_message,
+    last_power_output,
+    cold_data = [],
+    hot_data = [],
+  } = data;
+  if (error_message) {
+    return (
+      <Window width={320} height={100}>
+        <Window.Content>
+          <Section>ERROR: {error_message}</Section>
+        </Window.Content>
+      </Window>
+    );
+  }
+  return (
+    <Window width={350} height={195}>
+      <Window.Content>
+        <Section>
+          <Box>
+            <Box>Last Output: {last_power_output}</Box>
+            <Divider />
+            <Box m={1} textColor="cyan" bold>
+              Cold Loop
+            </Box>
+            {cold_data.map((data, index) => (
+              <Box key={index}>
+                <Box>
+                  Temperature Inlet: {data.temperature_inlet} K / Outlet:{' '}
+                  {data.temperature_outlet} K
+                </Box>
+                <Box>
+                  Pressure Inlet: {data.pressure_inlet} kPa / Outlet:{' '}
+                  {data.pressure_outlet} kPa
+                </Box>
+              </Box>
+            ))}
+          </Box>
+          <Box>
+            <Box m={1} textColor="red" bold>
+              Hot loop{' '}
+            </Box>
+            {hot_data.map((data, index) => (
+              <Box key={index}>
+                <Box>
+                  Temperature Inlet: {data.temperature_inlet} K / Outlet:{' '}
+                  {data.temperature_outlet} K
+                </Box>
+                <Box>
+                  Pressure Inlet: {data.pressure_inlet} kPa / Outlet:{' '}
+                  {data.pressure_outlet} kPa
+                </Box>
+              </Box>
+            ))}
+          </Box>
+        </Section>
+      </Window.Content>
+    </Window>
+  );
+};

From bba8f21d43af8238ad89e25e941fb3389411b248 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 17:55:17 +0000
Subject: [PATCH 02/11] Automatic changelog for PR #1521 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1521.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1521.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1521.yml b/html/changelogs/AutoChangeLog-pr-1521.yml
new file mode 100644
index 000000000000..ed1414093f08
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1521.yml
@@ -0,0 +1,6 @@
+author: "JohnFulpWillard"
+delete-after: True
+changes:
+  - bugfix: "The TEG now works again (still unobtainable by regular means though)."
+  - bugfix: "the TEG and its circulators can now be rotated counterclockwise again."
+  - refactor: "The TEG now uses a TGUI interface rather than the old HTML one."
\ No newline at end of file

From 4bb2beef683aa7d454eaa12963e4165039b42e05 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Tue, 2 Apr 2024 01:15:07 +0000
Subject: [PATCH 03/11] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1521.yml |  6 ------
 html/changelogs/AutoChangeLog-pr-1551.yml | 10 ----------
 html/changelogs/AutoChangeLog-pr-1552.yml |  4 ----
 html/changelogs/archive/2024-04.yml       | 18 ++++++++++++++++++
 4 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-1521.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-1551.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-1552.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1521.yml b/html/changelogs/AutoChangeLog-pr-1521.yml
deleted file mode 100644
index ed1414093f08..000000000000
--- a/html/changelogs/AutoChangeLog-pr-1521.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "JohnFulpWillard"
-delete-after: True
-changes:
-  - bugfix: "The TEG now works again (still unobtainable by regular means though)."
-  - bugfix: "the TEG and its circulators can now be rotated counterclockwise again."
-  - refactor: "The TEG now uses a TGUI interface rather than the old HTML one."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-1551.yml b/html/changelogs/AutoChangeLog-pr-1551.yml
deleted file mode 100644
index 8f0937919b33..000000000000
--- a/html/changelogs/AutoChangeLog-pr-1551.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "Absolucy"
-delete-after: True
-changes:
-  - bugfix: "(JohnFulpWillard) Time on servers hosted outside of the UK should now properly have their timezone offset."
-  - bugfix: "(FlufflesTheDog) Certain areas are now properly protected against grid check. Namely the supermatter should consistently be protected."
-  - bugfix: "(Ghommie) Fixes the sparring contract. You can now spar with no stakes and just for fun."
-  - bugfix: "(ChungusGamer666) Exotic blood types no longer persist through species change if the new species does not have an exotic blood type."
-  - bugfix: "(mc-oofert) You are now made a ghost faster if you get gibbed."
-  - bugfix: "(AnturK) Fixes bioscramble picking the (unimplemented) base wing type."
-  - bugfix: "(AnturK) Fixes setting prebuilt shutter ids with the multitool."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-1552.yml b/html/changelogs/AutoChangeLog-pr-1552.yml
deleted file mode 100644
index 94f301a76524..000000000000
--- a/html/changelogs/AutoChangeLog-pr-1552.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Absolucy"
-delete-after: True
-changes:
-  - bugfix: "Fixed revolutionaries winning resulting in ATTENTION [x ∞]"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml
index c7b2cc8d9f46..7e7e64a7c947 100644
--- a/html/changelogs/archive/2024-04.yml
+++ b/html/changelogs/archive/2024-04.yml
@@ -30,3 +30,21 @@
   - bugfix: added combat mode/harm intent support for the previous pr
   - balance: Blind people don't get alerted when someone in a cardboard box pops out
       nearby
+2024-04-02:
+  Absolucy:
+  - bugfix: (JohnFulpWillard) Time on servers hosted outside of the UK should now
+      properly have their timezone offset.
+  - bugfix: (FlufflesTheDog) Certain areas are now properly protected against grid
+      check. Namely the supermatter should consistently be protected.
+  - bugfix: (Ghommie) Fixes the sparring contract. You can now spar with no stakes
+      and just for fun.
+  - bugfix: (ChungusGamer666) Exotic blood types no longer persist through species
+      change if the new species does not have an exotic blood type.
+  - bugfix: (mc-oofert) You are now made a ghost faster if you get gibbed.
+  - bugfix: (AnturK) Fixes bioscramble picking the (unimplemented) base wing type.
+  - bugfix: (AnturK) Fixes setting prebuilt shutter ids with the multitool.
+  - bugfix: "Fixed revolutionaries winning resulting in ATTENTION [x \u221E]"
+  JohnFulpWillard:
+  - bugfix: The TEG now works again (still unobtainable by regular means though).
+  - bugfix: the TEG and its circulators can now be rotated counterclockwise again.
+  - refactor: The TEG now uses a TGUI interface rather than the old HTML one.

From d96cd1c0fde549d2c3051cac96fddec2bef47918 Mon Sep 17 00:00:00 2001
From: Tractor Mann <69653259+Noot-Toot@users.noreply.github.com>
Date: Tue, 2 Apr 2024 03:12:14 +0000
Subject: [PATCH 04/11] Refactor Jukebox Beacons (#1548)

* Refactor Jukebox Beacons

Yeah so my last implementation... it was bad. This version entirely foregoes frankensteining code from everywhere and is just a slight modification of Roulette Beacon code. which is MUCH nicer. I also gave it its own custom icon!

* Further Destinkification

2/3 of the requested changes were also originated from roulette beacon code, so that should probably get a quick refactor too someday.

* return
---
 .../crates_lockers/closets/secure/bar.dm      |   2 +-
 .../code/game/objects/items/choice_beacon.dm  |  10 --------
 .../code/game/objects/items/jukebox_beacon.dm |  23 ++++++++++++++++++
 .../code/modules/cargo/crates/service.dm      |   2 +-
 monkestation/icons/obj/items_and_weapons.dmi  | Bin 5669 -> 6026 bytes
 tgstation.dme                                 |   1 +
 6 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 monkestation/code/game/objects/items/jukebox_beacon.dm

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index 8aa23966eb08..f2b700ec622d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -18,4 +18,4 @@
 	new /obj/item/roulette_wheel_beacon(src)
 	new /obj/item/storage/fancy/candle_box(src)
 	new /obj/item/storage/fancy/candle_box(src)
-	new /obj/item/choice_beacon/jukebox(src) //this line is a monkestation edit!
+	new /obj/item/jukebox_beacon(src) //monkestation edit
diff --git a/monkestation/code/game/objects/items/choice_beacon.dm b/monkestation/code/game/objects/items/choice_beacon.dm
index fe00d08e0b2c..b6ce1e948893 100644
--- a/monkestation/code/game/objects/items/choice_beacon.dm
+++ b/monkestation/code/game/objects/items/choice_beacon.dm
@@ -92,13 +92,3 @@
 		return
 
 	to_chat(user, span_notice("[uses] use[uses > 1 ? "s" : ""] remain[uses > 1 ? "" : "s"] on [src]."))
-
-/obj/item/choice_beacon/jukebox //this is probably a terrible way to do this, but its the first that worked.
-	name = "jukebox beacon"
-	desc = "Deploys a jukebox! Also comes wrenched down to the floor for you on delivery! How convenient!"
-/obj/item/choice_beacon/jukebox/interact(mob/user)
-	to_chat(user, span_hear("You hear a crackle before a message plays through [src]: \"Thank you for picking Dave's Instant Jukebox Shipping! This beacon will now self destruct.\""))
-	new /obj/machinery/media/jukebox(get_turf(user))
-	playsound(src, 'sound/weapons/emitter2.ogg', 50, extrarange = SILENCED_SOUND_EXTRARANGE)
-	do_sparks(3, source = src)
-	qdel(src)
diff --git a/monkestation/code/game/objects/items/jukebox_beacon.dm b/monkestation/code/game/objects/items/jukebox_beacon.dm
new file mode 100644
index 000000000000..de9650818f58
--- /dev/null
+++ b/monkestation/code/game/objects/items/jukebox_beacon.dm
@@ -0,0 +1,23 @@
+/obj/item/jukebox_beacon
+	name = "jukebox beacon"
+	desc = "N.T. jukebox beacon, toss it down and you will have a complementary jukebox delivered to you. It comes with a free wrench to move it after deployment."
+	icon = 'monkestation/icons/obj/items_and_weapons.dmi'
+	icon_state = "music_beacon"
+	var/used = FALSE
+
+/obj/item/jukebox_beacon/attack_self()
+	if(used)
+		return
+	loc.visible_message(span_warning("\The [src] begins to beep loudly!"))
+	used = TRUE
+	addtimer(CALLBACK(src, PROC_REF(launch_payload)), 4 SECONDS)
+
+/obj/item/jukebox_beacon/proc/launch_payload()
+	if(QDELETED(src))
+		return
+	podspawn(list(
+		"target" = get_turf(src),
+		"spawn" = list(/obj/item/wrench, /obj/machinery/media/jukebox),
+		"style" = STYLE_CENTCOM
+	))
+	qdel(src)
diff --git a/monkestation/code/modules/cargo/crates/service.dm b/monkestation/code/modules/cargo/crates/service.dm
index 0dc8a9492410..66077f9c5147 100644
--- a/monkestation/code/modules/cargo/crates/service.dm
+++ b/monkestation/code/modules/cargo/crates/service.dm
@@ -33,7 +33,7 @@
 	name = "Jukebox Beacon Crate"
 	desc = "Last one stolen? Broken? Burnt down in an insurance scam? then this crate is for you. Contains one Jukebox Beacon."
 	cost = CARGO_CRATE_VALUE * 20 //the crew shouldnt be able to just buy 15 jukeboxes all playing among us at the same time
-	contains = list(/obj/item/choice_beacon/jukebox)
+	contains = list(/obj/item/jukebox_beacon)
 	crate_name = "jukebox beacon crate"
 
 /datum/supply_pack/service/cassettes
diff --git a/monkestation/icons/obj/items_and_weapons.dmi b/monkestation/icons/obj/items_and_weapons.dmi
index 919998aba182e0c904f550e87067373f1c963de9..549e16e92b1594bb95a36b10a14cfd739fb1d5b8 100644
GIT binary patch
literal 6026
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
z%0D~v;;Ax&*E&?&)82fgP8j9BIoyA0T-=}{ir0HSNlf*MKo3KGO;eFJmlxCf5{I3y
zrUGDUX7<Hjld%vc-QL)_v;9_i@SkxGOjyTQ#s^}_bmIcv<atwy;q;e*L?j#$O1PZf
z_wF6(`BrkX@|0_W8LQ*k+S=pWYSiQ!^dW<W|K+$11x$xJLo~m<FM2Y>7gbe#&io#S
z_F990?cDKRhBxFW_Pu;!Q2^L>H2VKTMuh3+^VDgWhv<>t*n!R+1C1&*hp7JpDW-;f

literal 5669
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
O0$S?&YE>%sQU3=w@AF>(

diff --git a/tgstation.dme b/tgstation.dme
index 6eca3c3f05b4..7eb25b22df2c 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5741,6 +5741,7 @@
 #include "monkestation\code\game\objects\items\choice_beacon.dm"
 #include "monkestation\code\game\objects\items\cirno_plush.dm"
 #include "monkestation\code\game\objects\items\gravity_gun.dm"
+#include "monkestation\code\game\objects\items\jukebox_beacon.dm"
 #include "monkestation\code\game\objects\items\miningweapons.dm"
 #include "monkestation\code\game\objects\items\mothlet_grenade.dm"
 #include "monkestation\code\game\objects\items\plushies.dm"

From 031fa63470f26c9811a3e4788edf5d6d4e838213 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 03:12:34 +0000
Subject: [PATCH 05/11] Automatic changelog for PR #1548 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1548.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1548.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1548.yml b/html/changelogs/AutoChangeLog-pr-1548.yml
new file mode 100644
index 000000000000..1593e2c819d8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1548.yml
@@ -0,0 +1,4 @@
+author: "Tractor Mann"
+delete-after: True
+changes:
+  - refactor: "Jukebox Beacon Code has been refactored, changes to note is that jukeboxes no longer deploy instantly and now come with a wrench."
\ No newline at end of file

From 73f06c203c8873bd7885b99e6f8691506fe947d7 Mon Sep 17 00:00:00 2001
From: MilkForever <kardolivero10@gmail.com>
Date: Tue, 2 Apr 2024 19:29:18 -0400
Subject: [PATCH 06/11] Waffles's Personal Modsuit (#1520)

* Waffles' modsuit

Adds an admin only modsuit to the game.

* I hate byond

Hopefully this fixes linters
---
 monkestation/code/modules/mod/mod_control.dm  |  63 ++++++++++++++++++
 monkestation/code/modules/mod/mod_types.dm    |  17 +++++
 .../icons/mob/clothing/worn_modsuit.dmi       | Bin 1829 -> 3506 bytes
 .../icons/obj/clothing/modsuits/modsuit.dmi   | Bin 1230 -> 2144 bytes
 tgstation.dme                                 |   2 +
 5 files changed, 82 insertions(+)
 create mode 100644 monkestation/code/modules/mod/mod_types.dm

diff --git a/monkestation/code/modules/mod/mod_control.dm b/monkestation/code/modules/mod/mod_control.dm
index e69de29bb2d1..4f686fcb552a 100644
--- a/monkestation/code/modules/mod/mod_control.dm
+++ b/monkestation/code/modules/mod/mod_control.dm
@@ -0,0 +1,63 @@
+/datum/mod_theme/waffles
+	name = "Waffles' corporate"
+	desc = "A heavily modified suit created by Waffles to distinguish himself from other CentCom Officers. If you are not Waffles you shouldn't be wearing this!"
+	default_skin = "waffles"
+	resistance_flags = INDESTRUCTIBLE|LAVA_PROOF|FIRE_PROOF|UNACIDABLE|ACID_PROOF
+	atom_flags = PREVENT_CONTENTS_EXPLOSION_1
+	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+	complexity_max = 50
+	armor_type= /datum/armor/mod_theme_waffles
+	charge_drain = DEFAULT_CHARGE_DRAIN * 0
+	siemens_coefficient = 0
+	slowdown_inactive = 0
+	slowdown_active = 0
+	ui_theme = "wizard"
+	inbuilt_modules = list(/obj/item/mod/module/anti_magic/wizard)
+	allowed_suit_storage = list(
+		/obj/item/ammo_box,
+		/obj/item/ammo_casing,
+		/obj/item/restraints/handcuffs,
+		/obj/item/assembly/flash,
+		/obj/item/melee/baton,
+		/obj/item/gun,
+	)
+	skins = list(
+		"waffles" = list(
+			MOD_ICON_OVERRIDE = 'monkestation/icons/obj/clothing/modsuits/modsuit.dmi',
+			MOD_WORN_ICON_OVERRIDE = 'monkestation/icons/mob/clothing/worn_modsuit.dmi',
+			HELMET_FLAGS = list(
+				UNSEALED_LAYER = NECK_LAYER,
+				UNSEALED_CLOTHING = SNUG_FIT,
+				SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|HEADINTERNALS,
+				UNSEALED_INVISIBILITY = HIDEFACIALHAIR,
+				SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+				SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+			),
+			CHESTPLATE_FLAGS = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+				SEALED_INVISIBILITY = HIDEJUMPSUIT,
+			),
+			GAUNTLETS_FLAGS = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+				CAN_OVERSLOT = TRUE,
+			),
+			BOOTS_FLAGS = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+				CAN_OVERSLOT = TRUE,
+			),
+		),
+	)
+
+/datum/armor/mod_theme_waffles
+	melee = 50
+	bullet = 60
+	laser = 50
+	energy = 50
+	bomb = 100
+	bio = 100
+	fire = 100
+	acid = 100
+	wound = 30
diff --git a/monkestation/code/modules/mod/mod_types.dm b/monkestation/code/modules/mod/mod_types.dm
new file mode 100644
index 000000000000..fbe768321cab
--- /dev/null
+++ b/monkestation/code/modules/mod/mod_types.dm
@@ -0,0 +1,17 @@
+/obj/item/mod/control/pre_equipped/waffles
+	theme = /datum/mod_theme/waffles
+	applied_core = /obj/item/mod/core/infinite
+	applied_modules = list(
+		/obj/item/mod/module/storage/bluespace,
+		/obj/item/mod/module/emp_shield/advanced,
+		/obj/item/mod/module/welding,
+		/obj/item/mod/module/stealth/ninja,
+		/obj/item/mod/module/magnetic_harness,
+		/obj/item/mod/module/jetpack/advanced,
+		/obj/item/mod/module/noslip,
+		/obj/item/mod/module/dna_lock/reinforced,
+	)
+	default_pins = list(
+		/obj/item/mod/module/stealth/ninja,
+		/obj/item/mod/module/jetpack/advanced,
+	)
diff --git a/monkestation/icons/mob/clothing/worn_modsuit.dmi b/monkestation/icons/mob/clothing/worn_modsuit.dmi
index 5bb12b10c05eed0fb2704ef1da23401bed1c9829..900e2c30e61e52e73a469c366c3824a7b8b1847e 100644
GIT binary patch
literal 3506
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

literal 1829
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
T$fNd&00000NkvXXu0mjfx=f9B

diff --git a/monkestation/icons/obj/clothing/modsuits/modsuit.dmi b/monkestation/icons/obj/clothing/modsuits/modsuit.dmi
index eaa4f7a83278e2ec9833c2fc4fab9f68438b9ce8..3d550c1034cd51352903ad544c8deac142cbe83e 100644
GIT binary patch
literal 2144
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
WeStp=k~eh#0000<MNUMnLSTYL-3kx@

literal 1230
zcmV;<1Tp)GP)<h;3K|Lk000e1NJLTq004jh004jp0{{R3^x%>C0000sP)t-sz`(!_
z3>h9CGBh+ojvyZLZf?LlI@Wmr@QMKRohKY3D=RcWR8(O&KvFa`Oc@z6dU}<>z`*p@
z&awai00DGTPE!Ct=GbNc006yuR9JLGWpiV4X>fFDZ*Bkpc$}S*%MOAt5JlJRS2VB{
z<Abdm12HV*A8HwClhT@Y)cE(7n&<{eN@jECaqitr&W`n|X<2n{=mVTr*02LB*BeTn
zszVu?{f-g|s+ag_JaU8}Ghq!nF3`FnN~;SGTtk;p(kbV|&6bj@;{%Mk3{%kjHI7%Y
z=B%bYrV$Bx0Gth<15*eg!Q)Mb#e%pWoI>^dZcqdI1&Loa1-e+fC@gaSfSlEB72oU)
z=}p2IL6bc3000AhNkl<Zc%1E8i*n;23`F1u!ESp0|FtIx;`o8U=MM4BowgI)W<grZ
zV0)PwqfjUmD*(LPJ9xX`Cf?BxH`yMo`Pczb4A7A04va#8mb?KAw(I*257}wL{4g}*
zxx>(PLn%OC;cMfO?_~i1BLx^Czfg$pD|~G{36OYFI3kH3@eG>sG)cU-^bsdfQ{F@_
z_PT>NqxbPf;r)0Aj~%ST`2na=2+)@2WdfEPaT&Gbd7UKO!{7fnzF&Ysp-?Ckit}jn
zM6EurM>3aVGXXXKZmcJ7>FqTE4-Wwk0h|-U*Ze!Y1i%#m{^9KuLYOFrETG`u>3up1
za97@{JlZk}@97{4DEarF32->brUD8VfnM0%JUijN9o%f^2Lcc7f&g*^GvYz!Kol@L
zOd|-u3M2v93ar1&@c0$*6&_K&?B7X%;NRnL7u%eG_l3*ye1?=m@<lcOjtPcg=zDA~
z3JAaxoEKvb75|P2x`EMM6)>@YNfc1?_ent~Z$RvRIV7NUC@sRef2RU=2&$sQr~LV=
z>}=pUAlwMg_;*L^NQz(Oo&B1^Bnvp<-}z1=&f*$x;mZd5<-IumgnuuwH6Es5jSbUv
zd;UY<lL+rY*xn@oixW&JmasKIx(h253WY+U_&ZSb??&{sC;7Pf0I@x=RsT+=7E=_`
zmwCg^(*d^`1r`4eF!MXN^iosfSpXvT%f7p={QH3$NAFyWPu&h3YJ3zBU)s6NB{7SC
zKj!xc8pz@2q1z4L@z3vU5#qIn*k%PR{{1i#ET!<YONROT!OiOcJO26Wx#iDSAn)HT
z_qQA$PZ0A{t>4{tJm%l>c>$SuCir*yic=)t)(yOk<CaRnmj8b4`11nt{+;6k4W%5w
z8tKpXT&wXf0XAmlU6z~x$-gi0>7*c?optZo4gwF`=&#wAjz<BKe^2pEtSXD#Wgt%v
zX=7l;Z}P|b$DKfS;W+_<e~<A~0-JXHVB^F2g!r@;ev^V%_#7AdED0$1_m^!=3CuCW
zs$P+YV*%W&0MdP+>fe_HRA}j+aZ)jMC$|v*`3jii-;4QEf<JY+c8$t5heDxHC=?3C
zjVSx~59BZV_fH5Y`}g(&YVNhUfSP}AF5vbG)a>)WFQDe%Tc@x3_qO@B{{7=qaPQwg
so&Vt9Zx(RFO<?EWKb~KqQ2fXE4Quut=l^3{Hvj+t07*qoM6N<$f_=?V8vp<R

diff --git a/tgstation.dme b/tgstation.dme
index 7eb25b22df2c..9808b909b6b2 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6457,6 +6457,8 @@
 #include "monkestation\code\modules\mob\living\simple_animal\megafauna\wendigo.dm"
 #include "monkestation\code\modules\mob\living\simple_animal\pets\bees.dm"
 #include "monkestation\code\modules\mob\living\simple_animal\pets\honk_platinum.dm"
+#include "monkestation\code\modules\mod\mod_control.dm"
+#include "monkestation\code\modules\mod\mod_types.dm"
 #include "monkestation\code\modules\modular_bartending\modglass.dm"
 #include "monkestation\code\modules\modular_bartending\garnishes\crafting_recipes.dm"
 #include "monkestation\code\modules\modular_bartending\garnishes\garnish_items.dm"

From fcd7b1b99c079f573ddb2dcaeac185a9b86356f7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 23:29:37 +0000
Subject: [PATCH 07/11] Automatic changelog for PR #1520 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1520.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1520.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1520.yml b/html/changelogs/AutoChangeLog-pr-1520.yml
new file mode 100644
index 000000000000..fd021f08c7e0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1520.yml
@@ -0,0 +1,4 @@
+author: "MilkForever"
+delete-after: True
+changes:
+  - rscadd: "Added the admin-only Waffles corporate MODsuit."
\ No newline at end of file

From fd2f8c7c82793e5dc46500c4b08ec36cedcaf0de Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Wed, 3 Apr 2024 01:11:19 +0000
Subject: [PATCH 08/11] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1520.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-1548.yml | 4 ----
 html/changelogs/archive/2024-04.yml       | 6 ++++++
 3 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-1520.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-1548.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1520.yml b/html/changelogs/AutoChangeLog-pr-1520.yml
deleted file mode 100644
index fd021f08c7e0..000000000000
--- a/html/changelogs/AutoChangeLog-pr-1520.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MilkForever"
-delete-after: True
-changes:
-  - rscadd: "Added the admin-only Waffles corporate MODsuit."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-1548.yml b/html/changelogs/AutoChangeLog-pr-1548.yml
deleted file mode 100644
index 1593e2c819d8..000000000000
--- a/html/changelogs/AutoChangeLog-pr-1548.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tractor Mann"
-delete-after: True
-changes:
-  - refactor: "Jukebox Beacon Code has been refactored, changes to note is that jukeboxes no longer deploy instantly and now come with a wrench."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml
index 7e7e64a7c947..f8e2e70a91bb 100644
--- a/html/changelogs/archive/2024-04.yml
+++ b/html/changelogs/archive/2024-04.yml
@@ -48,3 +48,9 @@
   - bugfix: The TEG now works again (still unobtainable by regular means though).
   - bugfix: the TEG and its circulators can now be rotated counterclockwise again.
   - refactor: The TEG now uses a TGUI interface rather than the old HTML one.
+2024-04-03:
+  MilkForever:
+  - rscadd: Added the admin-only Waffles corporate MODsuit.
+  Tractor Mann:
+  - refactor: Jukebox Beacon Code has been refactored, changes to note is that jukeboxes
+      no longer deploy instantly and now come with a wrench.

From 708edfe895347c8aa1a00889180d8e12e1bb8c15 Mon Sep 17 00:00:00 2001
From: Lucy <lucy@absolucy.moe>
Date: Wed, 3 Apr 2024 00:03:26 -0400
Subject: [PATCH 09/11] Revert "Levelup ability for Bloodsuckers (#1469)"
 (#1567)

This reverts commit fd82acb7d4aa48e1d84da116ea5053199ec3dcc2.
---
 .../bloodsuckers/powers/force_level.dm        | 43 -------------------
 tgstation.dme                                 |  1 -
 2 files changed, 44 deletions(-)
 delete mode 100644 monkestation/code/modules/bloodsuckers/powers/force_level.dm

diff --git a/monkestation/code/modules/bloodsuckers/powers/force_level.dm b/monkestation/code/modules/bloodsuckers/powers/force_level.dm
deleted file mode 100644
index b896ed2d5917..000000000000
--- a/monkestation/code/modules/bloodsuckers/powers/force_level.dm
+++ /dev/null
@@ -1,43 +0,0 @@
-/* PROC TO MANAGE LEVELLING UP THIS WAY */
-/datum/antagonist/bloodsucker/proc/ForcedRankUp() //I hate this.
-	set waitfor = FALSE
-	if(!owner || !owner.current)
-		return
-	bloodsucker_level_unspent ++
-	// Spend Rank Immediately?
-	if(istype(owner.current.loc, /obj/structure/closet/crate/coffin)) //Hacky workaround.
-		SpendRank()
-	else
-		to_chat(owner, span_notice("You have forced your powers to further through the power of blood; Sleep within your lair to claim your boon."))
-		if(bloodsucker_level_unspent >= 2)
-			to_chat(owner, span_notice("Bloodsucker Tip: If you cannot find or steal a coffin to use, you can build one from wooden planks."))
-
-/datum/action/cooldown/bloodsucker/levelup
-	name = "Forced Evolution"
-	desc = "Spend the lovely sanguine running through your veins; aging you at an accelerated rate."
-	button_icon_state = "power_feed"
-	var/total_uses = 1
-	bloodcost = 50
-	cooldown_time = 50
-	power_flags = BP_AM_STATIC_COOLDOWN
-	check_flags = BP_CANT_USE_WHILE_STAKED|BP_CANT_USE_WHILE_INCAPACITATED|BP_CANT_USE_WHILE_UNCONSCIOUS
-	purchase_flags = BLOODSUCKER_CAN_BUY|BLOODSUCKER_DEFAULT_POWER
-
-/datum/action/cooldown/bloodsucker/levelup/ActivatePower()
-	if(total_uses >= 10)
-		to_chat(owner, span_bolddanger("The power of blood simply isn't enough to advance further... Age must suffice, from now on."))
-		return
-	var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(/datum/antagonist/bloodsucker)
-	if(istype(bloodsuckerdatum))
-		bloodsuckerdatum.ForcedRankUp()	// Rank up! Must still be in a coffin to level!
-	total_uses++
-	bloodcost = total_uses * 20 //By default, it's 50 blood, then 100, etc etc.
-	if(total_uses == 4)
-		to_chat(owner, span_revenbignotice("With the next use; you can't help but feel your true nature will become visible to all that gaze upon your visage! OOC: This will costitute a breach of the Masquerade and show you're a vampire!"))
-	if(total_uses == 5) //you're fucked.
-		bloodsuckerdatum.owner.current.remove_traits(TRAIT_DISFIGURED, BLOODSUCKER_TRAIT) //Disfigures them.
-		bloodsuckerdatum.break_masquerade() //Killing people to get this far should break the masquerade.
-		to_chat(owner, span_danger("You've broken the Masquerade, and revealed yourself for the blood-theiving, murdering parasite you are! Vampires and Crew will attempt to hunt you... But isn't that what you want? Fresh blood for your fangs..."))
-		for(var/datum/action/cooldown/bloodsucker/power as anything in bloodsuckerdatum.powers)
-			if(istype(power, /datum/action/cooldown/bloodsucker/masquerade) || istype(power, /datum/action/cooldown/bloodsucker/veil))
-				bloodsuckerdatum.RemovePower(power)
diff --git a/tgstation.dme b/tgstation.dme
index 9808b909b6b2..10096cbb5b28 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6053,7 +6053,6 @@
 #include "monkestation\code\modules\bloodsuckers\powers\_base_power.dm"
 #include "monkestation\code\modules\bloodsuckers\powers\cloak.dm"
 #include "monkestation\code\modules\bloodsuckers\powers\feed.dm"
-#include "monkestation\code\modules\bloodsuckers\powers\force_level.dm"
 #include "monkestation\code\modules\bloodsuckers\powers\fortitude.dm"
 #include "monkestation\code\modules\bloodsuckers\powers\go_home.dm"
 #include "monkestation\code\modules\bloodsuckers\powers\masquerade.dm"

From 4131716646dd82b51b9d838372791f0509064fbf Mon Sep 17 00:00:00 2001
From: Lucy <lucy@absolucy.moe>
Date: Wed, 3 Apr 2024 18:51:37 -0400
Subject: [PATCH 10/11] Allow airlock helpers to work with windoors (#1568)

* Allow airlock helpers to work with windoors

* fix that

* whoops
---
 .../RandomBars/Tram/tram_bar_beachside.dmm    | 11 +++-----
 code/modules/mapping/mapping_helpers.dm       |  2 ++
 .../code/modules/mapping/access_helpers.dm    | 15 +++++++++++
 .../code/modules/mapping/mapping_helpers.dm   | 27 +++++++++++++++++++
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/_maps/~monkestation/RandomBars/Tram/tram_bar_beachside.dmm b/_maps/~monkestation/RandomBars/Tram/tram_bar_beachside.dmm
index 65031b8a08fa..041c608df6f3 100644
--- a/_maps/~monkestation/RandomBars/Tram/tram_bar_beachside.dmm
+++ b/_maps/~monkestation/RandomBars/Tram/tram_bar_beachside.dmm
@@ -426,8 +426,7 @@
 "nN" = (
 /obj/structure/ladder,
 /obj/machinery/door/window/left/directional/north{
-	name = "Bar Backroom Access";
-	req_one_access = list("bar")
+	name = "Bar Backroom Access"
 	},
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/structure/window/reinforced/spawner/directional/east,
@@ -605,8 +604,7 @@
 	name = "Kitchen Counter Shutters"
 	},
 /obj/machinery/door/window/left/directional/west{
-	name = "Kitchen";
-	req_one_access = list("kitchen")
+	name = "Kitchen"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
 /turf/open/floor/wood,
@@ -820,7 +818,6 @@
 /area/station/commons/lounge)
 "zo" = (
 /obj/machinery/door/window/left/directional/south{
-	req_one_access = list("kitchen");
 	name = "Kitchen"
 	},
 /obj/effect/turf_decal/siding/wood,
@@ -877,8 +874,7 @@
 /area/station/commons/lounge)
 "AC" = (
 /obj/machinery/door/window/left/directional/east{
-	name = "Bar";
-	req_one_access = list("bar")
+	name = "Bar"
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -1558,7 +1554,6 @@
 /area/station/commons/lounge)
 "TG" = (
 /obj/machinery/door/window/left/directional/south{
-	req_one_access = list("kitchen");
 	name = "Kitchen Coldroom Access"
 	},
 /obj/effect/turf_decal/siding/wood{
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index b7697b3cb75c..3d1065149d63 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -110,6 +110,7 @@
 	layer = DOOR_HELPER_LAYER
 	late = TRUE
 
+/* replaced in monkestation\code\modules\mapping\mapping_helpers.dm
 /obj/effect/mapping_helpers/airlock/Initialize(mapload)
 	. = ..()
 	if(!mapload)
@@ -121,6 +122,7 @@
 		log_mapping("[src] failed to find an airlock at [AREACOORD(src)]")
 	else
 		payload(airlock)
+*/
 
 /obj/effect/mapping_helpers/airlock/LateInitialize()
 	. = ..()
diff --git a/monkestation/code/modules/mapping/access_helpers.dm b/monkestation/code/modules/mapping/access_helpers.dm
index e1f00e361b73..6a7dac901dfa 100644
--- a/monkestation/code/modules/mapping/access_helpers.dm
+++ b/monkestation/code/modules/mapping/access_helpers.dm
@@ -1,3 +1,18 @@
+/obj/effect/mapping_helpers/airlock/access/any/payload_windoor(obj/machinery/door/window/windoor)
+	if(windoor.req_access != null)
+		log_mapping("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!")
+	else
+		var/list/access_list = get_access()
+		windoor.req_one_access += access_list
+
+/obj/effect/mapping_helpers/airlock/access/all/payload_windoor(obj/machinery/door/window/windoor)
+	if(windoor.req_one_access != null)
+		log_mapping("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!")
+	else
+		var/list/access_list = get_access()
+		windoor.req_access += access_list
+
+
 /obj/effect/mapping_helpers/airlock/access/all/service/kitchen/east_offset
 	offset_dir = EAST
 
diff --git a/monkestation/code/modules/mapping/mapping_helpers.dm b/monkestation/code/modules/mapping/mapping_helpers.dm
index 0b464f77a218..0cf47616d4d5 100644
--- a/monkestation/code/modules/mapping/mapping_helpers.dm
+++ b/monkestation/code/modules/mapping/mapping_helpers.dm
@@ -50,3 +50,30 @@
 
 /obj/effect/area_power_helper/requires_power
 	set_state = TRUE
+
+/obj/effect/mapping_helpers/airlock/Initialize(mapload)
+	. = ..()
+	if(!mapload)
+		log_mapping("[src] spawned outside of mapload!")
+		return
+
+	var/turf/spot = (offset_dir ? get_step(src, offset_dir) : loc)
+	if(!try_for_airlock(spot) && !try_for_windoor(spot))
+		log_mapping("[src] failed to find an airlock at [AREACOORD(src)]")
+
+/obj/effect/mapping_helpers/airlock/proc/try_for_airlock(turf/spot)
+	. = FALSE
+	var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in spot
+	if(!QDELETED(airlock))
+		payload(airlock)
+		return TRUE
+
+/obj/effect/mapping_helpers/airlock/proc/try_for_windoor(turf/spot)
+	. = FALSE
+	var/obj/machinery/door/window/windoor = locate(/obj/machinery/door/window) in spot
+	if(!QDELETED(windoor))
+		payload_windoor(windoor)
+		return TRUE
+
+/obj/effect/mapping_helpers/airlock/proc/payload_windoor(obj/machinery/door/window/windoor)
+	return

From 494c5b06a808d4e7b3efcc5ba9494424b9e64eb5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Apr 2024 22:51:56 +0000
Subject: [PATCH 11/11] Automatic changelog for PR #1568 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1568.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1568.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1568.yml b/html/changelogs/AutoChangeLog-pr-1568.yml
new file mode 100644
index 000000000000..63fafa969dac
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1568.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+  - bugfix: "Airlock mapping helpers now work with windoors."
\ No newline at end of file