From 9ee504575ee53d33361d01a4508952a3d323afdd Mon Sep 17 00:00:00 2001 From: SAAD <110329212+SAADf603@users.noreply.github.com> Date: Tue, 30 Jul 2024 01:59:54 +0800 Subject: [PATCH] Tweak: pods placement (#5614) * now not rough * and event map 2 * ops --- _maps/map_files/Delta/delta.dmm | 155 ++++++++++---------- _maps/map_files/celestation/celestation.dmm | 14 +- _maps/map_files/cerestation/cerestation.dmm | 72 ++++----- _maps/map_files/cyberiad/cyberiad.dmm | 28 +++- _maps/map_files/event/Station/delta_old.dmm | 75 ++++------ 5 files changed, 176 insertions(+), 168 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 502a733f2be..3446ee90bfc 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -629,7 +629,9 @@ }, /area/maintenance/asmaint4) "agN" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + name = "Escape Pod Airlock" + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry/eastarrival) "agT" = ( @@ -776,10 +778,6 @@ icon_state = "neutralfull" }, /area/hallway/secondary/entry/additional) -"aii" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry/westarrival) "aim" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/rodent, @@ -822,10 +820,6 @@ icon_state = "whitepurple" }, /area/toxins/lab) -"aiL" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry/eastarrival) "aiT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -883,13 +877,17 @@ }, /area/toxins/explab) "ajz" = ( +/obj/structure/table/reinforced, +/obj/item/storage/belt/utility, +/obj/item/multitool, +/obj/item/clothing/glasses/meson, +/obj/machinery/light{ + dir = 8 + }, /obj/machinery/firealarm{ dir = 8; pixel_x = -26 }, -/obj/machinery/light{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/engine/mechanic_workshop/expedition) "ajD" = ( @@ -980,6 +978,9 @@ /obj/structure/sign/poster/official/work_for_a_future{ pixel_x = 32 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/mechanic_workshop/expedition) "akv" = ( @@ -1243,7 +1244,6 @@ network = list("SS13","Security"); pixel_x = -9 }, -/obj/machinery/light, /obj/structure/table/reinforced, /obj/item/storage/firstaid/adv, /obj/item/storage/firstaid/o2{ @@ -1922,16 +1922,11 @@ /turf/simulated/floor/plasteel, /area/maintenance/bar) "arT" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/machinery/cell_charger{ - pixel_x = -1; - pixel_y = 2 +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "neutral" }, -/obj/item/stock_parts/cell/high, -/turf/simulated/floor/plasteel, /area/engine/mechanic_workshop/expedition) "arX" = ( /obj/effect/decal/warning_stripes/southwest, @@ -2034,9 +2029,6 @@ /turf/simulated/floor/plating, /area/maintenance/garden) "atq" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plasteel, /area/engine/mechanic_workshop/expedition) @@ -2059,13 +2051,15 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry/westarrival) "atR" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/item/stock_parts/cell/high, /obj/machinery/light_switch{ pixel_x = -24 }, -/obj/structure/table/reinforced, -/obj/item/storage/belt/utility, -/obj/item/multitool, -/obj/item/clothing/glasses/meson, /turf/simulated/floor/plasteel, /area/engine/mechanic_workshop/expedition) "atV" = ( @@ -7523,9 +7517,6 @@ icon_state = "darkyellow" }, /area/engine/mechanic_workshop/hangar) -"bdu" = ( -/turf/simulated/floor/plating, -/area/construction/hallway) "bdz" = ( /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/soda{ @@ -40800,7 +40791,9 @@ }, /area/library) "dZo" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + name = "Escape Pod Airlock" + }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry/westarrival) @@ -54055,7 +54048,9 @@ }, /area/tcommsat/chamber) "heT" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + name = "Escape Pod Airlock" + }, /turf/simulated/floor/plating, /area/construction/hallway) "heZ" = ( @@ -69214,10 +69209,6 @@ }, /turf/simulated/floor/plasteel, /area/medical/research/nhallway) -"kXR" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "kXY" = ( /obj/structure/lattice, /obj/structure/transit_tube/curved{ @@ -91823,7 +91814,9 @@ /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "qjy" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + name = "Escape Pod Airlock" + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "qjE" = ( @@ -130035,9 +130028,9 @@ aaq aaq aaq aaq -yhg -yhg -yhg +aaq +aaq +aaq aaq aaq aaq @@ -130291,8 +130284,7 @@ aaq aaq aaq aaq -yhg -yhg +aaq yhg yhg yhg @@ -130376,6 +130368,7 @@ aaq aaq aaq aaq +aaq yhg yhg yhg @@ -131319,11 +131312,11 @@ aaq aaq aaq aaq -aaq yhg -vAm yhg -aaq +yhg +yhg +yhg aaq aaq aaq @@ -131576,11 +131569,11 @@ aaq aaq aaq aaq -aaq -tOj -bdu -tOj -aaq +coE +yhg +vAm +yhg +coE aaq aaq aaq @@ -161040,12 +161033,12 @@ aaq aaq aaq aaq +aaq yhg yhg yhg yhg -aaq -aaq +agp agp agp ahS @@ -161296,6 +161289,7 @@ aaq aaq aaq aaq +aaq yhg yhg yhg @@ -161303,7 +161297,6 @@ yhg yhg yhg ahS -ahS alv axa aUB @@ -161553,13 +161546,13 @@ aaq aaq aaq aaq +aaq yhg yhg yhg yhg yhg ahe -aii dZo ayB amj @@ -161810,6 +161803,7 @@ aaq aaq aaq aaq +aaq yhg yhg yhg @@ -161817,7 +161811,6 @@ yhg yhg yhg ahS -ahS ahr aah aUC @@ -162068,12 +162061,12 @@ aaq aaq aaq aaq +aaq yhg yhg yhg yhg -aaq -aaq +agp agp agp ahS @@ -165666,12 +165659,12 @@ aaq aaq aaq aaq +aaq yhg yhg yhg yhg -aaq -aaq +aiE aiE ajN ala @@ -165922,6 +165915,7 @@ aaq aaq aaq aaq +aaq yhg yhg yhg @@ -165929,7 +165923,6 @@ yhg yhg yhg ala -ala alw awV apk @@ -166179,13 +166172,13 @@ aaq aaq aaq aaq +aaq yhg yhg yhg yhg yhg ahf -aiL agN ahs aml @@ -166436,6 +166429,7 @@ aaq aaq aaq aaq +aaq yhg yhg yhg @@ -166443,7 +166437,6 @@ yhg yhg yhg ala -ala ahv aNA apF @@ -166694,11 +166687,11 @@ aaq aaq aaq aaq +aaq yhg yhg yhg yhg -aaq irJ irJ irJ @@ -179678,7 +179671,7 @@ qEC oum yfp yfp -xZu +yfp vzF rsJ rsJ @@ -179936,8 +179929,8 @@ xZu xZu qjy xZu -hvU -hvU +vzF +vzF vkX tff jpm @@ -180189,13 +180182,13 @@ tOb xyi pVa qEC -aaq -xZu -kXR -xZu +coE +yhg +mrO +yhg +coE vzF hvU -hvU vYH eUo gdW @@ -180446,11 +180439,11 @@ pVa pVa rHr qEC -aaq yhg -mrO yhg -vzF +yhg +yhg +yhg vzF vkX lTr @@ -181474,11 +181467,11 @@ coE coE coE coE +aaq yhg yhg yhg -yhg -yhg +aaq vzF vkX vEp @@ -181732,9 +181725,9 @@ aaq aaq aaq aaq -yhg -yhg -yhg +aaq +aaq +aaq aaq usN vJb diff --git a/_maps/map_files/celestation/celestation.dmm b/_maps/map_files/celestation/celestation.dmm index 0962046b44c..6e8be6bd1a9 100644 --- a/_maps/map_files/celestation/celestation.dmm +++ b/_maps/map_files/celestation/celestation.dmm @@ -37633,6 +37633,12 @@ icon_state = "whitepurple" }, /area/medical/research/shallway) +"fPl" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod" + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "fPo" = ( /obj/structure/railing{ dir = 4 @@ -77861,7 +77867,7 @@ /area/turret_protected/aisat_interior/secondary) "nDk" = ( /obj/machinery/door/airlock/external{ - name = "Emergency Shuttle Airlock" + name = "Escape Pod Airlock" }, /turf/simulated/floor/plating, /area/maintenance/port) @@ -99848,7 +99854,7 @@ /area/security/lobby) "rSu" = ( /obj/machinery/door/airlock/external{ - name = "Emergency Shuttle Airlock" + name = "Escape Pod Airlock" }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) @@ -216359,7 +216365,7 @@ gqp pEz vWY esT -rSu +fPl gau gau gau @@ -216616,7 +216622,7 @@ lit pEz mLQ esT -rSu +fPl gau dXC gau diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index 26ad5d580f8..75efd6811e5 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -21661,7 +21661,7 @@ /area/mimeoffice) "cOo" = ( /obj/machinery/door/airlock/external{ - name = "Emergency Shuttle Airlock" + name = "Escape Pod Airlock" }, /turf/simulated/floor/plating, /area/maintenance/port) @@ -31442,10 +31442,6 @@ /obj/effect/landmark/join_late, /turf/simulated/floor/shuttle, /area/shuttle/arrival/station) -"fdm" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/hallway/primary/aft/west) "fdB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -89171,6 +89167,12 @@ }, /turf/simulated/floor/plasteel/freezer, /area/crew_quarters/locker/locker_toilet) +"vMq" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod Airlock" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal/north) "vMA" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -110359,10 +110361,10 @@ ccW rWw rWw rNK -rNK -rNK -rNK -cdb +biI +bnQ +bnQ +eVf djt cni vsg @@ -110616,10 +110618,10 @@ ccW ccW rWw cdb -biI -bnQ +biK bnQ eVf +dcG djt mQb pop @@ -110873,9 +110875,9 @@ vtY ccW rWw cdb -biK +biI bnQ -eVf +cJu dcG djt sxb @@ -111130,9 +111132,9 @@ vtY ccW rWw cdb -biI +biK bnQ -cJu +eVf dcG djt hXm @@ -111387,9 +111389,9 @@ vtY ccW rWw cdb -biK +biI bnQ -eVf +cJu dcG djt sxb @@ -111644,9 +111646,9 @@ vtY ccW rWw cdb -biI +biK bnQ -cJu +eVf dcG uCu owN @@ -111900,10 +111902,10 @@ uCK vtY vtY rWw -rWw -biK +cdb +biI bnQ -eVf +cJu biK rlT bSE @@ -112156,12 +112158,12 @@ uCK gur lOG vtY -ccW -jqn -jqn -jqn +rWw +rNK biK bnQ +bnQ +bnQ cjL jgl vIo @@ -112413,11 +112415,11 @@ vtY jUn ylJ vtY +rWw jqn jqn jqn -jqn -jqn +rNK cxg cxg cxg @@ -113441,11 +113443,11 @@ chQ chQ tuK qWp -vkl jqn -lsT jqn -qWp +jqn +jqn +jqn cxg rQf rQf @@ -113699,9 +113701,9 @@ nNd mKt pGq wsm -vkl -fdm -vkl +jqn +lsT +jqn qWp cxg eHc @@ -125380,7 +125382,7 @@ jqn jqn jqn ajP -akA +vMq cAD akA akA diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 52c9826a8bd..06f42c5ebe6 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -72095,6 +72095,12 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/hallway/secondary/exit) +"nXN" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod Airlock" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "nYy" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -81974,6 +81980,12 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/maintenance/apmaint) +"uzE" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod Airlock" + }, +/turf/simulated/floor/plating, +/area/maintenance/atmospherics) "uBA" = ( /obj/effect/decal/cleanable/dust, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -85404,6 +85416,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/toxins/storage) +"wHa" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod Airlock" + }, +/turf/simulated/floor/plating, +/area/maintenance/fsmaint) "wHj" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -95791,7 +95809,7 @@ ylx ylx ylx bQl -bWz +nXN bWz bZc jGQ @@ -97333,7 +97351,7 @@ ylx ylx ylx bQn -bWz +nXN bWz bZc cdW @@ -119286,7 +119304,7 @@ dcq dcq dcq dcq -dhv +uzE dcq dcq uTI @@ -126358,7 +126376,7 @@ aWw atG atG atG -avq +wHa atG atG atG @@ -126617,7 +126635,7 @@ uTI ylx avb ylx -atG +uTI uTI uTI uTI diff --git a/_maps/map_files/event/Station/delta_old.dmm b/_maps/map_files/event/Station/delta_old.dmm index 5c02720351d..8b36e3d014f 100644 --- a/_maps/map_files/event/Station/delta_old.dmm +++ b/_maps/map_files/event/Station/delta_old.dmm @@ -420,10 +420,6 @@ icon_state = "neutralfull" }, /area/hallway/secondary/entry/additional) -"aii" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry/westarrival) "aip" = ( /obj/structure/cable{ icon_state = "1-2" @@ -457,10 +453,6 @@ icon_state = "white" }, /area/toxins/lab) -"aiL" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry/eastarrival) "aiT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6900,9 +6892,6 @@ icon_state = "darkyellow" }, /area/engine/mechanic_workshop/hangar) -"bdu" = ( -/turf/simulated/floor/plating, -/area/construction/hallway) "bdz" = ( /obj/structure/closet/crate/freezer, /obj/item/radio/intercom{ @@ -119412,9 +119401,9 @@ aaa aaa aaa aaa -gXq -gXq -gXq +aaa +aaa +aaa aaa aaa aaa @@ -119668,11 +119657,11 @@ aaa aaa aaa aaa +aaa gXq gXq gXq -gXq -gXq +aaa aaa aaa aaa @@ -120696,11 +120685,11 @@ aaa aaa aaa aaa -aaa gXq -vAm gXq -aaa +gXq +gXq +gXq aaa aaa aaa @@ -120954,9 +120943,9 @@ aaa aaa aaa aaa -tOj -bdu -tOj +gXq +vAm +gXq aaa aaa aaa @@ -151445,12 +151434,12 @@ aaa aaa aaa aaa +aaa gXq gXq gXq gXq aaa -aaa agp agp ahS @@ -151701,6 +151690,7 @@ aaa aaa aaa aaa +aaa gXq gXq gXq @@ -151708,7 +151698,6 @@ gXq gXq gXq ahS -ahS alv axa aUB @@ -151958,13 +151947,13 @@ aaa aaa aaa aaa +aaa gXq gXq gXq gXq gXq ahe -aii dZo ayB amj @@ -152215,6 +152204,7 @@ aaa aaa aaa aaa +aaa gXq gXq gXq @@ -152222,7 +152212,6 @@ gXq gXq gXq ahS -ahS ahr aud aUC @@ -152473,11 +152462,11 @@ aaa aaa aaa aaa +aaa gXq gXq gXq gXq -aaa iGw agp agp @@ -156071,12 +156060,12 @@ aaa aaa aaa aaa +aaa gXq gXq gXq gXq aaa -iGw aiE ajN ala @@ -156327,6 +156316,7 @@ aaa aaa aaa aaa +aaa gXq gXq gXq @@ -156334,7 +156324,6 @@ gXq gXq gXq ala -ala alw awV apk @@ -156584,13 +156573,13 @@ aaa aaa aaa aaa +aaa gXq gXq gXq gXq gXq ahf -aiL agN ahs aml @@ -156841,6 +156830,7 @@ aaa aaa aaa aaa +aaa gXq gXq gXq @@ -156848,7 +156838,6 @@ gXq gXq gXq ala -ala ahv aNA apF @@ -157099,11 +157088,11 @@ aaa aaa aaa aaa +aaa gXq gXq gXq gXq -aaa arA arA arA @@ -168541,9 +168530,9 @@ qEC iGw aaa aaa -hLL -lsh -hLL +gXq +qGq +gXq aaa aaa iGw @@ -168797,11 +168786,11 @@ kud qEC iGw iGw -iGw gXq -qGq gXq -iGw +gXq +gXq +gXq iGw iGw hLL @@ -169825,11 +169814,11 @@ nop csj iGw aaa +aaa gXq gXq gXq -gXq -gXq +aaa aaa bCI aaa @@ -170083,9 +170072,9 @@ csj iGw aaa aaa -gXq -gXq -gXq +aaa +aaa +aaa aaa aaa aaa