Skip to content

Commit

Permalink
[MIRROR] Readds the airlock controller for the engine room (#2838)
Browse files Browse the repository at this point in the history
Co-authored-by: Hubblenaut <[email protected]>
Co-authored-by: Lexanx <[email protected]>
  • Loading branch information
3 people authored Nov 26, 2024
1 parent 3a0065b commit 92b298a
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 16 deletions.
11 changes: 9 additions & 2 deletions code/game/machinery/embedded_controller/airlock_program.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,17 @@
begin_cycle_in()

if("cycle_ext_door")
cycleDoors(TARGET_OUTOPEN)
// Close the door if it's open, otherwise cycle
if(memory["exterior_status"]["state"] == "open")
toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "toggle")
else
cycleDoors(TARGET_OUTOPEN)

if("cycle_int_door")
cycleDoors(TARGET_INOPEN)
if(memory["interior_status"]["state"] == "open")
toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "toggle")
else
cycleDoors(TARGET_INOPEN)

if("abort")
stop_cycling()
Expand Down
61 changes: 47 additions & 14 deletions maps/torch/torch4_deck2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3446,12 +3446,12 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/hatch{
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/hatch/maintenance/bolted{
frequency = 1379;
id_tag = "";
id_tag = "engine_exterior";
name = "Engine Airlock Exterior"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/engine_room)
"gX" = (
Expand Down Expand Up @@ -4980,6 +4980,10 @@
dir = 8
},
/obj/floor_decal/industrial/outline/yellow,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/engine_monitoring)
"kY" = (
Expand All @@ -4992,10 +4996,6 @@
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson,
/obj/floor_decal/industrial/outline/yellow,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/engine_monitoring)
"la" = (
Expand All @@ -5009,8 +5009,7 @@
},
/obj/floor_decal/industrial/outline/yellow,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
pixel_y = 21
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/engine_room)
Expand All @@ -5020,6 +5019,11 @@
dir = 5
},
/obj/floor_decal/industrial/outline/yellow,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson,
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/engine_room)
"le" = (
Expand Down Expand Up @@ -5315,12 +5319,12 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/hatch{
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/hatch/maintenance/bolted{
frequency = 1379;
id_tag = "";
id_tag = "engine_interior";
name = "Engine Airlock Interior"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/engine_room)
"lQ" = (
Expand All @@ -5332,7 +5336,20 @@
/obj/floor_decal/industrial/warning{
dir = 10
},
/obj/machinery/light/small,
/obj/machinery/embedded_controller/radio/airlock/access_controller{
dir = 1;
id_tag = "engine_controller";
name = "Engine Room Access Controller";
pixel_y = -21;
req_access = list("ACCESS_ENGINE_EQUIP");
tag_exterior_door = "engine_exterior";
tag_interior_door = "engine_interior"
},
/obj/machinery/access_button/airlock_interior{
master_tag = "engine_controller";
pixel_x = -23;
pixel_y = 23
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/engine_room)
"lR" = (
Expand All @@ -5344,6 +5361,11 @@
/obj/floor_decal/industrial/warning{
dir = 6
},
/obj/machinery/access_button/airlock_exterior{
master_tag = "engine_controller";
pixel_x = 23;
pixel_y = 23
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/engine_room)
"lT" = (
Expand All @@ -5353,6 +5375,11 @@
d2 = 8;
icon_state = "2-8"
},
/obj/machinery/access_button/airlock_exterior{
master_tag = "engine_controller";
pixel_x = -23;
pixel_y = 23
},
/turf/simulated/floor/tiled/techfloor,
/area/engineering/engine_room)
"lV" = (
Expand Down Expand Up @@ -5902,6 +5929,11 @@
d2 = 4;
icon_state = "1-4"
},
/obj/machinery/access_button/airlock_interior{
master_tag = "engine_controller";
pixel_x = 23;
pixel_y = 23
},
/turf/simulated/floor/tiled/monotile,
/area/engineering/engine_monitoring)
"nw" = (
Expand All @@ -5914,7 +5946,8 @@
/area/engineering/engine_monitoring)
"nx" = (
/obj/structure/sign/warning/internals_required{
name = "\improper RADIATION GEAR REQUIRED"
name = "\improper RADIATION GEAR REQUIRED";
pixel_y = 4
},
/turf/simulated/wall/r_wall/prepainted,
/area/engineering/engine_room)
Expand Down

0 comments on commit 92b298a

Please sign in to comment.