From aefdc3b1cc229cb9962b3c05631b49cddaf100e0 Mon Sep 17 00:00:00 2001 From: Aylong Date: Mon, 17 Jul 2023 18:12:04 +0300 Subject: [PATCH 1/2] Del: Cult whetstone --- _maps/map_files/Delta/delta.dmm | 63 +++++++++++++++++++++++---- _maps/map_files/cyberiad/cyberiad.dmm | 3 -- 2 files changed, 55 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 33de5be0fc1..787dfdc6090 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -40033,7 +40033,6 @@ /obj/structure/safe/floor, /obj/item/melee/cultblade, /obj/item/restraints/legcuffs/bola/cult, -/obj/item/whetstone/cult, /obj/item/stack/sheet/runed_metal{ amount = 50 }, @@ -52120,6 +52119,9 @@ /area/security/permabrig) "fWD" = ( /obj/effect/decal/warning_stripes/west, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -57766,6 +57768,21 @@ icon_state = "greencorner" }, /area/medical/virology/lab) +"hmo" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "Brig_lockdown"; + name = "Brig Lockdown"; + opacity = 0 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "SecPilotPriv" + }, +/turf/simulated/floor/plating, +/area/security/podbay) "hmq" = ( /obj/structure/window/reinforced{ dir = 4 @@ -61590,8 +61607,15 @@ }, /area/atmos) "ihp" = ( -/obj/structure/spacepoddoor{ - luminosity = 3 +/obj/machinery/door/poddoor/multi_tile/two_tile_ver{ + id_tag = "secpilot"; + req_access = list(71) + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" }, /obj/machinery/door/poddoor{ density = 0; @@ -61600,9 +61624,8 @@ name = "Brig Lockdown"; opacity = 0 }, -/obj/machinery/door/poddoor/multi_tile/two_tile_ver{ - id_tag = "secpilot"; - req_access = list(71) +/obj/structure/spacepoddoor{ + luminosity = 3 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -77198,6 +77221,24 @@ /obj/effect/landmark/tiles/damageturf, /turf/simulated/floor/plating, /area/maintenance/asmaint4) +"maX" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "Brig_lockdown"; + name = "Brig Lockdown"; + opacity = 0 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "SecPilotPriv" + }, +/turf/simulated/floor/plating, +/area/security/podbay) "mbm" = ( /obj/machinery/light/small{ dir = 1 @@ -113725,6 +113766,9 @@ }, /area/security/warden) "uoA" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/structure/cable{ icon_state = "1-8" }, @@ -126774,6 +126818,9 @@ }, /area/maintenance/starboard) "xqr" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -191925,10 +191972,10 @@ aaq aaq coE wyD -wyD +maX xqr ihp -wyD +hmo wyD coE ylx diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 3b350eb12bf..944557f2e02 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -15669,7 +15669,6 @@ command = "cycle_exterior"; dir = 8; frequency = 1379; - layer = 3.3; master_tag = "sol_airlock"; name = "exterior access button"; pixel_x = -10; @@ -17138,7 +17137,6 @@ command = "cycle_interior"; dir = 4; frequency = 1379; - layer = 3.3; master_tag = "sol_airlock"; name = "interior access button"; pixel_x = -25; @@ -77227,7 +77225,6 @@ /obj/item/stack/sheet/runed_metal{ amount = 50 }, -/obj/item/whetstone/cult, /obj/item/melee/cultblade, /obj/item/restraints/legcuffs/bola/cult, /obj/effect/landmark/event/revenantspawn, From 5687b263d4f0a87d90aae61c094984e1fd9d0033 Mon Sep 17 00:00:00 2001 From: Aylong Date: Mon, 17 Jul 2023 18:16:54 +0300 Subject: [PATCH 2/2] Update delta.dmm --- _maps/map_files/Delta/delta.dmm | 62 ++++----------------------------- 1 file changed, 7 insertions(+), 55 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 787dfdc6090..25149e15083 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -52119,9 +52119,6 @@ /area/security/permabrig) "fWD" = ( /obj/effect/decal/warning_stripes/west, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -57768,21 +57765,6 @@ icon_state = "greencorner" }, /area/medical/virology/lab) -"hmo" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Brig_lockdown"; - name = "Brig Lockdown"; - opacity = 0 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "SecPilotPriv" - }, -/turf/simulated/floor/plating, -/area/security/podbay) "hmq" = ( /obj/structure/window/reinforced{ dir = 4 @@ -61607,16 +61589,6 @@ }, /area/atmos) "ihp" = ( -/obj/machinery/door/poddoor/multi_tile/two_tile_ver{ - id_tag = "secpilot"; - req_access = list(71) - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -61627,6 +61599,10 @@ /obj/structure/spacepoddoor{ luminosity = 3 }, +/obj/machinery/door/poddoor/multi_tile/two_tile_ver{ + id_tag = "secpilot"; + req_access = list(71) + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -77221,24 +77197,6 @@ /obj/effect/landmark/tiles/damageturf, /turf/simulated/floor/plating, /area/maintenance/asmaint4) -"maX" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Brig_lockdown"; - name = "Brig Lockdown"; - opacity = 0 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "SecPilotPriv" - }, -/turf/simulated/floor/plating, -/area/security/podbay) "mbm" = ( /obj/machinery/light/small{ dir = 1 @@ -113766,9 +113724,6 @@ }, /area/security/warden) "uoA" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -126818,9 +126773,6 @@ }, /area/maintenance/starboard) "xqr" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -175760,7 +175712,7 @@ bBM bBM brF nyK -bBM +dmq nyK dkw bBM @@ -191972,10 +191924,10 @@ aaq aaq coE wyD -maX +wyD xqr ihp -hmo +wyD wyD coE ylx