From 3652dc3c1a203e9f8b89edbd112d67fe89fc2a9a Mon Sep 17 00:00:00 2001
From: HahaNo <64060-HahaNo@users.noreply.gitgud.io>
Date: Sun, 10 Nov 2024 07:49:41 +0000
Subject: [PATCH 1/2] adds defib and recharger to ERT surgery area, fixes
traitor implants not qdel-ing a head after it's been cut off a mob
---
.../items/weapons/implants/syndicateloyalty.dm | 4 ++--
maps/exodus-2.dmm | 14 ++++++++------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/code/game/objects/items/weapons/implants/syndicateloyalty.dm b/code/game/objects/items/weapons/implants/syndicateloyalty.dm
index bb0778f21bd..06ddbc28e42 100644
--- a/code/game/objects/items/weapons/implants/syndicateloyalty.dm
+++ b/code/game/objects/items/weapons/implants/syndicateloyalty.dm
@@ -152,8 +152,8 @@
var/obj/item/organ/brain = H.internal_organs_by_name["brain"]
part.droplimb(0,DROPLIMB_BLUNT)
qdel(brain)
+ qdel(part)
qdel(src)
-
else
explosion(get_turf(imp_in), 0, 0, 2, 3)
@@ -170,4 +170,4 @@
// TODO: unhide
/obj/item/weapon/implant/syndicate_loyalty/islegal()
- return 0
\ No newline at end of file
+ return 0
diff --git a/maps/exodus-2.dmm b/maps/exodus-2.dmm
index b96fc5ac2c7..6a720846699 100644
--- a/maps/exodus-2.dmm
+++ b/maps/exodus-2.dmm
@@ -70,7 +70,7 @@
"br" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{icon_state = "iron3"},/area/space)
"bs" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/holofloor/grass,/area/holodeck/source_picnicarea)
"bt" = (/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/holofloor/grass,/area/holodeck/source_picnicarea)
-"bu" = (/obj/structure/table/rack/holorack,/turf/simulated/floor/holofloor{icon_state = "cult"; dir = 2},/area/holodeck/source_theatre)
+"bu" = (/obj/structure/table/rack/holorack,/obj/item/clothing/head/hairflower,/turf/simulated/floor/holofloor{icon_state = "cult"; dir = 2},/area/holodeck/source_theatre)
"bv" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/holofloor/desert,/area/holodeck/source_desert)
"bw" = (/turf/simulated/floor/holofloor{name = "Holodeck Projector Floor"; icon_state = "engine"},/area/holodeck/source_wildlife)
"bx" = (/turf/simulated/floor/holofloor{name = "Holodeck Projector Floor"; icon_state = "engine"},/area/holodeck/source_plating)
@@ -429,7 +429,7 @@
"im" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor2"},/area/centcom/evac)
"in" = (/obj/item/weapon/stool,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor"},/area/centcom/evac)
"io" = (/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_x = -30; pixel_y = 0},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor"},/area/centcom/evac)
-"ip" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/gloves{pixel_x = -2; pixel_y = -2},/obj/item/weapon/storage/box/masks{pixel_x = 5; pixel_y = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
+"ip" = (/obj/machinery/recharger/wallcharger/defibcharger{pixel_x = 5; pixel_y = -6},/turf/unsimulated/wall,/area/centcom/specops)
"iq" = (/obj/structure/sink{pixel_y = 25},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
"ir" = (/obj/item/weapon/scalpel,/obj/item/weapon/circular_saw{pixel_y = 8},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
"is" = (/obj/item/weapon/bonesetter,/obj/item/weapon/bonegel,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
@@ -492,6 +492,8 @@
"jx" = (/obj/structure/table/reinforced,/obj/item/device/aicard,/obj/item/weapon/stamp/centcomm,/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops)
"jy" = (/turf/simulated/shuttle/wall{icon_state = "swallc1"; dir = 2},/area/centcom/evac)
"jz" = (/obj/machinery/computer/arcade,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor"},/area/centcom/evac)
+"jA" = (/obj/structure/closet/secure_closet/defiblocker,/turf/unsimulated/wall,/area/centcom/specops)
+"jB" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/masks{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/box/gloves{pixel_x = -2; pixel_y = -2},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
"jH" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"; dir = 8},/area/shuttle/specops_centcom)
"jJ" = (/obj/structure/closet/secure_closet/personal/patient,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/centcom/evac)
"jK" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/centcom/evac)
@@ -1843,11 +1845,11 @@ aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMuUuVuVuVuVuVuVuVuVuVuVuVuVuVyfuXuVuVuVuYyfygyivbvbuwyjuhuhuhuhuhyjuhuhykuhuhymylyzyzuhyQyQvdtvtvtvtvtvtvtvxBxBxByAufufvBbNxDwNxEufxFwRxGbNvDufufxjurururururxjurururururururxjwwwwwwwwwwtxuOuOtxtxtxtxtxaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmumumumumumumumumuaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMustvtvtvtvtvtvtvtvtvtvtvtvtvtvtvtvtvtvtvtvtvtvvbvbuwyjuhuhuhuhuhyjuhuhyCuhuhyQyDyDyDyQyQyQzcyKyGyMyQySyQtvtvtvtvtvufufvVbMxSufxiufxizQyqbMueufufwAbObPbPbPbStxtxxWtxtxtxuOtxtxtxyXyXyXtxtxurururyYurxZtxaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmumumumumumumumumuaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtvvbvbyZtvwFwGwGwGwItvzezetvzfuhyQzgzizhyQyQyQyRzkyMyQyQyQyQxxyQxKzltvufufvVtxtxynyoufypxStxtxueufuftxaMaMaMaMaMtxyrystxuNytuNuNyuyvywywywzmtxururuQuQururbTaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmumumumumuaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
-aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtvtvtvtvtvtvznztzszvzuuhuhuhxczwuhyQzizCzxyQyQyQyQxxyQyQyQhjzDxcyQyQzGtvufJyvVtxtxbhbibibibktxtxueJyuftxaMaMaMaMaMtxysystxyLyLyLuNyuywywywywzHtxuryNuPuPyOurbUaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
-aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtvicifigipiquhuhuhuhuhuhuhuhxnzIuhyQzJzJzJyQyQyQyQxxyQyQyQhjzDxnyJyEyFtvufufwKyTyTyTyTyTyTyTyTyTwTufuftxaMaMaMaMaMtxyUystxyLyVyLuNyuyuyuyuyuyutxuryNuPuPyOurbUaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
+aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtvtvtvipjAtvznztzszvzuuhuhuhxczwuhyQzizCzxyQyQyQyQxxyQyQyQhjzDxcyQyQzGtvufJyvVtxtxbhbibibibktxtxueJyuftxaMaMaMaMaMtxysystxyLyLyLuNyuywywywywzHtxuryNuPuPyOurbUaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
+aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtvicifiguhiquhuhuhuhuhuhuhuhxnzIuhyQzJzJzJyQyQyQyQxxyQyQyQhjzDxnyJyEyFtvufufwKyTyTyTyTyTyTyTyTyTwTufuftxaMaMaMaMaMtxyUystxyLyVyLuNyuyuyuyuyuyutxuryNuPuPyOurbUaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtviruhuhuhuhuhuhuhuhuhuhuhuhtvwCuhuhuhuhuhuhyQyQwCzkyQyQyQhjzDtvtvtvtvtvtxwAASxRtxufufJyufuftxtxtxtxtxtxaMaMaMaMaMtxAbystxvFuNuNuNyuaMaMaMaMaMtxuryNuPuPyOurbUaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
-fLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtvisuhituhuhAfAfAhAoAnAqaWaWtvAsArwquhtvjRtvwqArAsyKAFyQyQhjzDtvAGAKAJAGccAPDCAQCNtxwAEmxRtxtxaMaMaMaMaMaMaMaMaMaMtxtxtxtxtxtxtxtxyuaMaMaMaMaMbTuryNuPuPyOurbUaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaifLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfL
-dCdCdCdCdCdCdCdCdCdCdCfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZdCdCdCdCdCdCdCfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtviuuhuhuhtvtvtvtvtvtvtvtvtvtvtvtvtvtvtvjStvtvtvtvtvBayQyQhjzDtvAGBbBbAGcdBdDCAQCNBfBeDCBgBtCNaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMcfururzLzLururcfaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
+fLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtvisuhituhiuAfAfAhAoAnAqaWaWtvAsArwquhtvjRtvwqArAsyKAFyQyQhjzDtvAGAKAJAGccAPDCAQCNtxwAEmxRtxtxaMaMaMaMaMaMaMaMaMaMtxtxtxtxtxtxtxtxyuaMaMaMaMaMbTuryNuPuPyOurbUaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaifLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfLfL
+dCdCdCdCdCdCdCdCdCdCdCfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZfZdCdCdCdCdCdCdCfLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtvjBuhuhuhtvtvtvtvtvtvtvtvtvtvtvtvtvtvtvjStvtvtvtvtvBayQyQhjzDtvAGBbBbAGcdBdDCAQCNBfBeDCBgBtCNaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMcfururzLzLururcfaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
dCmumumumumumumumumudCgagagagagafZgbgcgdfZgagagagagagagagagagagamumudCmumumumufLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtvtvtvtvtvtvaMaMaMaMaMaMaMaMkLjHzNzPkLjZjSkwaMaMaMtvBNyQyQhjzDtvAGAJAJAGcgBdDCAQCNBPDCDCDCBQCNaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtxzVururururzWtxaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
dCmumumumumumumumumudCgagagagagafZgfgcgcfZgagagagagagagagagagagamumudCmumumumufLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMjHksamlgzPkxjSkAaMaMaMtvxNxQxQxNtvtvlqAGAGAGBYBdDCAQCNchCdchCfchCNaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMtxtxtxtxtxtxtxtxaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
dCmumumumumumugagagafZfZfZfZgafZfZfZfZggfZfZfZfZfZfZfZgagagagagamumudCmumumumufLaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMzNaZAckpzNkBjSkAaMaMaMtvyQyQyQyQyQtvAGCjAGCjccBdDCClCkBPDCCmDCCnCNaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
--
GitLab
From c25278e0b1baaf0bfd07141f01b2fd294233ed78 Mon Sep 17 00:00:00 2001
From: HahaNo <64060-HahaNo@users.noreply.gitgud.io>
Date: Sun, 10 Nov 2024 07:57:30 +0000
Subject: [PATCH 2/2] ree why wasn't that updated
---
maps/exodus-2.dmm | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/maps/exodus-2.dmm b/maps/exodus-2.dmm
index 6a720846699..5b38c198927 100644
--- a/maps/exodus-2.dmm
+++ b/maps/exodus-2.dmm
@@ -70,7 +70,7 @@
"br" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{icon_state = "iron3"},/area/space)
"bs" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/holofloor/grass,/area/holodeck/source_picnicarea)
"bt" = (/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/holofloor/grass,/area/holodeck/source_picnicarea)
-"bu" = (/obj/structure/table/rack/holorack,/obj/item/clothing/head/hairflower,/turf/simulated/floor/holofloor{icon_state = "cult"; dir = 2},/area/holodeck/source_theatre)
+"bu" = (/obj/structure/table/rack/holorack,/turf/simulated/floor/holofloor{icon_state = "cult"; dir = 2},/area/holodeck/source_theatre)
"bv" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/holofloor/desert,/area/holodeck/source_desert)
"bw" = (/turf/simulated/floor/holofloor{name = "Holodeck Projector Floor"; icon_state = "engine"},/area/holodeck/source_wildlife)
"bx" = (/turf/simulated/floor/holofloor{name = "Holodeck Projector Floor"; icon_state = "engine"},/area/holodeck/source_plating)
@@ -207,7 +207,7 @@
"dY" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/sniperammo,/obj/item/weapon/storage/box/sniperammo,/obj/item/weapon/storage/box/sniperammo,/obj/item/weapon/storage/box/sniperammo,/obj/item/weapon/storage/box/sniperammo,/obj/item/weapon/storage/box/sniperammo,/obj/item/weapon/gun/projectile/heavysniper,/obj/item/weapon/gun/projectile/heavysniper,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_base)
"dZ" = (/turf/simulated/floor/holofloor{icon_state = "red"; dir = 1},/area/holodeck/source_boxingcourt)
"ea" = (/obj/structure/window/reinforced/holowindow{dir = 1},/turf/simulated/floor/holofloor{icon_state = "dark"},/area/holodeck/source_boxingcourt)
-"eb" = (/obj/machinery/door/airlock/external{name = "Shuttle Hatch"; icon_state = "door_locked"; frequency = 1380; locked = 1; id_tag = "escape_shuttle_hatch"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom)
+"eb" = (/obj/machinery/door/airlock/external{name = "Shuttle Hatch"; icon_state = "door_locked"; frequency = 1380; id_tag = "escape_shuttle_hatch"; locked = 1; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom)
"ec" = (/obj/structure/flora/grass/both,/turf/simulated/floor/holofloor{icon_state = "snow"},/area/holodeck/source_snowfield)
"ed" = (/turf/simulated/floor/holofloor{icon_state = "carpet4-0"; dir = 4},/area/holodeck/source_meetinghall)
"ee" = (/turf/simulated/floor/holofloor{icon_state = "carpetsymbol"; dir = 6},/area/holodeck/source_meetinghall)
@@ -397,14 +397,14 @@
"hG" = (/turf/simulated/shuttle/wall{icon_state = "swall7"; dir = 2},/area/centcom/evac)
"hH" = (/turf/simulated/shuttle/wall{icon_state = "swall12"; dir = 2},/area/centcom/evac)
"hI" = (/turf/space/transit/north,/area/skipjack_station/transit)
-"hJ" = (/obj/machinery/door/airlock/external{name = "Recovery Shuttle Dock"; icon_state = "door_locked"; frequency = 1380; locked = 1; id_tag = "escape_pod_1_recovery_hatch"; req_access = list(13)},/turf/unsimulated/floor,/area/centcom/evac)
+"hJ" = (/obj/machinery/door/airlock/external{name = "Recovery Shuttle Dock"; icon_state = "door_locked"; frequency = 1380; id_tag = "escape_pod_1_recovery_hatch"; locked = 1; req_access = list(13)},/turf/unsimulated/floor,/area/centcom/evac)
"hK" = (/turf/simulated/shuttle/wall{icon_state = "swall11"; dir = 2},/area/centcom/evac)
"hL" = (/obj/machinery/portable_atmospherics/powered/pump,/turf/simulated/shuttle/plating,/area/centcom/evac)
"hM" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/plating,/area/centcom/evac)
"hN" = (/turf/simulated/shuttle/plating,/turf/simulated/shuttle/wall{icon_state = "swall_f6"; dir = 2},/area/centcom/evac)
"hO" = (/turf/simulated/shuttle/wall{icon_state = "swall_floor_f9"; dir = 2},/area/centcom/evac)
"hP" = (/obj/structure/closet/emcloset,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor"},/area/centcom/evac)
-"hQ" = (/obj/machinery/door/airlock/external{name = "Recovery Shuttle Dock"; icon_state = "door_locked"; frequency = 1380; locked = 1; id_tag = "escape_pod_2_recovery_hatch"; req_access = list(13)},/turf/unsimulated/floor,/area/centcom/evac)
+"hQ" = (/obj/machinery/door/airlock/external{name = "Recovery Shuttle Dock"; icon_state = "door_locked"; frequency = 1380; id_tag = "escape_pod_2_recovery_hatch"; locked = 1; req_access = list(13)},/turf/unsimulated/floor,/area/centcom/evac)
"hR" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/toxin{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor"},/area/centcom/evac)
"hS" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{pixel_x = 25; pixel_y = 30; frequency = 1380; tag_door = "escape_pod_1_recovery_hatch"; id_tag = "escape_pod_1_recovery"; req_one_access = list(13)},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor2"},/area/centcom/evac)
"hT" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 0},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor"},/area/centcom/evac)
@@ -479,10 +479,10 @@
"jk" = (/obj/structure/table/standard,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor"},/area/centcom/evac)
"jl" = (/turf/space,/area/shuttle/escape_pod3/centcom)
"jm" = (/obj/structure/table/standard,/obj/item/weapon/hand_labeler,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor"},/area/centcom/evac)
-"jn" = (/obj/machinery/door/airlock/external{name = "Recovery Shuttle Dock"; icon_state = "door_locked"; frequency = 1380; locked = 1; id_tag = "escape_pod_5_recovery_hatch"; req_access = list(13)},/turf/unsimulated/floor,/area/centcom/evac)
+"jn" = (/obj/machinery/door/airlock/external{name = "Recovery Shuttle Dock"; icon_state = "door_locked"; frequency = 1380; id_tag = "escape_pod_5_recovery_hatch"; locked = 1; req_access = list(13)},/turf/unsimulated/floor,/area/centcom/evac)
"jo" = (/obj/structure/bed/chair{dir = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor"},/area/centcom/evac)
"jp" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{pixel_x = -25; pixel_y = 25; frequency = 1380; tag_door = "escape_pod_5_recovery_hatch"; id_tag = "escape_pod_5_recovery"; req_one_access = list(13)},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor2"},/area/centcom/evac)
-"jq" = (/obj/machinery/door/airlock/external{name = "Recovery Shuttle Dock"; icon_state = "door_locked"; frequency = 1380; locked = 1; id_tag = "escape_pod_3_recovery_hatch"; req_access = list(13)},/turf/unsimulated/floor,/area/centcom/evac)
+"jq" = (/obj/machinery/door/airlock/external{name = "Recovery Shuttle Dock"; icon_state = "door_locked"; frequency = 1380; id_tag = "escape_pod_3_recovery_hatch"; locked = 1; req_access = list(13)},/turf/unsimulated/floor,/area/centcom/evac)
"jr" = (/obj/structure/closet/secure_closet/defiblocker,/turf/simulated/shuttle/wall{icon_state = "swall3"; dir = 2},/area/shuttle/escape/centcom)
"js" = (/obj/machinery/vending/coffee,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor"},/area/centcom/evac)
"jt" = (/obj/machinery/recharger/wallcharger/defibcharger{pixel_x = 5},/turf/simulated/wall/voxshuttle,/area/skipjack_station/start)
@@ -575,13 +575,13 @@
"lz" = (/obj/structure/fullwindow/shuttle{icon_state = "window4"},/obj/structure/grille,/turf/simulated/shuttle/plating,/area/centcom/evac)
"lA" = (/obj/structure/fullwindow/shuttle{icon_state = "window12"},/obj/structure/grille,/turf/simulated/shuttle/plating,/area/centcom/evac)
"lB" = (/obj/structure/fullwindow/shuttle{icon_state = "window8"},/obj/structure/grille,/turf/simulated/shuttle/plating,/area/centcom/evac)
-"lC" = (/obj/machinery/door/airlock/hatch{icon_state = "door_closed"; frequency = 1331; locked = 0; id_tag = "vox_northwest_lock"; req_access = list(150)},/turf/simulated/shuttle/plating,/area/skipjack_station/start)
+"lC" = (/obj/machinery/door/airlock/hatch{icon_state = "door_closed"; frequency = 1331; id_tag = "vox_northwest_lock"; locked = 0; req_access = list(150)},/turf/simulated/shuttle/plating,/area/skipjack_station/start)
"lD" = (/obj/machinery/access_button{frequency = 1331; command = "cycle_exterior"; master_tag = "vox_west_control"; req_one_access = list(150)},/turf/simulated/wall/voxshuttle,/area/skipjack_station/start)
"lE" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows"; dir = 1},/area/syndicate_base)
"lF" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{name = "Skipjack Blast Shielding"; id = "skipjackshutters"},/turf/simulated/shuttle/plating,/area/skipjack_station/start)
"lG" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/regular{name = "Skipjack Blast Shielding"; id = "skipjackshutters"},/turf/simulated/shuttle/plating,/area/skipjack_station/start)
"lH" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/regular{name = "Skipjack Blast Shielding"; id = "skipjackshutters"},/turf/simulated/shuttle/plating,/area/skipjack_station/start)
-"lI" = (/obj/machinery/door/airlock/hatch{icon_state = "door_closed"; frequency = 1331; locked = 0; id_tag = "vox_northeast_lock"; req_access = list(150)},/turf/simulated/shuttle/plating,/area/skipjack_station/start)
+"lI" = (/obj/machinery/door/airlock/hatch{icon_state = "door_closed"; frequency = 1331; id_tag = "vox_northeast_lock"; locked = 0; req_access = list(150)},/turf/simulated/shuttle/plating,/area/skipjack_station/start)
"lJ" = (/obj/machinery/access_button{frequency = 1331; command = "cycle_exterior"; master_tag = "vox_east_control"; req_access = list(150)},/turf/simulated/wall/voxshuttle,/area/skipjack_station/start)
"lK" = (/obj/machinery/airlock_sensor{pixel_x = 25; frequency = 1331; id_tag = "vox_west_sensor"},/turf/simulated/shuttle/plating,/area/skipjack_station/start)
"lL" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1331; id_tag = "vox_west_vent"},/turf/simulated/shuttle/plating,/area/skipjack_station/start)
@@ -599,11 +599,11 @@
"lX" = (/obj/machinery/light/small{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/skipjack_station/start)
"lY" = (/obj/machinery/embedded_controller/radio/airlock/airlock_controller{pixel_x = -24; frequency = 1331; tag_exterior_door = "vox_northeast_lock"; tag_interior_door = "vox_southeast_lock"; tag_airpump = "vox_east_vent"; tag_chamber_sensor = "vox_east_sensor"; id_tag = "vox_east_control"; req_access = list(150)},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1331; id_tag = "vox_east_vent"},/obj/machinery/light/small,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
"lZ" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 4},/obj/machinery/meter,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
-"ma" = (/obj/machinery/door/airlock/hatch{icon_state = "door_closed"; frequency = 1331; locked = 0; id_tag = "vox_southwest_lock"; req_access = list(150)},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
+"ma" = (/obj/machinery/door/airlock/hatch{icon_state = "door_closed"; frequency = 1331; id_tag = "vox_southwest_lock"; locked = 0; req_access = list(150)},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
"mb" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/skipjack_station/start)
"mc" = (/obj/structure/table/rack,/obj/item/weapon/rig/industrial,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/skipjack_station/start)
"md" = (/obj/structure/table/rack,/obj/item/weapon/rig/light/hacker,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/skipjack_station/start)
-"me" = (/obj/machinery/door/airlock/hatch{icon_state = "door_closed"; frequency = 1331; locked = 0; id_tag = "vox_southeast_lock"; req_access = list(150)},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
+"me" = (/obj/machinery/door/airlock/hatch{icon_state = "door_closed"; frequency = 1331; id_tag = "vox_southeast_lock"; locked = 0; req_access = list(150)},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
"mf" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/ionrifle,/obj/item/weapon/material/harpoon,/obj/item/clothing/suit/space/void/syndicate,/obj/item/clothing/head/helmet/space/void/syndicate,/obj/item/clothing/head/helmet/space/void/engineering,/obj/item/clothing/suit/space/void/engineering,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/weapon/rig/light/stealth,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
"mg" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/access_button{pixel_x = -22; frequency = 1331; command = "cycle_interior"; master_tag = "vox_west_control"; req_one_access = list(150)},/turf/simulated/shuttle/plating,/area/skipjack_station/start)
"mh" = (/obj/item/seeds/potato,/obj/item/seeds/potato,/obj/item/seeds/ambrosia,/obj/item/weapon/material/minihoe,/obj/item/weapon/beartrap,/obj/structure/table/steel,/turf/simulated/shuttle/plating,/area/skipjack_station/start)
@@ -931,7 +931,7 @@
"us" = (/turf/space,/area/centcom/specops)
"ut" = (/obj/machinery/mech_bay_recharge_port,/turf/unsimulated/floor{icon_state = "bot"},/area/centcom/specops)
"uu" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops)
-"uv" = (/obj/item/device/radio/intercom{name = "Spec Ops Intercom"; dir = 1; pixel_y = 28; frequency = 1441; listening = 0; broadcasting = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops)
+"uv" = (/obj/item/device/radio/intercom{name = "Spec Ops Intercom"; dir = 1; pixel_y = 28; frequency = 1441; broadcasting = 1; listening = 0},/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops)
"uw" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 9},/area/centcom/specops)
"uA" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/storage/box/emps,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/gun/launcher/grenade,/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops)
"uB" = (/obj/structure/bed,/turf/unsimulated/floor{icon_state = "panelscorched"},/area/prison/solitary)
@@ -1024,7 +1024,7 @@
"wK" = (/turf/unsimulated/floor{icon_state = "greencorner"; dir = 4},/area/centcom/control)
"wM" = (/obj/machinery/computer/ordercomp,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
"wN" = (/obj/structure/bed/chair{dir = 8},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
-"wO" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/device/radio/intercom{name = "Spec Ops Intercom"; dir = 1; pixel_y = 28; frequency = 1443; listening = 0; broadcasting = 1},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
+"wO" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/device/radio/intercom{name = "Spec Ops Intercom"; dir = 1; pixel_y = 28; frequency = 1443; broadcasting = 1; listening = 0},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
"wQ" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
"wR" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
"wS" = (/obj/machinery/computer/crew,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
@@ -1083,7 +1083,7 @@
"yi" = (/obj/machinery/camera/network/ert{dir = 1; c_tag = "Assault Armor South"},/turf/unsimulated/floor{icon_state = "loadingarea"; dir = 8},/area/centcom/specops)
"yj" = (/obj/machinery/door/airlock/centcom{name = "Special Operations Command"; opacity = 1; req_access = list(103)},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
"yk" = (/obj/structure/sign/securearea{name = "\improper ARMORY"; pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
-"yl" = (/obj/item/device/radio/intercom{name = "Spec Ops Intercom"; dir = 1; pixel_y = 28; frequency = 1441; listening = 0; broadcasting = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
+"yl" = (/obj/item/device/radio/intercom{name = "Spec Ops Intercom"; dir = 1; pixel_y = 28; frequency = 1441; broadcasting = 1; listening = 0},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
"ym" = (/obj/structure/sign/securearea{name = "ENGINEERING ACCESS"; pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
"yn" = (/obj/structure/table/reinforced,/obj/item/device/pda/captain,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
"yo" = (/obj/machinery/computer/secure_data,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control)
@@ -1432,7 +1432,7 @@
"GQ" = (/obj/machinery/flasher{name = "Thunderdome Flash"; id = "flash"},/turf/simulated/floor/bluegrid,/area/tdome)
"GR" = (/turf/unsimulated/floor{icon_state = "warning"; dir = 4; heat_capacity = 1},/area/centcom/holding)
"GS" = (/obj/machinery/atmospherics/pipe/vent,/turf/simulated/floor/bluegrid,/area/tdome)
-"GT" = (/obj/machinery/door/airlock/external{name = "Arrivals Airlock"; icon_state = "door_locked"; frequency = 1380; locked = 1; id_tag = "centcom_dock_airlock"; req_access = list(13)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/holding)
+"GT" = (/obj/machinery/door/airlock/external{name = "Arrivals Airlock"; icon_state = "door_locked"; frequency = 1380; id_tag = "centcom_dock_airlock"; locked = 1; req_access = list(13)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/holding)
"GU" = (/turf/unsimulated/beach/sand{opacity = 1; density = 1},/area/beach)
"GV" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 5; tag = "icon-intact (NORTHEAST)"},/turf/simulated/floor,/area/tdome)
"GW" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 1},/turf/simulated/floor,/area/tdome)
--
GitLab