From 3885f2acf4239cff0eb9c2d12f77d89243b7d6b1 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Erikafox@users.noreply.github.com> Date: Sun, 25 Jan 2026 17:50:14 -0500 Subject: [PATCH 01/17] Makes simplemobs not get stuck on railings (#5796) ## About The Pull Request Simplemobs will no longer get stuck bashing platforms and railings they can get over ## Changelog :cl: fix: simplemobs will no longer get stuck on railings when they're trying to kill you /:cl: --------- Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> Co-authored-by: Sarah C <93578146+SapphicOverload@users.noreply.github.com> --- code/game/objects/structures/platforms.dm | 6 ++++++ code/game/objects/structures/railings.dm | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/code/game/objects/structures/platforms.dm b/code/game/objects/structures/platforms.dm index 1514ffcb1a..7be02b60d8 100644 --- a/code/game/objects/structures/platforms.dm +++ b/code/game/objects/structures/platforms.dm @@ -183,6 +183,12 @@ return . || mover.throwing || mover.movement_type & (FLYING | FLOATING) return TRUE +/obj/structure/platform/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/requester) + if (!(to_dir & dir)) + return TRUE + return ..() + + /obj/structure/platform/proc/on_exit(datum/source, atom/movable/leaving, direction) SIGNAL_HANDLER diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index dcbe15a7f8..68e450ec88 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -105,6 +105,11 @@ return . || mover.throwing || mover.movement_type & (FLYING | FLOATING) return TRUE +/obj/structure/railing/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/requester) + if (!(to_dir & dir)) + return TRUE + return ..() + /obj/structure/railing/proc/on_exit(datum/source, atom/movable/leaving, direction) SIGNAL_HANDLER From 5494f97d11cc1badd690d8a3f2f3ad3bbd139226 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 25 Jan 2026 17:29:42 -0600 Subject: [PATCH 02/17] Automatic changelog generation for PR #5796 [ci skip] --- html/changelogs/AutoChangeLog-pr-5796.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5796.yml diff --git a/html/changelogs/AutoChangeLog-pr-5796.yml b/html/changelogs/AutoChangeLog-pr-5796.yml new file mode 100644 index 0000000000..1662b0f786 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5796.yml @@ -0,0 +1,5 @@ +author: Erikafox +changes: + - {bugfix: simplemobs will no longer get stuck on railings when they're trying + to kill you} +delete-after: true From ac164d6277533cc9e87cffba41d5134895ec18e2 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 26 Jan 2026 01:26:20 +0000 Subject: [PATCH 03/17] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5768.yml | 4 ---- html/changelogs/AutoChangeLog-pr-5796.yml | 5 ----- html/changelogs/archive/2026-01.yml | 6 ++++++ 3 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5768.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5796.yml diff --git a/html/changelogs/AutoChangeLog-pr-5768.yml b/html/changelogs/AutoChangeLog-pr-5768.yml deleted file mode 100644 index 7cf39e8ce3..0000000000 --- a/html/changelogs/AutoChangeLog-pr-5768.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: DIB-DOG -changes: - - {rscadd: remaps the Dwayne} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-5796.yml b/html/changelogs/AutoChangeLog-pr-5796.yml deleted file mode 100644 index 1662b0f786..0000000000 --- a/html/changelogs/AutoChangeLog-pr-5796.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Erikafox -changes: - - {bugfix: simplemobs will no longer get stuck on railings when they're trying - to kill you} -delete-after: true diff --git a/html/changelogs/archive/2026-01.yml b/html/changelogs/archive/2026-01.yml index 27fd34c32c..96bae90c95 100644 --- a/html/changelogs/archive/2026-01.yml +++ b/html/changelogs/archive/2026-01.yml @@ -131,3 +131,9 @@ over the below tile with their legs or not even reaching the bottom edge of the tile they're on. - rscadd: deep water swimming w/ immersive drowning +2026-01-26: + DIB-DOG: + - rscadd: remaps the Dwayne + Erikafox: + - bugfix: simplemobs will no longer get stuck on railings when they're trying to + kill you From 4a89d8338e449094ccaa87fbf7a85e5051ca5cce Mon Sep 17 00:00:00 2001 From: generalthrax <139387950+generalthrax@users.noreply.github.com> Date: Thu, 29 Jan 2026 14:22:23 -0800 Subject: [PATCH 04/17] Replaces a single eoehoma cell on Mining installation with a sharplite one (normal) (#5831) ## Why It's Good For The Game right cell ## Changelog :cl: fix: Added right cell to Mining Facility /:cl: --- _maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm b/_maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm index 0175246c00..83fdb13ede 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm @@ -6777,12 +6777,12 @@ }, /obj/effect/turf_decal/borderfloor/corner, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/item/stock_parts/cell/gun/empty, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/item/stock_parts/cell/gun/sharplite, /turf/open/floor/plasteel/patterned/rockplanet/lit, /area/overmap_encounter/planetoid/rockplanet/explored) "Lw" = ( From 211e690c3c74292f1856c68758b2c85d664d7116 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 29 Jan 2026 16:43:43 -0600 Subject: [PATCH 05/17] Automatic changelog generation for PR #5831 [ci skip] --- html/changelogs/AutoChangeLog-pr-5831.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5831.yml diff --git a/html/changelogs/AutoChangeLog-pr-5831.yml b/html/changelogs/AutoChangeLog-pr-5831.yml new file mode 100644 index 0000000000..26177f0465 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5831.yml @@ -0,0 +1,4 @@ +author: generalthrax +changes: + - {bugfix: Added right cell to Mining Facility} +delete-after: true From 99d2b1647c8dc7e80668fcee2a89df120f32af6e Mon Sep 17 00:00:00 2001 From: generalthrax <139387950+generalthrax@users.noreply.github.com> Date: Thu, 29 Jan 2026 14:23:29 -0800 Subject: [PATCH 06/17] Replaces Mead Bottle with actual Mead (#5839) ## About The Pull Request It was beer before but it is mead now ## Why It's Good For The Game -look inside mead -beer ## Changelog :cl: add: Mead bottles now contain mead /:cl: --- .../RandomRuins/BeachRuins/beach_gunsmith.dmm | 5 +-- .../IceRuins/icemoon_downed_transport.dmm | 5 +-- .../IceRuins/icemoon_training_center.dmm | 5 +-- .../JungleRuins/jungle_cavecrew.dmm | 5 +-- .../lavaland_abandonedlisteningpost.dmm | 21 +++--------- .../lavaland_surface_wrecked_factory.dmm | 6 ++-- .../RockRuins/rockplanet_distillery.dmm | 10 ++---- .../rockplanet_mining_installation.dmm | 30 ++++------------- .../RockRuins/rockplanet_rustbase.dmm | 14 ++------ .../SandRuins/whitesands_nomads_stop.dmm | 15 ++------- .../whitesands_surface_camp_saloon.dmm | 2 +- .../whitesands_surface_e11_manufactory.dmm | 5 +-- .../WasteRuins/wasteplanet_recyclebay.dmm | 5 +-- _maps/map_files/generic/CentCom.dmm | 5 +-- _maps/outpost/indie_space.dmm | 10 ++---- _maps/outpost/ngr_rock.dmm | 33 ++++--------------- .../independent/independent_firefly.dmm | 15 ++------- .../shuttles/independent/independent_kilo.dmm | 23 +++---------- .../independent/independent_rhode.dmm | 10 ++---- .../independent/independent_venetia.dmm | 10 ++---- _maps/shuttles/nanotrasen/nanotrasen_kiwi.dmm | 6 +--- _maps/shuttles/pirate/pirate_roach.dmm | 10 ++---- _maps/shuttles/pirate/pirate_tortuga.dmm | 5 +-- .../subshuttles/independent_sugarcube.dmm | 4 +-- .../syndicate/syndicate_ngr_kaliandhi.dmm | 10 ++---- code/game/objects/items/storage/sixpack.dm | 6 ++-- .../crates_lockers/closets/secure/freezer.dm | 2 +- code/modules/food_and_drinks/drinks/drinks.dm | 9 ++--- tools/UpdatePaths/Scripts/5839_mead.txt | 2 ++ 29 files changed, 68 insertions(+), 220 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/5839_mead.txt diff --git a/_maps/RandomRuins/BeachRuins/beach_gunsmith.dmm b/_maps/RandomRuins/BeachRuins/beach_gunsmith.dmm index 3a2cd1f0ae..370b7aa219 100644 --- a/_maps/RandomRuins/BeachRuins/beach_gunsmith.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_gunsmith.dmm @@ -1820,10 +1820,7 @@ /turf/open/floor/plasteel/mono/dark, /area/ruin/beach/gunsmith/workshop) "qT" = ( -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 12; - pixel_y = -6 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/wood/walnut, /area/ruin/beach/gunsmith) "qV" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_downed_transport.dmm b/_maps/RandomRuins/IceRuins/icemoon_downed_transport.dmm index 4b3987c3ce..c6bd3a8941 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_downed_transport.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_downed_transport.dmm @@ -1702,10 +1702,7 @@ /obj/machinery/jukebox/boombox{ pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 11; - pixel_x = -9 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/carpet/blue, /area/ruin/unpowered/icemoon/downed_transport/barracks) "mt" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_training_center.dmm b/_maps/RandomRuins/IceRuins/icemoon_training_center.dmm index 7a0e06eaf3..9426f6d88a 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_training_center.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_training_center.dmm @@ -9246,10 +9246,7 @@ pixel_x = 0; pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 3; - pixel_y = 10 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/wood, /area/ruin/icemoon/training_facility/office_2) "SW" = ( diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm index 4dd7b8dad1..7dca71a192 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm @@ -408,10 +408,7 @@ pixel_x = 10; pixel_y = 0 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -10; - pixel_y = 15 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plasteel/dark/jungleplanet, /area/ruin/jungle/cavecrew/dormitories) "cn" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm index e618170805..0648b88aa2 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm @@ -1582,10 +1582,7 @@ pixel_y = 17; pixel_x = 4 }, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_y = 16; - pixel_x = -9 - }, +/obj/item/reagent_containers/food/drinks/beer, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/patterned/cargo_one, /area/ruin/unpowered/listening_post/canteen) @@ -1607,15 +1604,8 @@ /area/ruin/unpowered/listening_post) "DI" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 8; - pixel_x = 6 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 6; - pixel_x = -7; - list_reagents = null - }, +/obj/item/reagent_containers/food/drinks/mead, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plating/asteroid/basalt/lava, /area/ruin/unpowered) "DS" = ( @@ -1859,10 +1849,7 @@ pixel_y = -27; pixel_x = 1 }, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_y = 10; - pixel_x = 8 - }, +/obj/item/reagent_containers/food/drinks/beer, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm index 8921246e1e..3f87d232f4 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm @@ -699,9 +699,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/beer/light, -/obj/item/reagent_containers/food/drinks/beer/light, -/obj/item/reagent_containers/food/drinks/beer/light, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /obj/item/food/meat/slab, /obj/item/food/meat/slab, /obj/item/food/meat/slab, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm index 4acba6a564..4e2281e35b 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm @@ -2624,10 +2624,7 @@ dir = 1; layer = 2.7 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 4; - pixel_y = 8 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/item/reagent_containers/food/drinks/mug/coco{ pixel_x = -6; pixel_y = 8 @@ -4053,10 +4050,7 @@ pixel_x = -3; pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 6; - pixel_y = 8 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/wood/rockplanet, /area/ruin/rockplanet/distillery/saloon) "Uo" = ( diff --git a/_maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm b/_maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm index 83fdb13ede..fd006a76d9 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm @@ -512,10 +512,7 @@ /obj/effect/turf_decal/corner/opaque/white/diagonal{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_x = 3; - pixel_y = 9 - }, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plasteel, /area/ruin/rockplanet/mining_base/canteen) "cY" = ( @@ -1244,10 +1241,7 @@ pixel_x = -7; pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -5; - pixel_y = 5 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plasteel/mono, /area/ruin/rockplanet/mining_base/canteen) "gJ" = ( @@ -1679,10 +1673,7 @@ /area/ruin/rockplanet/mining_base/refinery) "jc" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -2; - pixel_y = 14 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plasteel/mono, /area/ruin/rockplanet/mining_base/canteen) "jg" = ( @@ -2879,10 +2870,7 @@ /area/ruin/rockplanet/mining_base/refinery) "pO" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 6; - pixel_y = 11 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = -11 @@ -6233,10 +6221,7 @@ /area/ruin/rockplanet/mining_base/engineering) "Ib" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 6; - pixel_y = 11 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/item/food/meat/steak/chicken{ pixel_x = -6; pixel_y = -2 @@ -6261,10 +6246,7 @@ /obj/effect/turf_decal/corner/opaque/white/diagonal{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_x = -5; - pixel_y = 6 - }, +/obj/item/reagent_containers/food/drinks/beer, /obj/item/food/meat/steak/chicken{ pixel_x = 3; pixel_y = -5 diff --git a/_maps/RandomRuins/RockRuins/rockplanet_rustbase.dmm b/_maps/RandomRuins/RockRuins/rockplanet_rustbase.dmm index 6ad2ac138f..181cf6a204 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_rustbase.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_rustbase.dmm @@ -782,10 +782,7 @@ pixel_y = 2; pixel_x = 4 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -8; - pixel_y = 8 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/carpet/red, /area/ruin/rockplanet/rust_base/dorms) "ir" = ( @@ -4049,13 +4046,8 @@ /area/ruin/rockplanet/rust_base/engine_one) "Qq" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 16 - }, +/obj/item/reagent_containers/food/drinks/mead, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/carpet/red, /area/ruin/rockplanet/rust_base/dorms) "Qx" = ( diff --git a/_maps/RandomRuins/SandRuins/whitesands_nomads_stop.dmm b/_maps/RandomRuins/SandRuins/whitesands_nomads_stop.dmm index caff6b11b4..24f8f22376 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_nomads_stop.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_nomads_stop.dmm @@ -353,10 +353,7 @@ "ek" = ( /obj/structure/table, /obj/machinery/newscaster/directional/north, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 6; - pixel_x = 11 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/item/food/kebab/miras{ pixel_x = -5; pixel_y = -3 @@ -1230,10 +1227,7 @@ pixel_y = 4; pixel_x = -5 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 7; - pixel_x = 8 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/carpet, /area/ruin/whitesands/nomad_stop/food) "mc" = ( @@ -4963,10 +4957,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_x = 10; - pixel_y = -3 - }, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/concrete/slab_1/whitesands/lit, /area/overmap_encounter/planetoid/sand/explored) "Yp" = ( diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm index bd958b92d2..095b961ace 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm @@ -269,7 +269,7 @@ /area/ruin/whitesands/saloon) "hp" = ( /obj/structure/table/wood/poker, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/carpet, /area/ruin/whitesands/saloon) "hr" = ( diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_e11_manufactory.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_e11_manufactory.dmm index fa17ae6ad0..f420d8d767 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_e11_manufactory.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_e11_manufactory.dmm @@ -5305,10 +5305,7 @@ pixel_y = 5; pixel_x = 12 }, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_y = -15; - pixel_x = -9 - }, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/concrete/whitesands/lit, /area/overmap_encounter/planetoid/sand/explored) "SO" = ( diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_recyclebay.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_recyclebay.dmm index 7a366f9013..7efd708ff0 100644 --- a/_maps/RandomRuins/WasteRuins/wasteplanet_recyclebay.dmm +++ b/_maps/RandomRuins/WasteRuins/wasteplanet_recyclebay.dmm @@ -2103,10 +2103,7 @@ /area/ruin/wasteplanet/recycle_bay/salvage_bay) "oc" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 9; - pixel_y = 6 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plating, /area/ruin/wasteplanet/recycle_bay/security) "og" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index c8ae944e88..2874eb1379 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -8909,10 +8909,7 @@ /area/centcom/control) "gYy" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 5; - pixel_y = -2 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/item/toy/cards/deck/syndicate{ pixel_x = -6; pixel_y = 6 diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm index be81e80862..7917f37e97 100644 --- a/_maps/outpost/indie_space.dmm +++ b/_maps/outpost/indie_space.dmm @@ -811,10 +811,7 @@ /obj/structure/platform/wood_two/corner{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 5; - pixel_x = -7 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/grimy, /area/outpost/maintenance/starboard) @@ -5268,10 +5265,7 @@ "ul" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 11; - pixel_x = 8 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plasteel/grimy, /area/outpost/maintenance/starboard) "un" = ( diff --git a/_maps/outpost/ngr_rock.dmm b/_maps/outpost/ngr_rock.dmm index 9555820e4c..468ef9f770 100644 --- a/_maps/outpost/ngr_rock.dmm +++ b/_maps/outpost/ngr_rock.dmm @@ -472,10 +472,7 @@ /area/outpost/engineering/atmospherics) "bH" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 10; - pixel_x = 12 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/effect/turf_decal/techfloor{ layer = 2.04 }, @@ -1327,9 +1324,7 @@ pixel_y = -3; pixel_x = 10 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 10 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plating, /area/outpost/maintenance/central) "fE" = ( @@ -2495,17 +2490,9 @@ "ks" = ( /obj/structure/table/wood, /obj/machinery/light/directional/north, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 3 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 7; - pixel_x = -8 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 7; - pixel_x = 13 - }, +/obj/item/reagent_containers/food/drinks/mead, +/obj/item/reagent_containers/food/drinks/mead, +/obj/item/reagent_containers/food/drinks/mead, /obj/effect/turf_decal/corner/opaque/tan{ dir = 5 }, @@ -4709,10 +4696,7 @@ pixel_y = 6; pixel_x = 4 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 3; - pixel_x = -9 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plating, /area/outpost/maintenance/central) "sC" = ( @@ -5014,10 +4998,7 @@ /turf/open/floor/plasteel/tech, /area/outpost/crew) "tG" = ( -/obj/item/reagent_containers/food/drinks/beer{ - pixel_y = 14; - pixel_x = -4 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/effect/turf_decal/corner/opaque/tan{ dir = 10 }, diff --git a/_maps/shuttles/independent/independent_firefly.dmm b/_maps/shuttles/independent/independent_firefly.dmm index 010dbeef73..3ac2dbb723 100644 --- a/_maps/shuttles/independent/independent_firefly.dmm +++ b/_maps/shuttles/independent/independent_firefly.dmm @@ -926,14 +926,8 @@ /area/ship/crew/ccommons) "ky" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_x = 7; - pixel_y = -3 - }, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /obj/effect/decal/cleanable/glass, /turf/open/floor/wood/walnut, /area/ship/crew/ccommons) @@ -1004,10 +998,7 @@ /area/ship/hallway/aft) "lV" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_x = -2; - pixel_y = 6 - }, +/obj/item/reagent_containers/food/drinks/beer, /obj/machinery/newscaster/directional/south, /turf/open/floor/wood/walnut, /area/ship/crew/ccommons) diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm index 9375f58dfc..14d657e1f2 100644 --- a/_maps/shuttles/independent/independent_kilo.dmm +++ b/_maps/shuttles/independent/independent_kilo.dmm @@ -149,11 +149,7 @@ icon_state = "4-6" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/item/reagent_containers/food/drinks/beer{ - list_reagents = null; - pixel_x = -14; - pixel_y = 5 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/effect/turf_decal/corner/opaque/black{ dir = 1 }, @@ -421,11 +417,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/item/reagent_containers/food/drinks/beer{ - list_reagents = list(/datum/reagent/consumable/ethanol/beer = 10); - pixel_x = -6; - pixel_y = 7 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plasteel/grimy, /area/ship/crew) "cB" = ( @@ -1016,11 +1008,7 @@ dir = 8 }, /obj/item/stack/sheet/mineral/plasma/ten, -/obj/item/reagent_containers/food/drinks/beer{ - list_reagents = null; - pixel_x = -13; - pixel_y = 11 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plating, /area/ship/engineering) "pV" = ( @@ -2041,10 +2029,7 @@ /obj/structure/dresser{ dir = 1 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -9; - pixel_y = 12 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) diff --git a/_maps/shuttles/independent/independent_rhode.dmm b/_maps/shuttles/independent/independent_rhode.dmm index 51a4c861e6..20efcfb764 100644 --- a/_maps/shuttles/independent/independent_rhode.dmm +++ b/_maps/shuttles/independent/independent_rhode.dmm @@ -533,14 +533,8 @@ pixel_x = 15; pixel_y = 1 }, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_x = -9; - pixel_y = 2 - }, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_x = 3; - pixel_y = 6 - }, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/ship/cargo) diff --git a/_maps/shuttles/independent/independent_venetia.dmm b/_maps/shuttles/independent/independent_venetia.dmm index 4f11dc0a25..00852d4ab1 100644 --- a/_maps/shuttles/independent/independent_venetia.dmm +++ b/_maps/shuttles/independent/independent_venetia.dmm @@ -477,10 +477,7 @@ /area/ship/crew/canteen/kitchen) "eO" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_x = 9; - pixel_y = 6 - }, +/obj/item/reagent_containers/food/drinks/beer, /obj/item/toy/cards/deck{ pixel_x = -15; pixel_y = 9 @@ -4506,10 +4503,7 @@ /area/ship/engineering) "Vz" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/food/drinks/beer/light{ - pixel_x = 7; - pixel_y = 5 - }, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/carpet/green, /area/ship/crew/dorm/dormtwo) "VJ" = ( diff --git a/_maps/shuttles/nanotrasen/nanotrasen_kiwi.dmm b/_maps/shuttles/nanotrasen/nanotrasen_kiwi.dmm index c4ab8f4dce..8d388b6d7c 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_kiwi.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_kiwi.dmm @@ -1312,11 +1312,7 @@ pixel_y = 5; pixel_x = -8 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 9; - pixel_y = 4; - list_reagents = null - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plasteel, /area/ship/crew/canteen) "iW" = ( diff --git a/_maps/shuttles/pirate/pirate_roach.dmm b/_maps/shuttles/pirate/pirate_roach.dmm index 9e37443f9b..80bf0583b8 100644 --- a/_maps/shuttles/pirate/pirate_roach.dmm +++ b/_maps/shuttles/pirate/pirate_roach.dmm @@ -634,10 +634,7 @@ pixel_x = 4; pixel_y = -9 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -5; - pixel_y = 5 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/plasteel/tech/techmaint, /area/ship/cargo) @@ -2878,10 +2875,7 @@ /area/ship/security/prison) "KB" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 11; - pixel_y = 9 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/effect/turf_decal/spline/fancy/opaque/black, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/cell_charger{ diff --git a/_maps/shuttles/pirate/pirate_tortuga.dmm b/_maps/shuttles/pirate/pirate_tortuga.dmm index 640a22c7ed..c4f42e9974 100644 --- a/_maps/shuttles/pirate/pirate_tortuga.dmm +++ b/_maps/shuttles/pirate/pirate_tortuga.dmm @@ -270,10 +270,7 @@ pixel_x = -9; dir = 8 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -6; - pixel_y = -3 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "ci" = ( diff --git a/_maps/shuttles/subshuttles/independent_sugarcube.dmm b/_maps/shuttles/subshuttles/independent_sugarcube.dmm index 99fe7cdee5..c3d6f1d3fe 100644 --- a/_maps/shuttles/subshuttles/independent_sugarcube.dmm +++ b/_maps/shuttles/subshuttles/independent_sugarcube.dmm @@ -62,8 +62,8 @@ /obj/item/trash/cheesie, /obj/item/trash/candy, /obj/structure/closet/crate, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/mead, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/plating, /area/ship/storage) "i" = ( diff --git a/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm b/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm index d16e6a018c..c67f1ef720 100644 --- a/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm +++ b/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm @@ -3001,19 +3001,13 @@ icon_state = "4-8" }, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -8; - pixel_y = 4 - }, +/obj/item/reagent_containers/food/drinks/mead, /obj/item/toy/cards/deck/tarot, /obj/item/toy/figure/syndie{ pixel_x = 4; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 9; - pixel_y = -4 - }, +/obj/item/reagent_containers/food/drinks/mead, /turf/open/floor/carpet/red, /area/ship/crew) "qk" = ( diff --git a/code/game/objects/items/storage/sixpack.dm b/code/game/objects/items/storage/sixpack.dm index 1a229909aa..cf336d5568 100644 --- a/code/game/objects/items/storage/sixpack.dm +++ b/code/game/objects/items/storage/sixpack.dm @@ -39,9 +39,9 @@ new /obj/item/reagent_containers/food/drinks/soda_cans/cola(src) /obj/item/storage/cans/sixbeer - name = "beer bottle ring" - desc = "Holds six beer bottles. Remember to recycle when you're done!" + name = "mead bottle ring" + desc = "Holds six mead bottles. Remember to recycle when you're done!" /obj/item/storage/cans/sixbeer/PopulateContents() for(var/i in 1 to 6) - new /obj/item/reagent_containers/food/drinks/beer(src) + new /obj/item/reagent_containers/food/drinks/mead(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index b37640dfb4..d0694b758d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -73,7 +73,7 @@ /obj/structure/closet/secure_closet/freezer/gulag_fridge/PopulateContents() ..() for(var/i in 1 to 3) - new /obj/item/reagent_containers/food/drinks/beer/light(src) + new /obj/item/reagent_containers/food/drinks/beer(src) /obj/structure/closet/secure_closet/freezer/fridge name = "refrigerator" diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 6537053a79..c1e9e8a5f9 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -369,18 +369,19 @@ desc += span_notice("The writing reads '[random_reagent.name]'.") update_appearance() -/obj/item/reagent_containers/food/drinks/beer - name = "Bizircan Brewery GDM" //ditto the plan for bottled water, need to find a way to make multiple variants +/obj/item/reagent_containers/food/drinks/mead + name = "Bizircan Brewery Dark Mead" //ditto the plan for bottled water, need to find a way to make multiple variants desc = "A popular Gezenan drink made of fermented honey and spices, known as Gezenan Dark Mead, or GDM for short." icon_state = "beer" - list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30) + list_reagents = list(/datum/reagent/consumable/ethanol/mead = 30) foodtype = SUGAR | ALCOHOL custom_price = 10 -/obj/item/reagent_containers/food/drinks/beer/light +/obj/item/reagent_containers/food/drinks/beer name = "Carp Lite" desc = "Brewed with \"Pure Ice Asteroid Spring Water\"." list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30) + icon_state = "beer" /obj/item/reagent_containers/food/drinks/ale name = "RHIMBASA TAP" diff --git a/tools/UpdatePaths/Scripts/5839_mead.txt b/tools/UpdatePaths/Scripts/5839_mead.txt new file mode 100644 index 0000000000..6af6fa0221 --- /dev/null +++ b/tools/UpdatePaths/Scripts/5839_mead.txt @@ -0,0 +1,2 @@ +/obj/item/reagent_containers/food/drinks/beer : /obj/item/reagent_containers/food/drinks/mead {@OLD} +/obj/item/reagent_containers/food/drinks/beer/light : /obj/item/reagent_containers/food/drinks/beer {@OLD} From fabedda6f577631b00b97ad219e96ecb75f052b6 Mon Sep 17 00:00:00 2001 From: DIB-DOG Date: Thu, 29 Jan 2026 16:23:46 -0600 Subject: [PATCH 07/17] Changes a vent on the updated Dwayne because we found a fix too late (#5832) ## About The Pull Request Changes the recycling vent from a purely passive to a toggleable passive vent. It really was that easy. Also adds a radiation first aid kit because I forgor. ## Why It's Good For The Game Easy solution to a problem on the remapped Dwayne that came too late. Fixing said compromise will ultimately help the ship run better. ## Changelog :cl: add: Added a different vent to the Dwayne /:cl: --- .../independent/independent_dwayne.dmm | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index e9a7546bf3..6621cfa03f 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -1864,6 +1864,10 @@ pixel_x = -9; pixel_y = -8 }, +/obj/item/storage/belt/mining/alt{ + pixel_x = -8; + pixel_y = -2 + }, /obj/item/storage/guncase/pistol/candor{ pixel_x = -8; pixel_y = -9; @@ -1931,16 +1935,7 @@ "rE" = ( /obj/structure/closet/crate/medical, /obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/storage/firstaid/regular, /obj/item/roller, -/obj/item/reagent_containers/hypospray/medipen/survival, -/obj/item/reagent_containers/hypospray/medipen/survival{ - pixel_y = -4 - }, -/obj/item/storage/pill_bottle/charcoal/less{ - pixel_x = -6; - pixel_y = -2 - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, @@ -1951,6 +1946,16 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, +/obj/item/storage/firstaid/radiation, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_containers/hypospray/medipen/survival, +/obj/item/reagent_containers/hypospray/medipen/survival{ + pixel_y = -4 + }, +/obj/item/storage/pill_bottle/charcoal/less{ + pixel_x = -6; + pixel_y = -2 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) "rQ" = ( @@ -2858,12 +2863,11 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) "zB" = ( -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 2; - piping_layer = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 2 }, /turf/open/floor/engine/hull/reinforced, -/area/ship/external/dark) +/area/ship/engineering/atmospherics) "zC" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -3887,7 +3891,7 @@ dir = 1 }, /turf/open/floor/engine/hull/reinforced, -/area/ship/external/dark) +/area/ship/engineering) "IZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" From 731607475f1be32a6cb71e4fea8758b96959ac07 Mon Sep 17 00:00:00 2001 From: generalthrax <139387950+generalthrax@users.noreply.github.com> Date: Thu, 29 Jan 2026 14:30:37 -0800 Subject: [PATCH 08/17] Removes Anomalous Crystal + Gas Leak from Jungle Paradise (#5822) ## Why It's Good For The Game no fucked up atmos + no ghost roles without admin input ## Changelog :cl: del: Removed Anomalous Crystal from Jungle Paradise fix: Jungle Paradise no longer has a gas leak /:cl: --------- Signed-off-by: generalthrax <139387950+generalthrax@users.noreply.github.com> --- .../JungleRuins/jungle_paradise.dmm | 148 ++++++------------ 1 file changed, 48 insertions(+), 100 deletions(-) diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm index eb27ab81a6..3f79e19d3a 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm @@ -378,12 +378,6 @@ }, /turf/open/floor/wood, /area/overmap_encounter/planetoid/cave/explored) -"cU" = ( -/obj/structure/lattice/clockwork{ - icon_state = "lattice-5" - }, -/turf/open/water/jungle, -/area/overmap_encounter/planetoid/cave/explored) "cX" = ( /obj/structure/rack, /obj/item/crowbar, @@ -654,10 +648,6 @@ }, /turf/open/floor/plating/asteroid/dirt/jungle/dark, /area/overmap_encounter/planetoid/cave/explored) -"fd" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/asteroid/waterplanet, -/area/overmap_encounter/planetoid/cave/explored) "fh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/sand, @@ -784,7 +774,7 @@ /obj/structure/geyser/random, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/asteroid/waterplanet, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/cave/explored) "gc" = ( /obj/item/stack/rods{ @@ -3644,12 +3634,6 @@ /obj/structure/spacevine, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/cave/explored) -"zM" = ( -/obj/structure/lattice/clockwork{ - icon_state = "lattice-137" - }, -/turf/open/water/jungle, -/area/overmap_encounter/planetoid/cave/explored) "zN" = ( /obj/effect/turf_decal/sand, /obj/effect/decal/cleanable/dirt/dust, @@ -4043,7 +4027,7 @@ "Dh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plating/asteroid/waterplanet, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/cave/explored) "Dl" = ( /obj/machinery/light/directional/west, @@ -4208,12 +4192,6 @@ /obj/structure/closet/crate/solarpanel_small, /turf/open/floor/plasteel/tech/grid, /area/ruin/jungle/paradise/cargo) -"Ep" = ( -/obj/structure/lattice/clockwork{ - icon_state = "lattice-10" - }, -/turf/open/water/jungle, -/area/overmap_encounter/planetoid/cave/explored) "Eq" = ( /obj/structure/flora/rock/jungle, /turf/open/floor/plating/asteroid/dirt/jungle/dark, @@ -4413,12 +4391,6 @@ }, /turf/open/floor/pod, /area/ruin/jungle/paradise/comms) -"Fw" = ( -/obj/structure/flora/rock/crystal{ - layer = 5 - }, -/turf/open/water/jungle, -/area/overmap_encounter/planetoid/cave/explored) "Fx" = ( /obj/structure/fence/door{ color = "#A47449" @@ -4455,12 +4427,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium/red/brig, /area/overmap_encounter/planetoid/cave/explored) -"FQ" = ( -/obj/structure/lattice/clockwork{ - icon_state = "lattice-3" - }, -/turf/open/water/jungle, -/area/overmap_encounter/planetoid/cave/explored) "FT" = ( /obj/structure/flora/ausbushes/stalkybush{ pixel_x = 4; @@ -5415,9 +5381,6 @@ }, /turf/open/floor/plating/asteroid/dirt/jungle/dark, /area/overmap_encounter/planetoid/jungle/explored) -"Ni" = ( -/turf/open/floor/plating/ashplanet/rocky, -/area/overmap_encounter/planetoid/cave/explored) "Nj" = ( /obj/machinery/telecomms/server/presets, /obj/effect/turf_decal/techfloor{ @@ -5887,7 +5850,7 @@ /area/overmap_encounter/planetoid/cave/explored) "Ri" = ( /obj/machinery/light/directional/south, -/turf/open/floor/plating/ashplanet/rocky, +/turf/open/floor/plating/asteroid/dirt/jungle/dark, /area/overmap_encounter/planetoid/cave/explored) "Rl" = ( /obj/effect/decal/cleanable/dirt, @@ -6045,16 +6008,6 @@ }, /turf/open/water/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Sx" = ( -/obj/structure/lattice/clockwork{ - icon_state = "lattice-12" - }, -/turf/open/water/jungle, -/area/overmap_encounter/planetoid/cave/explored) -"Sy" = ( -/obj/machinery/anomalous_crystal/helpers, -/turf/open/water/jungle, -/area/overmap_encounter/planetoid/cave/explored) "SB" = ( /obj/machinery/conveyor{ dir = 8; @@ -6413,7 +6366,7 @@ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/crystal, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/asteroid/waterplanet, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/cave/explored) "Vw" = ( /obj/structure/flora/tree/jungle/small{ @@ -7048,12 +7001,6 @@ }, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"ZI" = ( -/obj/structure/lattice/clockwork{ - icon_state = "lattice-6" - }, -/turf/open/water/jungle, -/area/overmap_encounter/planetoid/cave/explored) "ZO" = ( /obj/structure/flora/rock/pile/largejungle{ pixel_x = -33; @@ -9904,7 +9851,7 @@ Iw Iw Iw Iw -Fw +UO eC EY Iw @@ -10374,6 +10321,7 @@ Iw pL UO eC +UO Jt fV eC @@ -10439,9 +10387,9 @@ Iw Iw kt kt -ZI -FQ -cU +eC +eC +eC eC eC eC @@ -10507,9 +10455,9 @@ Iw Dh eC UO -Sx -Sy -Sx +eC +eC +eC eC eC eC @@ -10572,15 +10520,15 @@ Iw Iw Iw Iw -fd +eJ +eC +eC +eC eC eC -Ep -FQ -zM Jt eC -Rp +pL Iw Iw Iw @@ -10647,8 +10595,8 @@ fm eC UO eC -Rp -Rp +pL +pL Iw Iw Iw @@ -10708,14 +10656,14 @@ Iw Iw Iw Iw -fd -Rp +eJ +pL eC eC eC eC eC -Rp +pL Iw Iw Iw @@ -10776,14 +10724,14 @@ Iw Iw Iw Iw -fd +eJ Vs qm eC -Rp -Rp -Rp -Rp +pL +pL +pL +pL Iw Iw Iw @@ -10844,11 +10792,11 @@ Iw Iw Iw Iw -Rp +pL XV eU QY -fd +eJ eU GW Cg @@ -10916,7 +10864,7 @@ MG eU pL GW -fd +eJ pL uU CJ @@ -11270,7 +11218,7 @@ eJ eJ eU kt -Ni +kt Iw Iw Iw @@ -11337,8 +11285,8 @@ eU kt kt kt -Ni -Ni +kt +kt Iw Iw Iw @@ -11398,14 +11346,14 @@ Iw ki pL Iw -Ni -Ni -Ni -Ni -Ni -Ni -Ni -Ni +kt +kt +kt +kt +kt +kt +kt +kt Ri DI Iw @@ -11468,13 +11416,13 @@ Iw Iw Iw Iw -Ni -Ni -Ni +kt +kt +kt Iw -Ni -Ni -Ni +kt +kt +kt Iw Iw Iw @@ -11541,7 +11489,7 @@ Iw Iw Iw Iw -Ni +kt Iw Iw Iw From 98923982a9f0616226b79aef35cae491d7622278 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Erikafox@users.noreply.github.com> Date: Thu, 29 Jan 2026 17:31:25 -0500 Subject: [PATCH 09/17] Minor Atira Interior Update (#5725) ## About The Pull Request image Improves the Atira's interior. Adds a secondary entrance, moves the chem lab to its own room, and makes the central area a treatment zone ## Changelog :cl: add: Atira interior expansion /:cl: --- .../independent/independent_atira.dmm | 2488 ++++++++++------- 1 file changed, 1405 insertions(+), 1083 deletions(-) diff --git a/_maps/shuttles/independent/independent_atira.dmm b/_maps/shuttles/independent/independent_atira.dmm index e9d3d0f8fd..a4a36c4d28 100644 --- a/_maps/shuttles/independent/independent_atira.dmm +++ b/_maps/shuttles/independent/independent_atira.dmm @@ -1,17 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ad" = ( -/obj/effect/turf_decal/corner_steel_grid/full, -/obj/structure/table/reinforced, -/obj/machinery/airalarm/directional/west, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/fax/indie{ - pixel_y = 9 - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/cargo) +/turf/open/floor/plasteel, +/area/ship/crew/ccommons) "am" = ( /obj/structure/toilet{ dir = 8; @@ -32,48 +22,42 @@ specialfunctions = 4 }, /turf/open/floor/plastic, -/area/ship/hallway/central) -"ap" = ( -/obj/structure/table/chem, -/obj/effect/turf_decal/trimline/opaque/blue/filled/corner, -/obj/effect/turf_decal/corner/opaque/blue/border{ - dir = 9 - }, -/obj/item/storage/box/beakers{ - pixel_x = 7; - pixel_y = 1 +/area/ship/crew/toilet) +"be" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 }, -/obj/item/storage/box/beakers{ - pixel_x = -7; - pixel_y = 7 +/obj/structure/table/chem, +/obj/structure/sink/chem{ + pixel_y = -5; + pixel_x = -5 }, -/turf/open/floor/plasteel/mono/dark, +/turf/open/floor/mineral/titanium/white, /area/ship/medical) -"be" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{ - dir = 8 - }, -/obj/effect/turf_decal/atmos/air, -/obj/machinery/air_sensor/atmos{ - pixel_x = 11; - pixel_y = -10; - id_tag = "atira_air" +"bu" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 }, -/turf/open/floor/engine/air, -/area/ship/engineering/engine) +/turf/open/floor/wood/birch, +/area/ship/crew/ccommons) "bx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/crew/cryo) "bz" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/bridge) "cq" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-8" }, +/obj/machinery/holopad, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "cv" = ( @@ -116,7 +100,9 @@ /turf/open/floor/hangar/plasteel/white, /area/ship/medical/surgery) "da" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/closet/secure_closet/freezer/fridge{ + populate = 0 + }, /obj/effect/turf_decal/corner_steel_grid{ dir = 6 }, @@ -174,8 +160,19 @@ pixel_x = -6; pixel_y = -9 }, +/obj/item/reagent_containers/condiment/rice, +/obj/item/reagent_containers/condiment/rice, /turf/open/floor/plasteel, /area/ship/crew/ccommons) +"db" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering/engine) "dg" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/turf_decal/steeldecal/steel_decals10{ @@ -216,7 +213,9 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "dm" = ( -/obj/machinery/computer/helm/viewscreen/directional/south, +/obj/machinery/computer/helm/viewscreen/directional/south{ + pixel_x = 5 + }, /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ dir = 8 }, @@ -226,6 +225,11 @@ /obj/effect/turf_decal/trimline/opaque/blue/filled/corner{ dir = 1 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -20; + pixel_x = -11 + }, /turf/open/floor/plasteel/mono, /area/ship/cargo) "dn" = ( @@ -254,8 +258,28 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plating, /area/ship/engineering/engine) +"dA" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "a_bridge"; + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ship/bridge) "dC" = ( /obj/effect/turf_decal/corner_steel_grid{ dir = 10 @@ -287,6 +311,14 @@ /obj/structure/sign/poster/pgf/random{ pixel_y = 32 }, +/obj/item/storage/backpack/messenger{ + pixel_x = 4; + pixel_y = -7 + }, +/obj/item/storage/backpack/messenger{ + pixel_x = 4; + pixel_y = -7 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "dQ" = ( @@ -320,6 +352,26 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) +"eg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ + dir = 8 + }, +/obj/machinery/button/door{ + dir = 1; + pixel_y = -22; + pixel_x = -8; + id = "abay2"; + name = "gear bay controls" + }, +/obj/machinery/button/shieldwallgen{ + pixel_y = -20; + pixel_x = 1; + id = "a_bass2"; + req_ship_access = 1; + dir = 1 + }, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/storage) "eu" = ( /obj/effect/turf_decal/spline/fancy/opaque/blue, /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ @@ -329,6 +381,9 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "eB" = ( @@ -351,27 +406,10 @@ /turf/closed/wall/mineral/titanium, /area/ship/crew/dorm) "fb" = ( -/obj/structure/table/chem, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 11; - pixel_y = 10 - }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 11; - pixel_y = 5 - }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 11 - }, -/obj/item/reagent_scanner{ - pixel_x = 2; - pixel_y = -3 - }, -/obj/effect/turf_decal/corner/opaque/blue/border{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/corner/opaque/blue/border, -/turf/open/floor/plasteel/mono/dark, +/turf/open/floor/plasteel/mono/white, /area/ship/medical) "ff" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input, @@ -381,9 +419,55 @@ /turf/open/floor/engine/hull, /area/ship/engineering/engine) "fi" = ( -/obj/machinery/computer/helm/viewscreen/directional/north, -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 9 +/obj/item/reagent_containers/glass/chem_jug/fluorine{ + pixel_x = 7 + }, +/obj/item/reagent_containers/glass/chem_jug/copper{ + pixel_x = 4 + }, +/obj/item/reagent_containers/glass/chem_jug/chlorine{ + pixel_x = 1 + }, +/obj/item/reagent_containers/glass/chem_jug/carbon{ + pixel_x = -2 + }, +/obj/item/reagent_containers/glass/chem_jug/bromine{ + pixel_x = -5 + }, +/obj/item/reagent_containers/glass/chem_jug/aluminium{ + pixel_x = -8 + }, +/obj/item/reagent_containers/glass/chem_jug/phosphorus{ + pixel_y = -5; + pixel_x = 7 + }, +/obj/item/reagent_containers/glass/chem_jug/oxygen{ + pixel_y = -5; + pixel_x = 4 + }, +/obj/item/reagent_containers/glass/chem_jug/nitrogen{ + pixel_x = 1; + pixel_y = -5 + }, +/obj/item/reagent_containers/glass/chem_jug/mercury{ + pixel_y = -5; + pixel_x = -2 + }, +/obj/item/reagent_containers/glass/chem_jug/lithium{ + pixel_y = -5; + pixel_x = -5 + }, +/obj/item/reagent_containers/glass/chem_jug/iodine{ + pixel_y = -5; + pixel_x = -7 + }, +/obj/item/reagent_containers/glass/chem_jug/hydrogen{ + pixel_y = -5; + pixel_x = -9 + }, +/obj/effect/turf_decal/corner/opaque/blue, +/obj/structure/closet/wall/orange/directional/north{ + name = "chemical storage" }, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo) @@ -408,11 +492,36 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 +/obj/structure/closet/secure_closet/engineering_personal{ + populate = 0; + anchored = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ - dir = 4 +/obj/item/clothing/head/soft/utility_navy{ + pixel_y = 7; + pixel_x = -1 + }, +/obj/item/clothing/suit/hazardvest{ + pixel_y = -4; + pixel_x = -6 + }, +/obj/item/storage/backpack/satchel/eng{ + pixel_x = 7; + pixel_y = -5 + }, +/obj/item/storage/backpack/industrial{ + pixel_x = 6; + pixel_y = -3 + }, +/obj/item/storage/belt/utility/atmostech{ + pixel_y = -5; + pixel_x = -4 + }, +/obj/item/clothing/under/color/darkblue{ + pixel_y = -6 + }, +/obj/item/clothing/head/hardhat/dblue{ + pixel_y = 9; + pixel_x = 9 }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) @@ -470,18 +579,37 @@ /obj/item/modular_computer/laptop/preset/civilian{ pixel_y = 8 }, -/obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/radio/intercom/directional/north, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel, +/obj/structure/table/chem, +/obj/effect/turf_decal/corner/opaque/blue/border{ + dir = 4; + layer = 2.04 + }, +/obj/effect/turf_decal/corner/opaque/blue/border{ + dir = 8 + }, +/obj/machinery/button/door{ + pixel_y = 22; + pixel_x = 2; + id = "a_bay"; + name = "bay door controls"; + req_ship_access = 1 + }, +/obj/machinery/button/shieldwallgen{ + pixel_y = 21; + pixel_x = -6; + id = "a_bass"; + req_ship_access = 1 + }, +/turf/open/floor/plasteel/mono/dark, /area/ship/cargo) "gu" = ( /obj/structure/grille, @@ -535,6 +663,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/light/floor, /turf/open/floor/engine/hull, /area/ship/engineering/engine) "hu" = ( @@ -593,28 +722,26 @@ /obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ dir = 8 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "hZ" = ( -/obj/machinery/autolathe, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/firealarm/directional/south, -/obj/item/stack/sheet/metal/five{ - pixel_y = -1; - pixel_x = -4 +/obj/effect/turf_decal/spline/fancy/opaque/blue{ + dir = 6 }, -/obj/item/stack/sheet/glass/five{ - pixel_x = 7; - pixel_y = 5 +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ + dir = 1 }, -/obj/effect/turf_decal/corner_steel_grid{ - dir = 10 - }, -/obj/structure/sign/poster/official/safety_eye_protection{ - pixel_x = -28 +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/directional/east, +/obj/item/kirbyplants{ + icon_state = "plant-02"; + pixel_x = 8 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/medical) +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/equip) "ia" = ( /obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/platform/ship_three{ @@ -647,23 +774,41 @@ /obj/effect/turf_decal/corner_steel_grid{ dir = 10 }, +/obj/machinery/power/ship_gravity, +/obj/effect/turf_decal/industrial/outline/yellow, /obj/effect/turf_decal/industrial/warning{ dir = 10 }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "iM" = ( -/obj/structure/chair/sofa/blue/left/directional/south, +/obj/structure/chair/sofa/blue/corner/directional/east, /obj/effect/turf_decal/siding/wood{ - dir = 5 + dir = 9 + }, +/obj/machinery/light/directional/west, +/obj/machinery/computer/helm/viewscreen/directional/north, +/turf/open/floor/wood/birch, +/area/ship/crew/ccommons) +"iN" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/champagne{ + pixel_y = 3; + pixel_x = 4 + }, +/obj/item/kirbyplants{ + icon_state = "plant-23"; + pixel_y = 9; + pixel_x = -16 }, -/obj/machinery/light/directional/north, /turf/open/floor/wood/birch, /area/ship/crew/ccommons) "iO" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 6 +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 1 }, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo) @@ -680,7 +825,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/medical{ - name = "Medical Hall"; + name = "Treatment"; id_tag = "jizzle" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -690,29 +835,43 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) +"iU" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "a_bridge"; + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/bridge) "jf" = ( /obj/structure/table, /obj/effect/turf_decal/corner_steel_grid{ dir = 10 }, -/obj/machinery/coffeemaker/premium{ - pixel_x = 5 +/obj/item/cutting_board{ + pixel_y = 2; + pixel_x = 2 }, -/obj/item/storage/box/coffeepack/arabica{ - pixel_x = -12; - pixel_y = 8 +/obj/item/kitchen/rollingpin{ + pixel_x = 6 }, -/obj/item/storage/box/coffeepack/arabica{ - pixel_x = -12; - pixel_y = 5 +/obj/item/melee/knife/kitchen{ + pixel_y = 3 }, -/obj/item/storage/box/coffeepack/arabica{ - pixel_x = -12; - pixel_y = 2 +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -10; + pixel_y = 3 }, -/obj/item/storage/box/coffeepack/arabica{ - pixel_x = -12; - pixel_y = -1 +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 10; + pixel_x = -10 }, /turf/open/floor/plasteel, /area/ship/crew/ccommons) @@ -722,8 +881,12 @@ }, /obj/structure/table, /obj/structure/bedsheetbin, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/crew/toilet) "jv" = ( /obj/effect/turf_decal/trimline/opaque/blue/filled/line, /obj/structure/cable{ @@ -734,24 +897,6 @@ }, /turf/open/floor/plasteel/mono, /area/ship/cargo) -"jD" = ( -/obj/structure/table/chem, -/obj/item/reagent_containers/glass/chem_jug/sodium{ - pixel_y = 12; - pixel_x = 3 - }, -/obj/item/reagent_containers/glass/chem_jug/sulfur{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/effect/turf_decal/trimline/opaque/blue/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/blue/border{ - dir = 8 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical) "jL" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, @@ -802,23 +947,20 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "kF" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 8; + pixel_x = 6 }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/recharger{ + pixel_y = 8; + pixel_x = -6 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/storage/equip) "lx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ dir = 1 @@ -827,6 +969,7 @@ /obj/effect/turf_decal/trimline/opaque/blue/filled/corner{ dir = 4 }, +/obj/structure/chair/office, /turf/open/floor/plasteel/mono/white, /area/ship/bridge) "lQ" = ( @@ -837,8 +980,11 @@ /turf/open/floor/plasteel/patterned/ridged, /area/ship/storage) "ml" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 10 +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 4 + }, +/obj/structure/chair/office{ + dir = 8 }, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo) @@ -847,73 +993,24 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "mq" = ( -/obj/structure/closet/crate/medical{ - name = "chemical crate" - }, -/obj/item/reagent_containers/glass/chem_jug/aluminium{ - pixel_x = -8 - }, -/obj/item/reagent_containers/glass/chem_jug/bromine{ - pixel_x = -5 - }, -/obj/item/reagent_containers/glass/chem_jug/carbon{ - pixel_x = -2 - }, -/obj/item/reagent_containers/glass/chem_jug/chlorine{ - pixel_x = 1 - }, -/obj/item/reagent_containers/glass/chem_jug/copper{ - pixel_x = 4 - }, -/obj/item/reagent_containers/glass/chem_jug/fluorine{ - pixel_x = 7 - }, -/obj/item/reagent_containers/glass/chem_jug/hydrogen{ - pixel_y = -5; - pixel_x = -9 - }, -/obj/item/reagent_containers/glass/chem_jug/iodine{ - pixel_y = -5; - pixel_x = -7 - }, -/obj/item/reagent_containers/glass/chem_jug/lithium{ - pixel_y = -5; - pixel_x = -5 - }, -/obj/item/reagent_containers/glass/chem_jug/mercury{ - pixel_y = -5; - pixel_x = -2 - }, -/obj/item/reagent_containers/glass/chem_jug/nitrogen{ - pixel_x = 1; - pixel_y = -5 - }, -/obj/item/reagent_containers/glass/chem_jug/oxygen{ - pixel_y = -5; - pixel_x = 4 - }, -/obj/item/reagent_containers/glass/chem_jug/phosphorus{ - pixel_y = -5; - pixel_x = 7 - }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/crate_shelf{ - capacity = 2 - }, /obj/effect/turf_decal/corner_steel_grid{ - dir = 10 + dir = 9 }, -/obj/structure/sign/poster/official/moth/meth{ - pixel_y = -30 +/obj/effect/turf_decal/corner/opaque/blue/border{ + dir = 4; + layer = 2.04 }, -/obj/machinery/light/directional/east, +/obj/machinery/chem_master, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 17 + }, +/obj/machinery/light/directional/west, /turf/open/floor/plasteel/telecomms_floor, -/area/ship/medical) +/area/ship/cargo) "mJ" = ( /obj/effect/turf_decal/spline/fancy/opaque/blue{ dir = 6 }, -/obj/machinery/firealarm/directional/south, /obj/machinery/light/directional/east, /obj/machinery/photocopier, /turf/open/floor/plasteel/mono/dark, @@ -939,12 +1036,9 @@ /turf/closed/wall/mineral/titanium, /area/ship/engineering/engine) "mS" = ( -/obj/machinery/chem_heater, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/corner_steel_grid{ - dir = 6 - }, -/turf/open/floor/plasteel/telecomms_floor, +/obj/structure/bed/roller, +/obj/effect/turf_decal/industrial/hatch/blue, +/turf/open/floor/plasteel/mono/white, /area/ship/medical) "mV" = ( /obj/structure/table, @@ -974,14 +1068,21 @@ /obj/effect/turf_decal/techfloor{ dir = 4 }, -/obj/item/radio/intercom/directional/east, /obj/machinery/light_switch{ dir = 8; pixel_y = 12; - pixel_x = 21 + pixel_x = 20 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/item/radio/intercom/directional/east{ + pixel_y = -18; + pixel_x = 30 + }, +/obj/structure/cable{ + icon_state = "0-8" }, /turf/open/floor/plasteel/telecomms_floor, -/area/ship/hallway/central) +/area/ship/crew/cryo) "ne" = ( /obj/machinery/power/shuttle/engine/electric, /obj/machinery/atmospherics/pipe/simple/dark/hidden/layer2{ @@ -993,32 +1094,19 @@ /turf/open/floor/engine/hull, /area/ship/engineering/engine) "nq" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 +/obj/effect/turf_decal/borderfloor{ + dir = 1 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical) +/turf/open/floor/plasteel, +/area/ship/crew/ccommons) "nx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/spline/fancy/opaque/blue{ +/obj/structure/chair/sofa/blue/left/directional/south, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/closet/wall/white/directional/north{ - name = "patient's closet" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical) +/turf/open/floor/wood/birch, +/area/ship/crew/ccommons) "nN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/catwalk/over/plated_catwalk, @@ -1064,63 +1152,45 @@ pixel_x = 6 }, /turf/open/floor/plasteel/telecomms_floor, -/area/ship/hallway/central) +/area/ship/crew/cryo) "oa" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "om" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/trimline/opaque/blue/line{ dir = 4 }, -/obj/item/radio/intercom/directional/north, -/obj/structure/closet/crate/secure/gear, -/obj/item/pickaxe/drill, -/obj/item/pickaxe/drill{ - pixel_y = -6 +/obj/effect/turf_decal/trimline/opaque/blue/line{ + dir = 8 }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) +/obj/structure/table/chem, +/obj/item/reagent_containers/glass/bottle/morphine{ + pixel_x = 5 + }, +/obj/item/reagent_containers/glass/bottle/morphine{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/reagent_containers/syringe{ + pixel_y = 5; + pixel_x = 2 + }, +/turf/open/floor/mineral/titanium/tiled/white, +/area/ship/medical) "oo" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/birch, /area/ship/crew/ccommons) "oA" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 1 - }, -/obj/structure/closet/crate/medical{ - name = "supply crate" - }, -/obj/item/storage/box/masks{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 6 - }, -/obj/item/storage/box/bodybags{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/storage/box/beakers{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/item/storage/firstaid/regular{ - pixel_y = -4; - pixel_x = -5 - }, -/obj/item/storage/firstaid/regular{ - pixel_y = -4; - pixel_x = 1 - }, -/obj/effect/mapping_helpers/crate_shelve, -/turf/open/floor/plasteel/mono/dark, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/borderfloorwhite, +/obj/effect/turf_decal/steeldecal/steel_decals_central7, +/turf/open/floor/plasteel/mono/white, /area/ship/medical) "oB" = ( /obj/effect/turf_decal/corner_steel_grid{ @@ -1152,11 +1222,17 @@ pixel_y = -6 }, /obj/machinery/airalarm/directional/north, +/obj/item/storage/backpack{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/storage/backpack{ + pixel_x = 5; + pixel_y = -7 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "oN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/shuttle, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/poddoor/shutters/preopen{ id = "a_bridge" @@ -1164,13 +1240,17 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/structure/cable, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/shuttle, /turf/open/floor/plating, /area/ship/bridge) "pm" = ( /obj/effect/turf_decal/spline/fancy/opaque/blue/corner, /turf/open/floor/plasteel/mono/dark, /area/ship/medical) +"ps" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/engineering/engine) "pv" = ( /obj/effect/turf_decal/techfloor, /obj/machinery/computer/crew{ @@ -1180,22 +1260,23 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "pG" = ( -/obj/effect/turf_decal/corner_steel_grid{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/firealarm/directional/west, -/obj/machinery/power/ship_gravity, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "2-8" }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/spline/fancy/opaque/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/equip) "pY" = ( /obj/machinery/shower{ pixel_y = 12 @@ -1210,7 +1291,7 @@ }, /obj/machinery/door/window, /turf/open/floor/plastic, -/area/ship/hallway/central) +/area/ship/crew/toilet) "qy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock{ @@ -1249,21 +1330,19 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "qM" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/light_switch{ dir = 8; pixel_y = 11; pixel_x = 19 }, /obj/machinery/light/small/directional/east, -/turf/open/floor/plating, +/obj/effect/turf_decal/industrial/warning/cee{ + dir = 1 + }, +/turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "qR" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -1363,6 +1442,24 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) +"rL" = ( +/obj/effect/turf_decal/industrial/hatch/blue, +/obj/structure/closet/crate/freezer/blood, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"rO" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "a_bridge" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ship/bridge) "rQ" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, @@ -1412,10 +1509,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) +/area/ship/storage/equip) "ss" = ( /obj/machinery/airalarm/directional/south, -/obj/structure/closet/wall/blue/directional/west, /obj/item/megaphone/command{ pixel_y = 5; pixel_x = -5 @@ -1440,7 +1536,9 @@ pixel_y = 4; pixel_x = 5 }, -/obj/machinery/holopad, +/obj/structure/closet/secure_closet/captains{ + populate = 0 + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "sw" = ( @@ -1468,17 +1566,18 @@ /turf/open/floor/engine/hull, /area/ship/external/dark) "sS" = ( -/obj/machinery/chem_master, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/turf_decal/steeldecal/steel_decals_central7, -/obj/structure/cable{ - icon_state = "0-8" +/obj/effect/turf_decal/borderfloorwhite, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"tg" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 4 }, -/obj/effect/turf_decal/corner_steel_grid{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/medical) +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering/engine) "tl" = ( /obj/effect/turf_decal/techfloor, /obj/machinery/modular_computer/console/preset/command{ @@ -1490,15 +1589,47 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) +"tm" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "a_bridge" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/ship/bridge) "tq" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/borderfloorwhite{ - dir = 8 +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 }, -/obj/effect/turf_decal/corner/opaque/blue/half{ - dir = 4 +/obj/structure/sign/poster/official/moth/meth{ + pixel_y = -30 }, -/turf/open/floor/hangar/plasteel/white, +/obj/machinery/light/directional/east, +/obj/structure/table/chem, +/obj/item/storage/firstaid/regular{ + pixel_y = 7; + pixel_x = 7 + }, +/obj/item/storage/box/masks{ + pixel_x = -8; + pixel_y = 9 + }, +/obj/item/storage/box/gloves{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = 7 + }, +/turf/open/floor/mineral/titanium/white, /area/ship/medical) "tr" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -1512,16 +1643,10 @@ /obj/machinery/atmospherics/pipe/simple/purple/hidden{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/machinery/airalarm/directional/east, /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -1540,6 +1665,28 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/crew/ccommons) +"us" = ( +/obj/effect/turf_decal/borderfloor{ + dir = 1 + }, +/obj/structure/table, +/obj/item/reagent_containers/glass/bottle/syrup_bottle/tea{ + pixel_x = -8; + pixel_y = 11 + }, +/obj/item/reagent_containers/glass/bottle/syrup_bottle/honey{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/machinery/coffeemaker/premium{ + pixel_x = 5 + }, +/obj/item/storage/box/coffeepack/arabica{ + pixel_x = -5; + pixel_y = 2 + }, +/turf/open/floor/plasteel, +/area/ship/crew/ccommons) "uu" = ( /turf/closed/wall/mineral/titanium, /area/ship/cargo) @@ -1572,14 +1719,36 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/central) "uI" = ( -/obj/effect/turf_decal/borderfloor{ +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{ + dir = 8 + }, +/obj/machinery/air_sensor/atmos{ + pixel_x = 11; + pixel_y = -10; + id_tag = "atira_mix" + }, +/turf/open/floor/engine/hydrogen_fuel, +/area/ship/engineering/engine) +"uJ" = ( +/turf/closed/wall/mineral/titanium, +/area/ship/crew/toilet) +"uL" = ( +/obj/effect/turf_decal/techfloor/orange{ dir = 1 }, -/obj/machinery/griddle{ - pixel_y = 1 +/obj/effect/turf_decal/techfloor/orange, +/obj/machinery/door/poddoor{ + id = "abay2" }, -/turf/open/floor/plasteel, -/area/ship/crew/ccommons) +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "a_bass2" + }, +/obj/structure/cable{ + icon_state = "0-6" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "uM" = ( /obj/effect/turf_decal/corner_steel_grid/full{ dir = 4 @@ -1588,7 +1757,7 @@ dir = 1 }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-4" }, /turf/open/floor/plasteel/mono/white, /area/ship/bridge) @@ -1610,6 +1779,10 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/medical) +"uY" = ( +/obj/effect/turf_decal/atmos/mix, +/turf/open/floor/engine/hydrogen_fuel, +/area/ship/engineering/engine) "vd" = ( /obj/effect/turf_decal/spline/fancy/opaque/blue{ dir = 1 @@ -1640,58 +1813,53 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/engine/hull/interior, +/turf/open/floor/engine/hull/reinforced/interior, /area/ship/engineering/engine) -"vX" = ( -/obj/structure/table/chem, -/obj/structure/sink/chem{ - pixel_y = 4; - pixel_x = -8 - }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = -11; - pixel_y = 10 - }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = -11; - pixel_y = 5 - }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = -11 - }, -/obj/machinery/reagentgrinder{ - pixel_y = 9; - pixel_x = 7 - }, -/obj/item/reagent_containers/glass/chem_jug/potassium{ - pixel_y = -1 - }, +"vP" = ( /obj/structure/noticeboard{ dir = 8; pixel_x = 26 }, -/obj/effect/turf_decal/trimline/opaque/blue/filled/corner{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue/border{ - dir = 5 +/obj/effect/turf_decal/trimline/opaque/blue/end{ + dir = 1 }, -/turf/open/floor/plasteel/mono/dark, +/obj/machinery/stasis, +/turf/open/floor/mineral/titanium/tiled/white, /area/ship/medical) -"wo" = ( -/obj/effect/turf_decal/techfloor{ - dir = 4 +"vX" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/steeldecal/steel_decals_central7, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = -16; + dir = 1 }, -/obj/machinery/computer/helm{ - dir = 8 +/obj/effect/turf_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/structure/cable, +/obj/effect/turf_decal/spline/fancy/opaque/blue, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/equip) +"wo" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, /obj/machinery/button/door{ - pixel_x = 6; + pixel_y = 23; + pixel_x = -1; + name = "door lock"; + id = "atira_captain"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/machinery/button/door{ + pixel_x = 9; pixel_y = 23; name = "window shutters"; id = "a_bridge" }, -/turf/open/floor/plasteel/telecomms_floor, +/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "wr" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -1766,19 +1934,6 @@ dir = 8 }, /obj/machinery/airalarm/directional/east, -/obj/machinery/button/door{ - pixel_y = 22; - pixel_x = 8; - id = "a_bay"; - name = "bay door controls"; - req_ship_access = 1 - }, -/obj/machinery/button/shieldwallgen{ - pixel_y = 21; - pixel_x = -1; - id = "a_bass"; - req_ship_access = 1 - }, /turf/open/floor/plasteel, /area/ship/cargo) "xP" = ( @@ -1803,19 +1958,13 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "xQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/shuttle, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "a_bridge"; +/obj/effect/turf_decal/techfloor{ dir = 4 }, -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/computer/helm{ + dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "xS" = ( /obj/docking_port/stationary{ @@ -1836,24 +1985,10 @@ /area/ship/engineering/engine) "yf" = ( /obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ - dir = 1 - }, -/obj/item/radio/intercom/directional/south, -/obj/machinery/light/directional/east, -/obj/structure/rack, -/obj/item/storage/backpack/duffelbag/engineering{ - pixel_y = -2; - pixel_x = -2 - }, -/obj/item/gps/engineering{ - pixel_x = 5; - pixel_y = 5 + dir = 10 }, /turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) +/area/ship/storage/equip) "yg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1863,7 +1998,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/engine/hull/interior, +/turf/open/floor/engine/hull/reinforced/interior, /area/ship/engineering/engine) "yu" = ( /obj/item/radio/intercom/wideband/directional/north, @@ -1885,7 +2020,9 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "yy" = ( -/obj/structure/closet/secure_closet/medical3, +/obj/structure/closet/secure_closet/medical3{ + populate = 0 + }, /obj/item/clothing/under/rank/medical/doctor/blue{ pixel_y = -3 }, @@ -1911,25 +2048,14 @@ pixel_x = -8; pixel_y = 5 }, +/obj/item/storage/belt/medical{ + pixel_y = -10 + }, /turf/open/floor/mineral/titanium/white, /area/ship/medical) "yE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/shuttle, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "a_bridge"; - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/ship/bridge) +/turf/closed/wall/mineral/titanium, +/area/ship/crew/cryo) "yL" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/techfloor{ @@ -1953,9 +2079,6 @@ "yQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/command{ - name = "Bridge" - }, /obj/effect/turf_decal/techfloor/orange, /obj/effect/turf_decal/techfloor/orange{ dir = 1 @@ -1967,6 +2090,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/door/airlock/command/glass{ + id_tag = "atira_captain" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "yR" = ( @@ -1987,7 +2116,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) +/area/ship/storage/equip) "zh" = ( /obj/machinery/door/airlock/hatch{ dir = 4 @@ -2004,10 +2133,13 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) "zl" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 5 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/plasteel/mono/dark, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/patterned/cargo_one, /area/ship/storage) "zA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ @@ -2050,6 +2182,16 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/bridge) +"Ag" = ( +/obj/structure/chair/bench/blue/directional/west{ + pixel_y = 2; + pixel_x = 2 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood/birch, +/area/ship/crew/ccommons) "An" = ( /obj/effect/turf_decal/spline/fancy/opaque/blue{ dir = 5 @@ -2068,9 +2210,8 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) +/area/ship/storage/equip) "Ao" = ( -/obj/structure/table/reinforced, /obj/item/paper_bin{ pixel_y = 21; pixel_x = -5 @@ -2100,35 +2241,37 @@ /obj/machinery/door/window/brigdoor/eastright{ req_ship_access = 1 }, -/turf/open/floor/plasteel, +/obj/structure/table/chem, +/obj/effect/turf_decal/corner/opaque/blue/border{ + dir = 4; + layer = 2.04 + }, +/obj/effect/turf_decal/corner/opaque/blue/border{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/dark, /area/ship/cargo) "Ay" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/effect/turf_decal/siding/wood{ + dir = 5 }, -/obj/machinery/light_switch{ - pixel_x = 9; - pixel_y = -16; - dir = 1 +/obj/machinery/button/door{ + pixel_x = 7; + pixel_y = 22; + name = "window shutters"; + id = "a_lobby" }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) +/turf/open/floor/wood/birch, +/area/ship/crew/ccommons) "AD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ - dir = 8 - }, -/obj/effect/turf_decal/spline/fancy/opaque/blue/corner, /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "AM" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/engineering) +/area/ship/storage/equip) "AU" = ( /obj/effect/turf_decal/techfloor{ dir = 4 @@ -2150,23 +2293,16 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/ccommons) "Bk" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/light/directional/south, -/obj/structure/table/reinforced, -/obj/machinery/recharger{ - pixel_x = 8; - pixel_y = 7 - }, -/obj/item/storage/guncase/pistol/kalixpistol{ - pixel_y = -8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/effect/turf_decal/spline/fancy/opaque/blue{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/item/storage/guncase/energy/kalixnock{ - pixel_y = -1 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plasteel/mono/dark, +/turf/open/floor/plasteel/patterned/cargo_one, /area/ship/storage) "Bp" = ( /obj/effect/turf_decal/industrial/warning{ @@ -2186,7 +2322,8 @@ /obj/machinery/light/small/directional/east, /obj/item/flashlight/lamp/green{ pixel_y = 12; - pixel_x = 9 + pixel_x = 9; + layer = 3.1 }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) @@ -2201,6 +2338,22 @@ }, /turf/open/floor/plating, /area/ship/bridge) +"BL" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/purple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/catwalk/over/plated_catwalk, +/turf/open/floor/plating, +/area/ship/engineering/engine) "Cl" = ( /turf/closed/wall/mineral/titanium, /area/ship/hallway/central) @@ -2219,8 +2372,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) +/area/ship/crew/toilet) "Cy" = ( /obj/effect/turf_decal/trimline/opaque/blue/filled, /obj/structure/cable{ @@ -2291,7 +2447,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) +/area/ship/storage/equip) "Dg" = ( /obj/effect/turf_decal/corner_steel_grid{ dir = 6 @@ -2340,22 +2496,42 @@ /turf/open/floor/engine/hull/interior, /area/ship/engineering/engine) "Ej" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "4-8" }, -/obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ - dir = 4 +/obj/effect/turf_decal/spline/fancy/opaque/blue{ + dir = 1 }, -/obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ +/obj/structure/closet/wall/white/directional/north{ + name = "patient closet" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-4" +/obj/item/storage/backpack/duffelbag/med{ + name = "patient gear bag"; + pixel_x = -5; + desc = "A large duffel bag for holding a patient's clothing." + }, +/obj/item/storage/backpack/duffelbag/med{ + name = "patient gear bag"; + pixel_x = -5; + desc = "A large duffel bag for holding a patient's clothing."; + pixel_y = 9 + }, +/obj/item/storage/backpack/duffelbag/med{ + name = "patient gear bag"; + pixel_x = 3; + desc = "A large duffel bag for holding a patient's clothing."; + pixel_y = 9 + }, +/obj/item/storage/backpack/duffelbag/med{ + name = "patient gear bag"; + pixel_x = 3; + desc = "A large duffel bag for holding a patient's clothing." }, /turf/open/floor/plasteel/mono/dark, /area/ship/medical) @@ -2390,15 +2566,13 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "EY" = ( @@ -2409,7 +2583,7 @@ /obj/item/radio/intercom/directional/south, /obj/machinery/light/small/directional/west, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/crew/toilet) "Fx" = ( /obj/effect/turf_decal/borderfloor{ dir = 8 @@ -2421,48 +2595,32 @@ /turf/open/floor/plasteel, /area/ship/crew/ccommons) "Fz" = ( -/obj/effect/turf_decal/corner_steel_grid{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 2; - pixel_x = -9 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/item/pen{ - pixel_y = 3; - pixel_x = -10 +/obj/effect/turf_decal/spline/fancy/opaque/blue{ + dir = 1 }, -/obj/item/folder/white{ - pixel_x = 5; - pixel_y = 6 +/obj/machinery/light/directional/north, +/obj/structure/chair/bench/blue/directional/south{ + pixel_y = 10 }, -/obj/item/folder/white{ - pixel_x = 5; - pixel_y = 1 +/obj/structure/cable{ + icon_state = "2-8" }, -/obj/item/folder/white{ - pixel_x = 5; - pixel_y = -4 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = -16; - dir = 1 - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/cargo) -"FY" = ( -/turf/closed/wall/mineral/titanium, -/area/ship/medical/surgery) -"FZ" = ( -/obj/machinery/atmospherics/components/binary/pump{ +/turf/open/floor/plasteel/mono/dark, +/area/ship/medical) +"FY" = ( +/turf/closed/wall/mineral/titanium, +/area/ship/medical/surgery) +"FZ" = ( +/obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, /obj/effect/turf_decal/industrial/warning{ @@ -2479,17 +2637,37 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "Gh" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 10 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/light_switch{ + pixel_x = 9; + pixel_y = -20; + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/structure/closet/crate/freezer{ + name = "winter gear crate" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/mono/dark, +/obj/item/clothing/shoes/winterboots/ice_boots{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/clothing/shoes/winterboots/ice_boots{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/clothing/suit/hooded/wintercoat/medical/paramedic{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/clothing/suit/hooded/wintercoat/medical/paramedic{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/structure/extinguisher_cabinet/directional/south{ + pixel_x = -6 + }, +/turf/open/floor/plasteel/patterned/cargo_one, /area/ship/storage) "Gk" = ( /obj/effect/turf_decal/techfloor/orange, @@ -2532,16 +2710,20 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical/surgery) "Hj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/shuttle, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, +/obj/effect/turf_decal/industrial/hatch/blue, +/obj/machinery/iv_drip, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"Hu" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/poddoor/shutters/preopen{ id = "a_bridge" }, -/obj/structure/cable, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, /area/ship/bridge) "HD" = ( @@ -2560,8 +2742,28 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) +/area/ship/crew/cryo) +"HP" = ( +/obj/effect/turf_decal/techfloor/orange{ + dir = 1 + }, +/obj/effect/turf_decal/techfloor/orange, +/obj/machinery/door/poddoor{ + id = "abay2" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "a_bass2" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "HV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -2582,22 +2784,30 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/crew/ccommons) "HW" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 8 +/obj/machinery/suit_storage_unit/inherit/industrial, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) +/obj/machinery/light/directional/north, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/clothing/suit/space/hardsuit/medical, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/storage) "HY" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine/hull, /area/ship/external/dark) "Ic" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-8" }, -/obj/effect/turf_decal/corner/opaque/blue, -/turf/open/floor/plasteel/mono/dark, +/obj/effect/turf_decal/borderfloorwhite{ + dir = 10 + }, +/turf/open/floor/plasteel/mono/white, /area/ship/medical) "Ig" = ( /obj/effect/turf_decal/siding/wood{ @@ -2633,94 +2843,57 @@ name = "bridge officer"; desc = "Captain on the bridge!" }, -/obj/machinery/light/directional/north, /obj/structure/cable{ icon_state = "2-8" }, /turf/open/floor/plasteel/mono/white, /area/ship/bridge) "Ix" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 }, -/obj/effect/turf_decal/borderfloorwhite{ +/obj/effect/turf_decal/industrial/warning{ dir = 6 }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 1 - }, -/turf/open/floor/hangar/plasteel/white, -/area/ship/medical) +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering/engine) "IN" = ( /turf/closed/wall/mineral/plastitanium, -/area/ship/engineering) +/area/ship/storage/equip) "IS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/corner/opaque/blue/half{ - dir = 8 +/obj/effect/turf_decal/industrial/warning{ + dir = 4 }, -/obj/effect/turf_decal/borderfloorwhite{ +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ dir = 4 }, -/turf/open/floor/hangar/plasteel/white, -/area/ship/medical) +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering/engine) +"JX" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/storage) "JZ" = ( /turf/closed/wall/mineral/titanium, /area/ship/bridge) "Ke" = ( -/obj/effect/turf_decal/trimline/opaque/blue/line{ - dir = 4 - }, -/obj/item/storage/case/surgery{ - pixel_y = 3; - pixel_x = -7 - }, -/obj/item/book/manual/wiki/surgery, -/obj/item/restraints/handcuffs/cable/red{ - pixel_y = -4; - pixel_x = -4; - name = "patient restraints" - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/steeldecal/steel_decals_central7, -/obj/machinery/light_switch{ - pixel_x = 11; - pixel_y = -16; - dir = 1 +/obj/effect/turf_decal/borderfloorwhite{ + dir = 6 }, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"Kg" = ( /obj/structure/cable{ - icon_state = "0-4" - }, -/obj/item/disk/surgery/t3{ - pixel_y = 10; - pixel_x = 6 - }, -/obj/effect/turf_decal/borderfloorwhite/corner{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/blue/three_quarters{ - dir = 1 + icon_state = "1-2" }, -/obj/structure/closet/wall/white/directional/west, -/turf/open/floor/hangar/plasteel/white, -/area/ship/medical/surgery) -"Kg" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/atmospherics/components/binary/pump/layer2{ + name = "Air To Distro"; dir = 8 }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/obj/effect/turf_decal/industrial/warning/cee, +/turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "Ks" = ( /obj/effect/turf_decal/arrows{ @@ -2762,10 +2935,10 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) +/area/ship/storage/equip) "Lj" = ( /turf/closed/wall/mineral/titanium, -/area/ship/engineering) +/area/ship/storage/equip) "Ll" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -2805,52 +2978,29 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "Lw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "LB" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/item/radio/intercom/directional/west, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/item/clothing/under/color/darkblue{ - pixel_y = -6 - }, -/obj/item/clothing/head/soft/utility_navy{ - pixel_y = 7; - pixel_x = -1 - }, -/obj/item/storage/belt/utility/atmostech{ - pixel_y = -5; - pixel_x = -4 - }, -/obj/item/storage/backpack/industrial{ - pixel_x = 6; - pixel_y = -3 - }, -/obj/item/storage/backpack/satchel/eng{ - pixel_x = 7; - pixel_y = -5 - }, -/obj/item/clothing/head/hardhat/dblue{ - pixel_y = 9; - pixel_x = 9 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/clothing/suit/hazardvest{ - pixel_y = -4; - pixel_x = -6 +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/borderfloorwhite{ + dir = 8 }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) "LG" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{ dir = 4 @@ -2882,14 +3032,13 @@ /obj/structure/railing/thin{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/portables_connector/layer2{ - dir = 4 - }, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, /obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 4 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "LW" = ( @@ -2907,16 +3056,7 @@ icon_state = "1-8" }, /turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Ma" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical) +/area/ship/storage/equip) "Md" = ( /obj/machinery/atmospherics/pipe/simple/purple/hidden{ dir = 5 @@ -2933,18 +3073,27 @@ /obj/machinery/fax/indie{ pixel_y = 9 }, +/obj/machinery/firealarm/directional/south{ + pixel_x = -7 + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "Mk" = ( -/obj/structure/chair/bench/blue/directional/west{ - pixel_y = 2; - pixel_x = 2 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 +/obj/effect/turf_decal/corner_steel_grid{ + dir = 8 }, -/turf/open/floor/wood/birch, -/area/ship/crew/ccommons) +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/machinery/firealarm/directional/west, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/storage/equip) "Mp" = ( /obj/structure/chair/sofa/blue/right/directional/east, /obj/effect/turf_decal/siding/wood{ @@ -2983,21 +3132,10 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "MY" = ( -/obj/structure/chair/office, -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 5 - }, -/obj/machinery/button/door{ - pixel_y = 22; - pixel_x = 8; - id = "a_bay"; - name = "bay door controls" - }, -/obj/machinery/button/shieldwallgen{ - pixel_y = 21; - pixel_x = -1; - id = "a_bass" +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo) "Nb" = ( @@ -3028,28 +3166,33 @@ /turf/open/floor/plasteel, /area/ship/cargo) "Nu" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ +/obj/effect/turf_decal/industrial/warning{ dir = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/champagne{ - pixel_y = 3; - pixel_x = 4 - }, -/obj/item/kirbyplants{ - icon_state = "plant-23"; - pixel_y = 9; - pixel_x = -16 - }, -/turf/open/floor/wood/birch, -/area/ship/crew/ccommons) +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering/engine) "NK" = ( /obj/machinery/cryopod{ dir = 4 }, /obj/machinery/light/small/directional/south, /turf/open/floor/pod/dark, -/area/ship/hallway/central) +/area/ship/crew/cryo) +"NT" = ( +/obj/machinery/firealarm/directional/east, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/storage) +"Oc" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/meter/atmos/layer4, +/turf/open/floor/plating, +/area/ship/engineering/engine) "OE" = ( /turf/closed/wall/mineral/titanium, /area/ship/storage) @@ -3070,25 +3213,25 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"OQ" = ( -/obj/effect/turf_decal/industrial/warning{ +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/closet/crate/secure/gear{ - name = "machete crate" - }, -/obj/item/melee/sword/mass, -/obj/item/melee/sword/mass{ - pixel_x = 6 +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) +/turf/open/floor/plasteel/tech/grid, +/area/ship/medical/surgery) +"OQ" = ( +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/storage/equip) "Pa" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plastic, -/area/ship/hallway/central) +/area/ship/crew/toilet) "Pf" = ( /obj/effect/turf_decal/arrows{ dir = 1 @@ -3103,6 +3246,21 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) +"Pk" = ( +/obj/effect/turf_decal/spline/fancy/opaque/blue{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/equip) "Po" = ( /obj/machinery/door/airlock/hatch, /obj/effect/turf_decal/techfloor/orange, @@ -3125,7 +3283,6 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/south, /obj/machinery/button/door{ dir = 4; pixel_y = 9; @@ -3145,25 +3302,7 @@ /obj/effect/turf_decal/borderfloor/corner{ dir = 1 }, -/obj/structure/table, -/obj/item/cutting_board{ - pixel_y = 2; - pixel_x = 2 - }, -/obj/item/melee/knife/kitchen{ - pixel_y = 3 - }, -/obj/item/kitchen/rollingpin{ - pixel_x = 6 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 10; - pixel_x = -10 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -10; - pixel_y = 3 - }, +/obj/machinery/oven, /turf/open/floor/plasteel, /area/ship/crew/ccommons) "Qh" = ( @@ -3187,42 +3326,26 @@ icon = 'icons/obj/stairs.dmi'; dir = 1 }, -/area/ship/hallway/central) +/area/ship/crew/cryo) "Qt" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/trimline/opaque/blue/filled/warning, -/obj/effect/turf_decal/trimline/opaque/blue/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ - dir = 1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ +/obj/effect/turf_decal/borderfloorwhite{ dir = 4 }, -/turf/open/floor/plasteel/mono/dark, +/turf/open/floor/plasteel/mono/white, /area/ship/medical) "QA" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ - dir = 1 +/obj/effect/turf_decal/industrial/warning{ + dir = 4 }, -/obj/item/kirbyplants{ - icon_state = "plant-14"; - pixel_y = 4; - pixel_x = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/light_switch{ - dir = 8; - pixel_y = 11; - pixel_x = 19 +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical) +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering/engine) "QB" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium, @@ -3238,40 +3361,44 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/machinery/suit_storage_unit/inherit/industrial, +/obj/item/tank/jetpack/oxygen, +/obj/item/clothing/suit/space/hardsuit/engine, +/obj/item/clothing/head/papersack/smiley{ + pixel_y = 15 }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "RK" = ( -/obj/effect/turf_decal/corner_steel_grid/full{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/firealarm/directional/east, -/obj/machinery/light/directional/north, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/hardsuit/medical, -/turf/open/floor/plasteel/telecomms_floor, +/obj/structure/cable{ + icon_state = "2-9" + }, +/turf/open/floor/plasteel/patterned/cargo_one, /area/ship/storage) "RN" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) +"RQ" = ( +/obj/effect/turf_decal/techfloor, +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_y = 5 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) "RX" = ( /obj/effect/turf_decal/corner_steel_grid{ dir = 9 @@ -3291,8 +3418,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/sign/warning/fire{ + pixel_y = 22; + pixel_x = -21 + }, /turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) +/area/ship/storage/equip) "RZ" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, @@ -3318,9 +3449,6 @@ /obj/effect/turf_decal/industrial/warning/corner{ dir = 8 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, /obj/structure/railing/thin/corner{ dir = 8 }, @@ -3343,13 +3471,15 @@ /turf/open/floor/engine/hull, /area/ship/engineering/engine) "Sn" = ( +/obj/machinery/light/directional/south, +/obj/machinery/suit_storage_unit/inherit/industrial, /obj/effect/turf_decal/corner_steel_grid{ dir = 9 }, -/obj/machinery/photocopier, -/obj/machinery/light/directional/west, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/clothing/suit/space/hardsuit/medical, /turf/open/floor/plasteel/telecomms_floor, -/area/ship/cargo) +/area/ship/storage) "Sq" = ( /obj/machinery/atmospherics/pipe/simple/purple/hidden{ dir = 5 @@ -3375,49 +3505,106 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "SE" = ( -/obj/structure/table/chem, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 5 +/obj/item/radio/intercom/directional/west, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; +/obj/effect/turf_decal/borderfloorwhite{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"SI" = ( +/obj/item/radio/intercom/directional/north, +/obj/structure/rack, +/obj/item/storage/backpack/duffelbag{ + pixel_y = 10; + pixel_x = -4 + }, +/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/item/storage/backpack/duffelbag{ + pixel_y = 1; + pixel_x = -4 + }, +/obj/item/gps/engineering{ + pixel_x = 11; + pixel_y = 7 + }, +/obj/item/gps/engineering{ + pixel_x = 11; + pixel_y = 2 + }, +/obj/item/gps/engineering{ + pixel_x = 11; pixel_y = -3 }, -/obj/item/pen{ - pixel_x = 3; - pixel_y = 5 +/obj/item/clothing/mask/gas{ + pixel_y = -7; + pixel_x = -7 }, -/obj/effect/turf_decal/trimline/opaque/blue/filled/line{ - dir = 4 +/obj/item/clothing/mask/gas{ + pixel_y = -7 }, -/obj/effect/turf_decal/corner/opaque/blue/border{ - dir = 8 +/obj/item/clothing/mask/gas{ + pixel_y = -7; + pixel_x = -7 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical) +/obj/item/clothing/mask/gas{ + pixel_y = -7 + }, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/storage) "SL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/effect/turf_decal/trimline/opaque/blue/line{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/borderfloorwhite{ - dir = 8 +/obj/item/storage/case/surgery{ + pixel_y = 3; + pixel_x = -7 }, -/obj/effect/turf_decal/corner/opaque/blue/half{ +/obj/item/book/manual/wiki/surgery, +/obj/item/restraints/handcuffs/cable/red{ + pixel_y = -4; + pixel_x = -4; + name = "patient restraints" + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/steeldecal/steel_decals_central7, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = -16; + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/item/disk/surgery/t3{ + pixel_y = 10; + pixel_x = 6 + }, +/obj/effect/turf_decal/borderfloorwhite/corner{ dir = 4 }, +/obj/effect/turf_decal/corner/opaque/blue/three_quarters{ + dir = 1 + }, +/obj/structure/closet/wall/white/directional/west, +/obj/item/tank/internals/anesthetic{ + pixel_x = 2; + pixel_y = -6 + }, +/obj/item/clothing/mask/breath/medical{ + pixel_x = -2; + pixel_y = -1 + }, /turf/open/floor/hangar/plasteel/white, -/area/ship/medical) +/area/ship/medical/surgery) "SP" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 9 - }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/mono/dark, +/turf/open/floor/plasteel/patterned/cargo_one, /area/ship/storage) "SU" = ( /obj/structure/table, @@ -3437,25 +3624,22 @@ pixel_x = -2 }, /obj/structure/cable, -/obj/item/reagent_containers/glass/bottle/syrup_bottle/honey{ - pixel_x = 10; - pixel_y = 12 - }, -/obj/item/reagent_containers/glass/bottle/syrup_bottle/tea{ - pixel_x = 10; - pixel_y = 2 - }, /turf/open/floor/plasteel, /area/ship/crew/ccommons) "Tr" = ( -/obj/effect/turf_decal/borderfloorblack, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/table/chem, +/obj/machinery/chem_heater{ + pixel_y = 8; + pixel_x = -4 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/corner/opaque/blue/bordercorner{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/cargo) "TH" = ( /obj/structure/crate_shelf{ @@ -3475,6 +3659,17 @@ }, /turf/open/floor/plasteel/patterned/ridged, /area/ship/engineering/engine) +"TY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{ + dir = 8 + }, +/obj/machinery/air_sensor/atmos{ + pixel_x = 11; + pixel_y = -10; + id_tag = "atira_air" + }, +/turf/open/floor/engine/air, +/area/ship/engineering/engine) "Uv" = ( /obj/structure/platform/ship_three{ dir = 4 @@ -3486,21 +3681,14 @@ }, /area/ship/engineering/engine) "Uy" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/item/radio/intercom/directional/west, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/corner/opaque/blue/half{ - dir = 8 +/obj/machinery/griddle{ + pixel_y = 1 }, -/obj/effect/turf_decal/borderfloorwhite{ - dir = 4 +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 }, -/turf/open/floor/hangar/plasteel/white, -/area/ship/medical) +/turf/open/floor/plasteel, +/area/ship/crew/ccommons) "UX" = ( /obj/effect/turf_decal/techfloor{ dir = 8 @@ -3531,35 +3719,7 @@ /area/ship/medical/surgery) "Vq" = ( /turf/closed/wall/mineral/titanium, -/area/ship/crew/ccommons) -"Vx" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/orange{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/door/airlock/mining{ - dir = 4; - name = "Storage Bay" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) +/area/ship/crew/ccommons) "VA" = ( /obj/effect/turf_decal/spline/fancy/opaque/blue{ dir = 9 @@ -3576,6 +3736,22 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) +"VH" = ( +/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/item/radio/intercom/directional/west, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/item/storage/guncase/pistol/kalixpistol{ + pixel_y = -8 + }, +/obj/item/storage/guncase/pistol/kalixpistol{ + pixel_y = 1 + }, +/obj/item/storage/guncase/energy/kalixnock{ + pixel_y = 10 + }, +/obj/structure/closet/secure_closet/armorycage, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/storage/equip) "VI" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -3591,20 +3767,17 @@ /turf/open/floor/wood/birch, /area/ship/crew/dorm) "VK" = ( -/obj/effect/turf_decal/corner_steel_grid{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ + dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/steeldecal/steel_decals_central7, -/obj/structure/cable{ - icon_state = "0-2" +/obj/item/pickaxe/drill, +/obj/item/pickaxe/drill{ + pixel_y = -6 }, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/hardsuit/medical, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/structure/closet/crate/secure/plasma{ + name = "disembarkation gear" }, -/turf/open/floor/plasteel/telecomms_floor, +/turf/open/floor/plasteel/patterned/cargo_one, /area/ship/storage) "VS" = ( /obj/effect/turf_decal/corner_steel_grid{ @@ -3625,16 +3798,30 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/dorm) "Wo" = ( -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/hardsuit/engine, -/obj/item/clothing/head/papersack/smiley{ - pixel_y = 15 +/obj/effect/turf_decal/industrial/warning{ + dir = 4 }, -/obj/machinery/light/directional/north, -/obj/item/radio/intercom/directional/east, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) +/obj/item/melee/sword/mass, +/obj/item/melee/sword/mass{ + pixel_x = 6 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/closet/crate/secure/weapon{ + name = "jungle gear crate" + }, +/obj/item/clothing/under/shorts/dolphin{ + pixel_x = -8; + pixel_y = -6 + }, +/obj/item/clothing/under/shorts/dolphin{ + pixel_x = -8; + pixel_y = -3 + }, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/storage) "Wt" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, @@ -3658,6 +3845,10 @@ }, /turf/open/floor/engine/hull, /area/ship/engineering/engine) +"WI" = ( +/obj/effect/turf_decal/atmos/air, +/turf/open/floor/engine/air, +/area/ship/engineering/engine) "WM" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3668,26 +3859,34 @@ dir = 4 }, /turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) +/area/ship/storage/equip) "WO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/item/kirbyplants{ + icon_state = "plant-14"; + pixel_y = 4; + pixel_x = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/light_switch{ + dir = 8; + pixel_y = 11; + pixel_x = 19 }, /obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/obj/structure/chair/bench/blue/directional/south{ - pixel_y = 10 + dir = 6 }, /turf/open/floor/plasteel/mono/dark, /area/ship/medical) +"WX" = ( +/obj/effect/turf_decal/trimline/opaque/blue/end, +/obj/machinery/stasis, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = 28 + }, +/turf/open/floor/mineral/titanium/tiled/white, +/area/ship/medical) "Xc" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/techfloor{ @@ -3714,14 +3913,11 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "Xg" = ( -/obj/effect/turf_decal/borderfloorwhite{ - dir = 10 - }, -/obj/effect/turf_decal/corner/opaque/blue{ +/obj/effect/turf_decal/industrial/warning{ dir = 4 }, -/turf/open/floor/hangar/plasteel/white, -/area/ship/medical) +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering/engine) "Xh" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/engineering/engine) @@ -3739,6 +3935,9 @@ /obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "XN" = ( @@ -3790,24 +3989,22 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "Yi" = ( -/obj/structure/chair/sofa/blue/corner/directional/east, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/machinery/light/directional/west, -/obj/machinery/computer/helm/viewscreen/directional/north, -/obj/machinery/button/door{ - pixel_x = 17; - pixel_y = 23; - name = "window shutters"; - id = "a_lobby" +/obj/effect/turf_decal/spline/fancy/opaque/blue/corner, +/obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ + dir = 8 }, -/turf/open/floor/wood/birch, -/area/ship/crew/ccommons) +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo) "Yr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, -/area/ship/crew/ccommons) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/meter/atmos/layer2, +/turf/open/floor/plating, +/area/ship/engineering/engine) "YF" = ( /obj/effect/turf_decal/trimline/opaque/blue/filled/arrow_cw{ dir = 4 @@ -3864,7 +4061,10 @@ }, /obj/machinery/light/small/directional/south, /turf/open/floor/pod/dark, -/area/ship/hallway/central) +/area/ship/crew/cryo) +"Zm" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/cargo) "Zn" = ( /obj/structure/catwalk/over/plated_catwalk, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -3895,17 +4095,50 @@ /obj/effect/mapping_helpers/crate_shelve, /turf/open/floor/plating, /area/ship/engineering/engine) +"Zp" = ( +/obj/structure/table/chem, +/obj/item/reagent_containers/glass/chem_jug/sodium{ + pixel_y = 12; + pixel_x = 3 + }, +/obj/item/reagent_containers/glass/chem_jug/sulfur{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/chem_jug/potassium{ + pixel_y = 1; + pixel_x = 1 + }, +/obj/effect/turf_decal/corner/opaque/blue/border{ + dir = 1 + }, +/obj/structure/sink/chem{ + pixel_y = -5; + pixel_x = -21 + }, +/obj/machinery/firealarm/directional/south{ + pixel_x = -8 + }, +/obj/item/clothing/mask/gas/sechailer{ + pixel_y = 5 + }, +/obj/item/clothing/glasses/science{ + pixel_y = 8; + name = "chemistry goggles" + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -19; + pixel_x = 10 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/cargo) "Zz" = ( /obj/structure/closet/secure_closet/medical1{ - name = "medical closet" + name = "medical closet"; + populate = 0 }, /obj/machinery/light/directional/west, -/obj/item/bodybag{ - pixel_x = -6 - }, -/obj/item/bodybag{ - pixel_x = -6 - }, /obj/item/reagent_containers/glass/bottle/morphine{ pixel_x = 5; pixel_y = -7 @@ -3929,11 +4162,24 @@ pixel_y = -4; pixel_x = -7 }, +/obj/item/reagent_containers/glass/bottle/morphine{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/reagent_containers/glass/bottle/morphine{ + pixel_x = 5; + pixel_y = -7 + }, +/obj/item/storage/box/bodybags{ + pixel_x = -8; + pixel_y = -7 + }, /turf/open/floor/mineral/titanium/white, /area/ship/medical) "ZC" = ( /obj/structure/mirror{ - pixel_y = 27 + pixel_y = 27; + layer = 2.89 }, /obj/structure/sink/kitchen{ pixel_y = 15; @@ -3942,50 +4188,69 @@ /obj/effect/turf_decal/spline/fancy/opaque/lightgrey{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plastic, -/area/ship/hallway/central) +/area/ship/crew/toilet) "ZQ" = ( /obj/machinery/atmospherics/components/binary/pump/layer2{ name = "Air To Distro"; dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "ZR" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 10 +/obj/structure/table/chem, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/steeldecal/steel_decals_central7, -/obj/machinery/light_switch{ - pixel_x = 11; - pixel_y = -16; - dir = 1 +/obj/effect/turf_decal/corner/opaque/blue/border{ + dir = 4; + layer = 2.04 }, -/obj/effect/turf_decal/steeldecal/steel_decals6{ - dir = 10 +/obj/machinery/reagentgrinder{ + pixel_y = 2; + pixel_x = -7; + layer = 2.8 }, -/obj/structure/cable, -/obj/item/kirbyplants{ - icon_state = "plant-02"; - pixel_x = 8; - pixel_y = 5 +/obj/item/storage/box/beakers{ + pixel_x = 9; + pixel_y = 9 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) +/obj/item/storage/box/beakers{ + pixel_x = 9; + pixel_y = 1 + }, +/obj/item/reagent_scanner{ + pixel_x = 2; + pixel_y = -3 + }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_x = -28 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/cargo) "ZX" = ( -/obj/effect/turf_decal/atmos/mix, -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{ - dir = 8 +/obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ + dir = 4 }, -/obj/machinery/air_sensor/atmos{ - pixel_x = 11; - pixel_y = -10; - id_tag = "atira_mix" +/obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ + dir = 1 }, -/turf/open/floor/engine/hydrogen_fuel, -/area/ship/engineering/engine) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/medical) (1,1,1) = {" CM @@ -4139,9 +4404,28 @@ cN mN mN "} -(9,1,1) = {" +(9,1,1) = {" +CM +mN +mN +Xh +Nu +QA +IS +tg +db +Xg +ZQ +Ix +mM +tr +mN +mN +CM +"} +(10,1,1) = {" +CM CM -mN mN Xh TH @@ -4150,18 +4434,18 @@ rm Yg nN Lw -ZQ +Yr +Oc +BL Nb -mM -tr -mN mN CM +CM "} -(10,1,1) = {" +(11,1,1) = {" CM CM -mN +ps Xh Xh Xh @@ -4177,12 +4461,12 @@ mN CM CM "} -(11,1,1) = {" +(12,1,1) = {" HD sf -OE +JX lQ -OQ +Wo CA IN IN @@ -4196,74 +4480,93 @@ mN HY HD "} -(12,1,1) = {" +(13,1,1) = {" HD CM -OE -om -xx -Ay +uL +VK +SP +Gh IN -LB -pG +VH +Mk RX Xh -be +TY Xh -ZX +uI mN CM HD "} -(13,1,1) = {" +(14,1,1) = {" HD CM -OE -VK -SP -Gh +HP +RK +zl +Bk sq WM yR LW +Xh +WI +Xh +uY +mN +CM +HD +"} +(15,1,1) = {" +HD +sf +JX +SI +xx +eg +Lj +OQ +Pk +yf Lj FY FY FY FY -CM +HY HD "} -(14,1,1) = {" -HD -sf -OE -RK -zl -Bk +(16,1,1) = {" +CM +CM +JX +NT +HW +Sn Lj -Wo kF -ZR +pG +vX Lj Vg -Ke +SL FY FY -HY -HD +CM +CM "} -(15,1,1) = {" +(17,1,1) = {" CM CM +CM +JX OE OE -Vx -OE Lj AM An -yf +hZ Lj qY GY @@ -4272,14 +4575,14 @@ CM CM CM "} -(16,1,1) = {" +(18,1,1) = {" CM CM CM uu -HW -Sn -ad +mq +ZR +Tr uu KG Lj @@ -4291,14 +4594,14 @@ CM CM CM "} -(17,1,1) = {" +(19,1,1) = {" CM CM CM uu fi ml -Fz +Zp uu qR zA @@ -4310,26 +4613,26 @@ iP CM CM "} -(18,1,1) = {" +(20,1,1) = {" CM CM CM uu MY iO -Tr +Yi gQ hu yx -IS -Uy -Ix +LB +SE +Ic Zz iP CM CM "} -(19,1,1) = {" +(21,1,1) = {" CM CM Pf @@ -4338,17 +4641,17 @@ gk Ao uu uu -nx -pm -tq -SL -Xg +Ej +AD +Hj +rL +sS yy iP CM CM "} -(20,1,1) = {" +(22,1,1) = {" CM CM YO @@ -4357,17 +4660,17 @@ Lq dn hK uu -WO +Fz oa -ap -jD -SE +fb +fb +oA iP iP CM CM "} -(21,1,1) = {" +(23,1,1) = {" CM CM Sa @@ -4376,17 +4679,17 @@ jv Cy MK iS -Ej +ZX AD -Qt -Ic -nq -hZ +mS +mS +sS +be iP CM CM "} -(22,1,1) = {" +(24,1,1) = {" CM CM YO @@ -4396,43 +4699,43 @@ XY dm uu fJ -oa -fb -Ma -oA -mq +pm +Qt +Qt +Ke +tq iP CM CM "} -(23,1,1) = {" +(25,1,1) = {" CM CM Ks uu -uu +Zm xK No uu uN -QA -vX -mS -sS +WO +vP +om +WX wr iP CM CM "} -(24,1,1) = {" +(26,1,1) = {" CM CM CM CM -Cl -Cl -Cl -Cl +uJ +uJ +uJ +uJ Ll iP iP @@ -4443,31 +4746,31 @@ CM CM CM "} -(25,1,1) = {" +(27,1,1) = {" CM CM HD sf -Cl +uJ js EY -Cl +uJ VA Qh -Cl +yE nT NK -Cl +yE HY HD CM "} -(26,1,1) = {" +(28,1,1) = {" CM CM HD CM -Cl +uJ ZC Pa Co @@ -4476,31 +4779,31 @@ hV HM bx Qr -Cl +yE CM HD CM "} -(27,1,1) = {" +(29,1,1) = {" CM CM HD sf -Cl +uJ pY am -Cl +uJ qz eu -Cl +yE nb Za -Cl +yE HY HD CM "} -(28,1,1) = {" +(30,1,1) = {" CM CM CM @@ -4511,15 +4814,15 @@ fa fa vd ee -Cl -Cl -Cl -Cl +yE +yE +yE +yE CM CM CM "} -(29,1,1) = {" +(31,1,1) = {" CM CM CM @@ -4538,7 +4841,7 @@ JZ CM CM "} -(30,1,1) = {" +(32,1,1) = {" CM CM CM @@ -4557,7 +4860,7 @@ JZ CM CM "} -(31,1,1) = {" +(33,1,1) = {" CM CM CM @@ -4568,15 +4871,15 @@ xp fa xh mJ -JZ +Hu Is uM -tl +RQ oN CM CM "} -(32,1,1) = {" +(34,1,1) = {" CM CM CM @@ -4590,12 +4893,12 @@ Cl JZ yu cq -pv -jL +tl +tm CM CM "} -(33,1,1) = {" +(35,1,1) = {" CM CM CM @@ -4609,18 +4912,18 @@ HV AX AX wo -Bz -yE +pv +jL CM CM "} -(34,1,1) = {" +(36,1,1) = {" CM CM CM CM Vq -Yi +iM Mp gH cv @@ -4628,12 +4931,12 @@ Fx SU Vq xQ -Hj -CM +Bz +dA CM CM "} -(35,1,1) = {" +(37,1,1) = {" CM CM CM @@ -4642,9 +4945,28 @@ Vq MI EE oo -uI -Yr +us +ad jf +Vq +iU +rO +CM +CM +CM +"} +(38,1,1) = {" +CM +CM +CM +CM +Vq +nx +iN +oo +nq +ad +Uy Wt CM CM @@ -4652,17 +4974,17 @@ CM CM CM "} -(36,1,1) = {" +(39,1,1) = {" CM CM CM CM Vq -iM -Nu -Mk -PZ +Ay +Ag +bu da +PZ RZ gu CM @@ -4671,7 +4993,7 @@ CM CM CM "} -(37,1,1) = {" +(40,1,1) = {" CM CM CM From 48b0a6f344c107c3d9b56dbb3001ba69cc43bbe8 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 29 Jan 2026 17:13:43 -0600 Subject: [PATCH 10/17] Automatic changelog generation for PR #5725 [ci skip] --- html/changelogs/AutoChangeLog-pr-5725.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5725.yml diff --git a/html/changelogs/AutoChangeLog-pr-5725.yml b/html/changelogs/AutoChangeLog-pr-5725.yml new file mode 100644 index 0000000000..ac156bf41a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5725.yml @@ -0,0 +1,4 @@ +author: Erikafox +changes: + - {rscadd: Atira interior expansion} +delete-after: true From 7b81dd282256181fc7339e037c403bd0be674198 Mon Sep 17 00:00:00 2001 From: Addust <80979251+Addust@users.noreply.github.com> Date: Thu, 29 Jan 2026 22:36:27 +0000 Subject: [PATCH 11/17] FUCKING HELL JERRY (remaps jungle_syndicate.dmm) (#5579) ## About The Pull Request so: - new ramzi mobs. the hatchet user (and engi subtype) who both use a hatchet. duh. the technician has been reclothed (looks like an engi now) and a proper ramzi sawbones mob now exists who has been added to the ruins that would normally have one. this technically nerfs them slightly because the sawbones is unarmoured but bleh. - this also redesigns the crusty old jungle_syndicate ruin into an ICW-era nuclear bunker, meant to give the Gorlex Marauders a jumpstart on retaking the planet should Nanotrasen attempt to nuke it - the ramzi clique have since taken over this bunker, and continue to operate it - new loot: energy sword, on the advice of the creator of the original jungle_syndicate. (locked in the safe) also food supplies, an extra ramzi hardsuit in the armoury, a black-market uplink (removed from the original due to Code Reasons that no longer apply), some cash, jerry's new ramzi officer drip, a firearm cleaning kit (but jerry uses his cobra and the same for the ringneck so bleh), and thats about it - doesnt touch any other ruin things but they do also have solars now instead of the stupid magic smes and pacman-that-does-absolute-fuckall setup - they're also a lot more dug in because they got forewarning because of the very loud and angry SHOOT HIM IN THE DICK contract image image ## Why It's Good For The Game old jungle syndicate was Crusty as Fuck. this should hopefully make it less shit without too many balance implications. ## Changelog :cl: add: Recent recon efforts have identified the Ramzi Clique's successful takeover of various ICW-era nuclear bunkers on jungle planetoids, alongside a major increase in the number of officers named "Jerry" who actually know how to operate their personal submachineguns. /:cl: --------- Signed-off-by: Addust <80979251+Addust@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> --- .../IceRuins/icemoon_training_center.dmm | 4 +- .../JungleRuins/jungle_syndicate.dmm | 5559 +++++++++++------ _maps/RandomRuins/SpaceRuins/scrapstation.dmm | 2 +- _maps/map_catalogue.txt | 2 +- code/datums/ruins/jungle.dm | 4 +- code/game/area/areas/ruins/jungle.dm | 31 +- .../mob/living/simple_animal/corpse.dm | 23 + .../simple_animal/hostile/human/syndicate.dm | 50 +- 8 files changed, 3921 insertions(+), 1754 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_training_center.dmm b/_maps/RandomRuins/IceRuins/icemoon_training_center.dmm index 9426f6d88a..e89fef9cfe 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_training_center.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_training_center.dmm @@ -7673,9 +7673,7 @@ /area/ruin/icemoon/training_facility/dorms) "Lz" = ( /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/human/ramzi/melee/machete{ - name = "Ramzi Clique Sawbones" - }, +/mob/living/simple_animal/hostile/human/ramzi/melee/sawbones, /turf/open/floor/plasteel/mono/white, /area/ruin/icemoon/training_facility/medbay) "LA" = ( diff --git a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm index 8334a1c2e3..46b58169d2 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm @@ -1,75 +1,113 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "4-8" +"ad" = ( +/obj/structure/cable/yellow{ + icon_state = "6-9" }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"al" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/yellow{ + icon_state = "1-6" }, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) "an" = ( /obj/structure/flora/junglebush/b, /obj/structure/flora/grass/jungle, /obj/structure/spacevine, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"bg" = ( -/obj/item/plate, -/obj/structure/chair/plastic{ - dir = 4 +"aX" = ( +/obj/item/stack/cable_coil/yellow{ + pixel_x = 4; + pixel_y = -6 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"bs" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/orange/three_quarters{ + dir = 8 }, -/obj/machinery/door/airlock/hatch{ - name = "Main Hall" +/obj/structure/cable{ + icon_state = "0-8" }, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort) -"bt" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Window Shutters"; - id = "jsynwin"; - dir = 8 +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/light_switch{ + pixel_x = -12; + pixel_y = 22 }, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort) -"bC" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Window Shutters"; - id = "jsynwin"; +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"bg" = ( +/obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/wood/walnut, /area/ruin/jungle/syndifort/jerry) -"bM" = ( -/obj/structure/cable{ - icon_state = "4-10" +"bj" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/plating/asteroid/dirt/jungle/dark, -/area/overmap_encounter/planetoid/jungle/explored) -"bP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/storage/cans/sixbeer, -/turf/open/floor/plating/jungleplanet, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/turf/open/floor/plasteel/dark, /area/ruin/jungle/syndifort) -"ce" = ( -/obj/structure/flora/junglebush/large, -/obj/structure/flora/grass/jungle, -/obj/effect/decal/cleanable/dirt/dust, +"bn" = ( +/obj/structure/flora/stump, +/obj/structure/spacevine, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) +"bs" = ( +/turf/closed/wall/concrete/reinforced, +/area/ruin/jungle/syndifort/canteen) +"bN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/turf/open/floor/plasteel/patterned/ridged, +/area/ruin/jungle/syndifort/canteen) +"bO" = ( +/turf/open/water/jungle/lit, +/area/overmap_encounter/planetoid/jungle/explored) +"bX" = ( +/obj/structure/closet/secure_closet/armorycage{ + anchored = 1; + locked = 0; + req_access = null + }, +/obj/item/storage/box/ammo/c45, +/obj/item/storage/box/ammo/c45, +/obj/item/storage/toolbox/ammo/c10mm, +/obj/item/storage/box/ammo/a12g_buckshot, +/obj/item/storage/box/ammo/a12g_buckshot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium, +/area/ruin/jungle/syndifort/armory) +"cf" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ruin/jungle/syndifort/medical) +"cA" = ( +/obj/structure/cable/yellow{ + icon_state = "4-9" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"cI" = ( +/obj/structure/crate_shelf, +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/radiation, +/obj/item/storage/firstaid/radiation, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/mono/dark/jungleplanet, +/area/ruin/jungle/syndifort/storage) "cO" = ( /obj/structure/flora/junglebush/c, /obj/structure/flora/junglebush, @@ -77,1220 +115,2543 @@ /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) "cS" = ( -/obj/structure/barricade/sandbags, -/obj/structure/flora/junglebush, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/obj/effect/turf_decal/syndicateemblem/top/right, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/freezer/blood, +/obj/effect/mapping_helpers/crate_shelve, +/turf/open/floor/mineral/plastitanium/red/jungle, +/area/ruin/jungle/syndifort/storage) +"cT" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) "cX" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/junglebush, /obj/structure/flora/grass/jungle, /obj/structure/flora/junglebush/c, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) +"cY" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ruin/jungle/syndifort/canteen) +"dk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/black{ + dir = 9 + }, +/obj/structure/table, +/turf/open/floor/plating/jungleplanet, +/area/ruin/jungle/syndifort/storage) "dp" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/dirt/jungle/dark, -/area/overmap_encounter/planetoid/jungle/explored) +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort) "dw" = ( /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"dK" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +"dJ" = ( +/obj/effect/turf_decal/solarpanel, +/obj/machinery/power/solar, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, /area/overmap_encounter/planetoid/jungle/explored) "dO" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/junglebush/c, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"dP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/bed, -/obj/structure/curtain/cloth/fancy, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" - }, -/area/ruin/jungle/syndifort) "ef" = ( -/mob/living/simple_animal/hostile/human/ramzi{ - desc = "God dammit Jerry! Why the fuck are you barricading yourself in with all of our weapon supplies?"; - name = "Jerry"; - unsuitable_atmos_damage = 0 +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/turf/open/floor/plating/jungleplanet, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 5 + }, +/obj/structure/filingcabinet{ + pixel_x = -10; + pixel_y = 0; + density = 0 + }, +/turf/open/floor/wood/walnut, /area/ruin/jungle/syndifort/jerry) +"ej" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort) +"en" = ( +/obj/structure/cable{ + icon_state = "4-9" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) "es" = ( /obj/structure/flora/junglebush/c, /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"ex" = ( -/obj/structure/flora/junglebush, +"ey" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-10" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"eF" = ( /obj/structure/flora/junglebush/c, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"eR" = ( -/obj/structure/closet/crate/secure/science, -/obj/item/research_notes/loot/medium, -/obj/item/stack/sheet/plastic/twenty, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"eU" = ( -/obj/structure/chair/plastic, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) "eW" = ( -/obj/effect/decal/cleanable/blood, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"fe" = ( -/turf/closed/wall, -/area/ruin/jungle/syndifort) -"fi" = ( -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"fn" = ( -/obj/structure/barricade/sandbags, -/obj/structure/flora/grass/jungle, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating/rust, +/area/ruin/jungle/syndifort/electrical) +"fb" = ( +/obj/structure/spacevine, +/obj/structure/cable{ + icon_state = "1-5" + }, +/obj/structure/cable{ + icon_state = "5-10" + }, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) +"fi" = ( +/turf/closed/wall/concrete/reinforced, +/area/ruin/jungle/syndifort/storage) +"fj" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 1 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) "fE" = ( -/obj/structure/flora/junglebush/b, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/structure/sign/poster/contraband/syndiemoth{ + pixel_x = -32 + }, +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_x = 0; + pixel_y = 6 + }, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/jerry) "fI" = ( /obj/structure/flora/rock/pile/largejungle, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"fS" = ( -/mob/living/simple_animal/hostile/human/ramzi{ - unsuitable_atmos_damage = 0 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"gb" = ( -/obj/structure/flora/junglebush/c, -/obj/structure/flora/junglebush, -/obj/structure/flora/grass/jungle, -/obj/structure/flora/rock/jungle, +"fU" = ( +/obj/structure/spacevine/weak, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"gf" = ( -/obj/structure/closet/crate/secure/gear, -/obj/item/blackmarket_uplink, -/obj/machinery/light/directional/west, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort/jerry) "gl" = ( /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"gx" = ( -/obj/structure/chair/office{ - dir = 8; - name = "evil chair" - }, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort/jerry) +"gu" = ( +/obj/structure/flora/stump, +/obj/structure/spacevine/weak, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) "gG" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/grass/jungle, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/rock, +/obj/structure/spacevine, +/obj/structure/flora/ash/garden, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"gK" = ( -/obj/structure/cable{ - icon_state = "1-2" +"gO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/obj/structure/cable{ - icon_state = "1-10" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/structure/flippedtable{ + icon_state = "wood_table"; + table_type = /obj/structure/table/wood; + dir = 2 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"gO" = ( -/turf/open/floor/mineral/plastitanium/red/jungle, +/mob/living/simple_animal/hostile/human/ramzi/ranged/officer/smg{ + name = "Jerry"; + desc = "A paranoid officer of the Ramzi Clique, cradling a compact submachinegun in blackened gloves."; + weapon_drop_chance = 100; + environment_smash = 0 + }, +/turf/open/floor/wood/walnut, /area/ruin/jungle/syndifort/jerry) -"gP" = ( -/obj/structure/table, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/machinery/light/small/directional/south, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) "gQ" = ( -/obj/structure/table/wood, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"gU" = ( -/obj/structure/table/reinforced, -/obj/item/folder/syndicate, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate, -/obj/item/paper_bin, -/obj/item/pen/edagger, -/obj/machinery/light/directional/west, -/turf/open/floor/plating, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/structure/dresser, +/obj/item/flashlight/lamp/green{ + pixel_x = -7; + pixel_y = 15 + }, +/turf/open/floor/carpet/red_gold, /area/ruin/jungle/syndifort/jerry) "gY" = ( -/obj/structure/sign/poster/contraband/syndicate_recruitment{ - pixel_y = 32; - pixel_x = 4 +/turf/closed/wall/concrete/reinforced, +/area/ruin/jungle/syndifort/dorms) +"ha" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/chair{ + dir = 8; + pixel_x = 3; + pixel_y = 6 }, -/obj/structure/table/wood, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" +/turf/open/floor/plasteel/patterned/ridged, +/area/ruin/jungle/syndifort/canteen) +"hb" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, /area/ruin/jungle/syndifort) -"ho" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"hF" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Base Gates"; - id = "jsyngate" +"hf" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/atmos) +"hg" = ( +/obj/machinery/power/smes{ + output_level = 15000; + charge = 1.5e+006 }, /obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort/jerry) -"hK" = ( -/obj/effect/decal/remains/human, -/turf/open/floor/plating/jungleplanet{ - icon_state = "panelscorched" - }, -/area/ruin/jungle/syndifort) -"hQ" = ( -/obj/structure/cable{ - icon_state = "6-9" - }, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" + icon_state = "0-4" }, -/area/overmap_encounter/planetoid/jungle/explored) -"hZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/syndicateemblem/top/right, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"ii" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"hh" = ( /obj/structure/cable{ - icon_state = "0-5" - }, -/obj/machinery/porta_turret/ruin/ramzi{ - dir = 10 + icon_state = "5-10" }, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" - }, -/area/ruin/jungle/syndifort/jerry) -"ik" = ( -/obj/item/melee/knife/combat{ - name = "bushcutter"; - force = 18 - }, -/obj/structure/table, -/obj/item/stack/sheet/mineral/plasma/twenty, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"iN" = ( -/obj/structure/flora/stump, -/turf/open/floor/plating/asteroid/dirt/jungle/dark, -/area/overmap_encounter/planetoid/jungle/explored) -"iW" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"iY" = ( -/turf/closed/wall/mineral/wood, -/area/ruin/jungle/syndifort) -"jb" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/camera/autoname{ - dir = 10 +"hj" = ( +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 8 }, -/turf/open/floor/plating/jungleplanet, +/turf/open/floor/plasteel/dark, /area/ruin/jungle/syndifort) -"jr" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/junglebush, +"hk" = ( +/obj/machinery/atmospherics/components/binary/pump/on/layer4{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/paper/crumpled{ + name = "old paper scrap"; + desc = "This one looks like it dates back to the Inter-Corporate War."; + default_raw_text = "REMINDER: Disable intake pump in event of radiological event. Do not reactivate until line has been thoroughly cleaned." + }, +/turf/open/floor/plasteel/mono/dark, +/area/ruin/jungle/syndifort/atmos) +"ho" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/spacevine, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"kp" = ( -/obj/machinery/light/directional/west, -/obj/structure/table, -/obj/item/grenade/smokebomb, -/obj/item/grenade/smokebomb, -/obj/item/grenade/smokebomb, -/obj/item/grenade/smokebomb, -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" +"hF" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 1 }, -/area/ruin/jungle/syndifort) -"kr" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/door/poddoor/preopen{ + id = "jungle_syndicate_cargo_door" }, -/obj/effect/turf_decal/syndicateemblem/middle/middle, -/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark/jungleplanet, +/area/ruin/jungle/syndifort/storage) +"hH" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-6" }, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"ks" = ( -/obj/item/trash/syndi_cakes, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"kJ" = ( -/obj/structure/flora/junglebush/large, -/obj/structure/flora/junglebush, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"kP" = ( -/obj/structure/cable{ - icon_state = "4-8" +"hJ" = ( +/obj/effect/turf_decal/syndicateemblem/middle/middle, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 5 }, -/obj/effect/turf_decal/syndicateemblem/middle/right, -/obj/structure/cable{ - icon_state = "5-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 9 }, /turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"lc" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/grass/jungle, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"lq" = ( -/obj/structure/flora/junglebush, -/obj/structure/flora/grass/jungle/b, +/area/ruin/jungle/syndifort/storage) +"hL" = ( +/obj/structure/cable{ + icon_state = "2-9" + }, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"lD" = ( +"ib" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" + }, +/obj/item/radio/intercom/directional/north, +/obj/structure/cable{ + icon_state = "4-10" }, /turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"lH" = ( -/obj/item/trash/candle{ - pixel_x = 9; - pixel_y = 14 +/area/ruin/jungle/syndifort/storage) +"ic" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"lR" = ( /obj/structure/cable{ icon_state = "4-9" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/dirt/jungle/dark, -/area/overmap_encounter/planetoid/jungle/explored) -"mq" = ( -/obj/structure/flora/junglebush/c, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"mt" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Base Gates"; - id = "jsyngate" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 }, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 }, -/area/ruin/jungle/syndifort/jerry) -"mN" = ( -/obj/structure/flora/junglebush/c, -/obj/structure/spacevine/dense, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"mO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/grass/jungle, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"mY" = ( -/obj/structure/chair/plastic, -/mob/living/simple_animal/hostile/human/ramzi/ranged, -/turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"np" = ( -/obj/structure/spacevine, -/obj/structure/spacevine/dense, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"nH" = ( -/turf/closed/wall/rust, -/area/ruin/jungle/syndifort) -"nO" = ( -/turf/open/floor/plating/jungleplanet{ - icon_state = "panelscorched" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 4 }, -/area/ruin/jungle/syndifort) -"nT" = ( -/obj/item/ammo_casing/spent{ - dir = 1; - pixel_x = -5; +/obj/item/kitchen/fork/plastic{ + pixel_x = 5; pixel_y = 6 }, -/obj/item/ammo_casing/spent{ - dir = 9; - pixel_x = 10; - pixel_y = 3 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 }, -/obj/item/ammo_casing/spent{ - dir = 9; - pixel_x = 3; - pixel_y = -9 +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"ig" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 4 }, -/turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"oi" = ( -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating/jungleplanet{ - icon_state = "panelscorched" +/obj/effect/turf_decal/borderfloorblack/corner, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"ii" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "2-5" + }, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/jerry) +"ik" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/area/ruin/jungle/syndifort) -"oj" = ( -/obj/structure/spacevine/dense, /obj/structure/flora/grass/jungle, -/obj/structure/flora/junglebush, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"oq" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Base Gates"; - id = "jsyngate"; +"il" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ dir = 4 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort/jerry) -"oE" = ( -/obj/structure/cable{ - icon_state = "4-9" +/obj/effect/turf_decal/borderfloorblack{ + dir = 10 }, -/turf/open/floor/plating/asteroid/dirt/jungle/dark, -/area/overmap_encounter/planetoid/jungle/explored) -"pr" = ( /obj/structure/cable{ - icon_state = "2-4" + icon_state = "6-9" }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"pF" = ( -/obj/structure/barricade/sandbags, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort/jerry) -"pY" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/obj/item/shard{ + pixel_x = 8; + pixel_y = -2 }, +/obj/effect/decal/cleanable/glass, +/obj/item/storage/bag/tray/cafeteria{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"it" = ( +/obj/effect/turf_decal/syndicateemblem/bottom/middle, +/turf/open/floor/mineral/plastitanium/red/jungle, +/area/ruin/jungle/syndifort/storage) +"iN" = ( +/obj/structure/spacevine/weak, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"qd" = ( +"iW" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/button/door{ - dir = 8; - name = "Base Gate Shutters"; - id = "jsyngate"; - pixel_x = 23; - pixel_y = 7 +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/stump, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"jb" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/machinery/button/door{ +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/wideband/table{ dir = 8; - name = "Gear Room Shutters"; - id = "jsyngear"; - pixel_x = 26; - pixel_y = -4 - }, -/obj/machinery/turretid{ - pixel_x = 36; - pixel_y = 4 + pixel_x = -4; + pixel_y = 11 }, -/obj/machinery/button/door{ +/obj/item/radio/intercom/table{ dir = 8; - name = "Window Shutters"; - id = "jsynwin"; - pixel_x = 35; - pixel_y = -4 + pixel_x = -4; + pixel_y = -2 }, -/turf/open/floor/mineral/plastitanium/red/jungle, +/turf/open/floor/wood/walnut, /area/ruin/jungle/syndifort/jerry) -"qq" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/junglebush/large, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"qx" = ( -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +"jk" = ( +/obj/structure/flora/junglebush/b, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"qA" = ( +"jq" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/cable{ - icon_state = "5-8" + icon_state = "1-8" }, -/obj/effect/turf_decal/syndicateemblem/top/left, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"qL" = ( -/obj/structure/flora/stump, -/obj/structure/sign/warning/securearea{ - pixel_y = 32 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 9 }, -/turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"rg" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 9 }, -/mob/living/simple_animal/hostile/human/ramzi/ranged/space/shotgun, /turf/open/floor/plating/jungleplanet{ - icon_state = "panelscorched" - }, -/area/ruin/jungle/syndifort) -"rk" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Gear Room Shutters"; - id = "jsyngear"; - dir = 8 + icon_state = "plating_rust" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort/jerry) -"rN" = ( +/area/ruin/jungle/syndifort/storage) +"jr" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort/jerry) -"sf" = ( +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"jN" = ( +/mob/living/simple_animal/hostile/human/ramzi/melee/sawbones, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 5 + }, +/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ - icon_state = "6-8" + icon_state = "0-4" }, -/turf/open/floor/plating/asteroid/dirt/jungle/dark, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/light_switch{ + pixel_x = 12; + pixel_y = 22 + }, +/turf/open/floor/plasteel/white, +/area/ruin/jungle/syndifort/medical) +"jS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/item/shard{ + icon_state = "medium"; + pixel_x = 9; + pixel_y = -4 + }, +/obj/effect/decal/cleanable/glass, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ruin/jungle/syndifort/canteen) +"kf" = ( +/obj/item/reagent_containers/glass/bucket/wooden{ + pixel_x = 8; + pixel_y = 7 + }, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"sq" = ( -/obj/machinery/power/apc/auto_name/directional/north, +"kp" = ( +/obj/structure/cable{ + icon_state = "5-10" + }, +/obj/item/stack/cable_coil/cut/red, +/obj/structure/spacevine/weak, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"ky" = ( +/obj/structure/spacevine, +/obj/structure/cable{ + icon_state = "5-10" + }, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"kz" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/dorms) +"kJ" = ( +/obj/structure/flora/junglebush/large, +/obj/structure/flora/junglebush, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"kL" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/atmos) +"kP" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/plating/jungleplanet, +/area/ruin/jungle/syndifort/storage) +"kY" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"kZ" = ( +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/closed/wall/concrete/reinforced, +/area/ruin/jungle/syndifort/atmos) +"lq" = ( +/obj/structure/flora/junglebush, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"lA" = ( +/obj/machinery/atmospherics/components/trinary/filter/on/layer4{ + dir = 1; + filter_type = "o2" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/atmos) +"lD" = ( +/obj/structure/closet/radiation, +/obj/effect/turf_decal/box, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/mono/dark, +/area/ruin/jungle/syndifort/electrical) +"lG" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6; + color = "#543C30" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/structure/bedsheetbin{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/modular_computer/laptop/preset/civilian{ + pixel_x = -19; + pixel_y = 8 + }, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/dorms) +"me" = ( +/obj/structure/safe, +/obj/effect/decal/cleanable/dirt, +/obj/item/spacecash/bundle/smallrand, +/obj/machinery/light/directional/east, +/obj/item/spacecash/bundle/smallrand, +/obj/item/folder/documents/syndicate/red, +/obj/item/melee/energy/flyssa, +/turf/open/floor/mineral/plastitanium, +/area/ruin/jungle/syndifort/armory) +"mh" = ( +/obj/structure/closet/crate/wooden, +/obj/item/clothing/under/syndicate/ramzi, +/obj/item/clothing/under/syndicate/ramzi/overalls, +/obj/item/clothing/under/syndicate/ramzi/overalls, +/obj/item/clothing/head/ramzi/flap, +/obj/item/clothing/head/ramzi, +/obj/item/clothing/head/ramzi, +/obj/item/clothing/glasses/hud/security/sunglasses/ramzi, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/suit/ramzi, +/turf/open/floor/plasteel/mono/dark, +/area/ruin/jungle/syndifort/dorms) +"mk" = ( +/obj/effect/turf_decal/corner/opaque/syndiered/full, /obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/armory) +"mo" = ( +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort) +"mD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium, +/area/ruin/jungle/syndifort/armory) +"mN" = ( +/obj/structure/flora/junglebush/c, +/obj/structure/spacevine/dense, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"mR" = ( +/obj/effect/turf_decal/solarpanel, +/obj/machinery/power/tracker, +/obj/structure/cable/yellow{ icon_state = "0-2" }, -/turf/open/floor/mineral/plastitanium/red/jungle, +/turf/open/floor/plasteel, +/area/overmap_encounter/planetoid/jungle/explored) +"nH" = ( +/turf/closed/wall/concrete/reinforced, +/area/ruin/jungle/syndifort/armory) +"nI" = ( +/obj/machinery/porta_turret/ruin/ramzi/light{ + id = "jungle_syndicate_turrets"; + dir = 9 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating/jungleplanet{ + icon_state = "plating_rust" + }, +/area/ruin/jungle/syndifort/jerry) +"nT" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#543C30" + }, +/obj/structure/table/wood, +/turf/open/floor/wood/walnut{ + icon_state = "wood-broken4" + }, +/area/ruin/jungle/syndifort/dorms) +"og" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"ov" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/ruin/jungle/syndifort) -"sY" = ( +"oA" = ( /obj/structure/cable{ - icon_state = "2-9" + icon_state = "4-8" }, -/turf/open/floor/mineral/plastitanium/red/jungle, +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 4 + }, +/obj/effect/turf_decal/borderfloorblack/corner, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/structure/flippedtable{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"oK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/radiation{ + pixel_y = -32 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 4 + }, +/obj/structure/flippedtable{ + dir = 8 + }, +/mob/living/simple_animal/hostile/human/ramzi/ranged{ + weapon_drop_chance = 100; + environment_smash = 0 + }, +/turf/open/floor/plating/rust, /area/ruin/jungle/syndifort) +"oL" = ( +/obj/item/chair{ + dir = 8; + pixel_x = 3; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ruin/jungle/syndifort/canteen) +"pi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/poddoor/preopen{ + id = "jungle_syndicate_lockdown"; + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/electrical) +"pk" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 6 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 2; + pixel_y = -8 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 1 + }, +/obj/item/attachment/bayonet{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/stack/ore/salvage/scrapmetal{ + pixel_x = -9; + pixel_y = -3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/armory) +"pq" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 8 + }, +/obj/machinery/door/airlock/medical/glass{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/medical) +"px" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 9 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -7; + pixel_y = 15 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/flippedtable{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"pB" = ( +/obj/machinery/door/window/southleft{ + dir = 4 + }, +/obj/machinery/shower{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating/catwalk_floor, +/area/ruin/jungle/syndifort/dorms) +"pC" = ( +/obj/structure/cable/yellow{ + icon_state = "4-10" + }, +/obj/structure/cable/yellow{ + icon_state = "1-10" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"pF" = ( +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/carpet/red, +/area/ruin/jungle/syndifort/jerry) +"pX" = ( +/obj/effect/turf_decal/corner/opaque/orange/three_quarters{ + dir = 1 + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 5 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"pZ" = ( +/obj/structure/toilet{ + dir = 8; + pixel_x = 5 + }, +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/mirror{ + pixel_y = 35 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/jungle/syndifort/dorms) +"qa" = ( +/obj/structure/salvageable/machine{ + pixel_x = -4; + pixel_y = -3; + name = "broken fallout sampler" + }, +/obj/structure/spacevine/weak, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"qd" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/jerry) +"qe" = ( +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/atmos) +"qh" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10; + color = "#543C30" + }, +/obj/machinery/washing_machine, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/dorms) +"qq" = ( +/obj/structure/flora/grass/jungle, +/obj/structure/flora/junglebush/large, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"qr" = ( +/obj/effect/turf_decal/corner/opaque/orange, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/atmos) +"qt" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"qx" = ( +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"qL" = ( +/obj/item/food/grown/sweet_potato, +/obj/item/food/grown/sweet_potato, +/obj/item/food/grown/sweet_potato, +/obj/structure/closet/crate/wooden, +/obj/item/food/grown/wheat, +/obj/item/food/grown/wheat, +/obj/item/food/grown/wheat, +/obj/item/food/grown/wheat, +/obj/item/food/grown/mushroom/chanterelle, +/obj/item/food/grown/eggplant, +/obj/item/food/grown/garlic, +/obj/item/food/grown/garlic, +/obj/item/food/grown/grapes, +/obj/item/food/grown/apple, +/obj/item/food/grown/apple, +/obj/item/food/grown/berries, +/obj/item/food/grown/berries, +/obj/item/food/grown/berries, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"qV" = ( +/obj/machinery/light/small/directional/west, +/obj/item/attachment/rail_light{ + pixel_x = 0; + pixel_y = 5 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/plating/rust, +/area/ruin/jungle/syndifort/armory) +"qY" = ( +/obj/structure/cable/yellow{ + icon_state = "2-5" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"rd" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/item/chair{ + pixel_x = -4; + pixel_y = 7 + }, +/turf/open/floor/plating/rust, +/area/ruin/jungle/syndifort/canteen) +"rt" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable{ + icon_state = "4-10" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plating/jungleplanet, +/area/ruin/jungle/syndifort/storage) +"rG" = ( +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/dorms) +"rN" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/item/modular_computer/laptop/preset/civilian/rilena{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door{ + id = "jungle_syndicate_lockdown"; + name = "Lockdown Blast Doors"; + pixel_x = -23; + pixel_y = -3; + dir = 4 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/gun_maint_kit{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/machinery/turretid/lethal{ + pixel_x = -28; + desc = "Used to control a facility's automated defenses."; + id = "jungle_syndicate_turrets"; + pixel_y = -15; + req_access = list(150) + }, +/obj/machinery/button/door{ + id = "jungle_syndicate_cargo_door"; + name = "Storage Room Blast Door"; + pixel_x = -23; + pixel_y = 8; + dir = 4 + }, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/jerry) +"sf" = ( +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/atmos) +"sm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/orange/three_quarters, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"sr" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/dorms) +"sw" = ( +/obj/structure/barricade/sandbags, +/obj/item/stack/cable_coil/cut/red, +/obj/structure/spacevine, +/turf/open/floor/plating/asteroid/dirt/jungle/dark, +/area/overmap_encounter/planetoid/jungle/explored) +"sF" = ( +/obj/effect/turf_decal/box, +/obj/machinery/computer/monitor/retro{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"sI" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/armory) +"sL" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/computer/solar_control{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/electrical) +"sQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8; + color = "#543C30" + }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/dorms) +"sR" = ( +/obj/machinery/hydroponics/soil, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) "tf" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/power/terminal{ dir = 1 }, -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/turf_decal/industrial/outline/yellow, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"th" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/stack/cable_coil/cut/red, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"tm" = ( -/obj/structure/flora/junglebush, -/obj/structure/flora/grass/jungle, -/obj/structure/flora/rock/jungle, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) +/obj/structure/cable/yellow{ + icon_state = "8-10" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/electrical) "tt" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Base Gates"; - id = "jsyngate" +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" }, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" +/obj/structure/cable{ + icon_state = "2-4" }, -/area/ruin/jungle/syndifort/jerry) +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/dorms) +"tE" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 9 + }, +/obj/item/gun_maint_kit{ + pixel_x = 1; + pixel_y = 12 + }, +/obj/item/paper/crumpled{ + default_raw_text = "NOTE: Get spare field emitters. Flyssa will only last a few more weeks on this one."; + pixel_x = -9; + pixel_y = -11 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/armory) +"tK" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort) "tL" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"tZ" = ( +"uc" = ( +/obj/effect/turf_decal/solarpanel, +/obj/machinery/power/solar, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel, +/area/overmap_encounter/planetoid/jungle/explored) +"uf" = ( +/obj/structure/barricade/sandbags, +/obj/structure/spacevine, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"ug" = ( +/obj/structure/flora/junglebush, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Base Gates"; - id = "jsyngate"; +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"uh" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 8 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort/jerry) -"ud" = ( -/obj/structure/table, -/obj/item/melee/knife/combat{ - name = "bushcutter"; - force = 18 +/obj/machinery/door/airlock/hatch{ + dir = 4 }, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort) -"ug" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating/jungleplanet, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/ruin/jungle/syndifort) -"uh" = ( -/obj/effect/decal/cleanable/blood, +"uj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5; + color = "#543C30" + }, +/obj/structure/closet/wall/red/directional/east, +/obj/item/spacecash/bundle/pocketchange, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/item/modular_computer/laptop/preset/civilian, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/dorms) +"ur" = ( +/obj/effect/turf_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/syndiered, +/turf/open/floor/plating/rust, +/area/ruin/jungle/syndifort/canteen) +"us" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/atmos) +"uu" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"uC" = ( +/obj/structure/flora/stump, +/obj/structure/spacevine/weak, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"uV" = ( +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 8 + }, +/obj/effect/turf_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 19; + pixel_y = 9 + }, +/obj/item/chair{ + dir = 8; + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"ve" = ( +/obj/effect/turf_decal/box, +/obj/machinery/autolathe, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) "vs" = ( /obj/structure/flora/rock/jungle, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/junglebush/c, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"vt" = ( -/turf/closed/wall/r_wall, -/area/ruin/jungle/syndifort) "vJ" = ( -/obj/structure/bed, -/obj/structure/curtain/cloth/fancy, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"vX" = ( -/obj/structure/flora/junglebush/b, -/obj/structure/flora/grass/jungle, -/obj/structure/flora/rock/jungle, -/obj/structure/flora/rock, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"wd" = ( -/obj/structure/flora/junglebush/c, -/obj/structure/flora/junglebush/c, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"wh" = ( -/obj/structure/flora/rock/pile, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"wo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Base Gates"; - id = "jsyngate"; - dir = 8 - }, -/turf/open/floor/plating/jungleplanet, +/obj/machinery/suit_storage_unit/inherit/industrial, +/obj/item/clothing/suit/space/hardsuit/syndi, +/obj/item/clothing/mask/gas/syndicate, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/item/tank/internals/oxygen, +/turf/open/floor/plating, /area/ruin/jungle/syndifort/jerry) +"wo" = ( +/turf/closed/wall/concrete/reinforced, +/area/ruin/jungle/syndifort) "ws" = ( /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) "wu" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Command Room Shutters"; - id = "jsynbridge"; - dir = 8 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "4-10" }, -/turf/open/floor/plasteel/stairs{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/wood/walnut, /area/ruin/jungle/syndifort/jerry) -"ww" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/syndicateemblem/bottom/middle, -/obj/structure/cable{ - icon_state = "1-2" +"wN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 9 }, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"wz" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 6 }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"wT" = ( /obj/structure/cable{ - icon_state = "1-10" + icon_state = "5-9" }, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort) +/obj/structure/flora/junglebush/c, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) "xa" = ( -/obj/structure/chair/plastic{ - dir = 8 +/turf/closed/wall/concrete/reinforced, +/area/ruin/jungle/syndifort/atmos) +"xu" = ( +/obj/effect/turf_decal/syndicateemblem/bottom/left, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium/red/jungle, +/area/ruin/jungle/syndifort/storage) +"xA" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 2; + color = "#543C30" }, -/obj/structure/sign/poster/contraband/peacemaker{ - pixel_x = 32 +/obj/item/radio/intercom/directional/south, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 5 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"xm" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 }, -/obj/machinery/camera/autoname, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/dorms) "xC" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Command Room Shutters"; - id = "jsynbridge"; +/obj/effect/turf_decal/siding/wood{ dir = 4 }, -/turf/open/floor/plasteel/stairs{ - dir = 4 +/obj/machinery/button/door{ + dir = 8; + pixel_x = 25; + pixel_y = 6; + id = "jungle_syndie_bridge_window"; + name = "Window Cover" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24; + pixel_y = -3 }, +/turf/open/floor/wood/walnut, /area/ruin/jungle/syndifort/jerry) -"xY" = ( +"xF" = ( +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/light_switch{ + pixel_x = -7; + pixel_y = 22 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/atmos) +"xM" = ( +/obj/structure/barricade/sandbags, /obj/structure/cable{ - icon_state = "5-8" + icon_state = "6-10" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/dirt/jungle/dark, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"yc" = ( +/obj/structure/flora/rock/jungle, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) "yd" = ( +/obj/structure/flora/junglebush, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"ye" = ( +/obj/effect/turf_decal/solarpanel, +/obj/machinery/power/solar, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel, +/area/overmap_encounter/planetoid/jungle/explored) +"yf" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "5-10" }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"yh" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/grass/jungle, -/obj/structure/spacevine, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) +"yh" = ( +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "jungle_syndie_bridge_window"; + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort) +"yj" = ( +/obj/structure/cable/yellow{ + icon_state = "4-5" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/black{ + dir = 8 + }, +/obj/item/stack/sheet/mineral/plasma/twenty, +/obj/structure/closet/crate/engineering/electrical, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/glass/twenty, +/turf/open/floor/plating/rust, +/area/ruin/jungle/syndifort/electrical) +"ym" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) "ys" = ( /obj/structure/cable{ icon_state = "0-8" }, /obj/machinery/porta_turret/ruin/ramzi{ - dir = 6 + dir = 6; + id = "jungle_syndicate_turrets" }, /turf/open/floor/plating/jungleplanet{ icon_state = "plating_rust" }, -/area/ruin/jungle/syndifort/jerry) -"yx" = ( -/obj/structure/sign/donk{ - pixel_y = 33 - }, -/turf/open/floor/plating/jungleplanet, /area/ruin/jungle/syndifort) -"yD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort/jerry) "yJ" = ( -/obj/item/trash/can/food{ - pixel_x = 8; - pixel_y = -3 - }, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"yL" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Window Shutters"; - id = "jsynwin"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort) -"yM" = ( -/obj/structure/spacevine, -/obj/structure/flora/junglebush, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"yZ" = ( -/turf/template_noop, -/area/template_noop) -"zr" = ( -/obj/item/flashlight/lantern, -/turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"zu" = ( /obj/structure/flora/grass/jungle, -/obj/structure/flora/grass/jungle, -/obj/structure/flora/rock/jungle, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) +"yR" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/obj/item/chair{ + pixel_x = 0; + pixel_y = 3 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"yZ" = ( +/turf/template_noop, +/area/template_noop) "zv" = ( /obj/structure/flora/stump, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) "zB" = ( -/obj/structure/cable{ - icon_state = "6-8" +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/electrical) "zH" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/grass/jungle, /obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/human/ramzi/melee/hatchet/engi, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) "zK" = ( /obj/structure/flora/rock/jungle, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) "zM" = ( -/turf/closed/wall/r_wall, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/bed, +/obj/item/bedsheet/syndie, +/obj/machinery/light/small/directional/north, +/turf/open/floor/carpet/red_gold, /area/ruin/jungle/syndifort/jerry) +"zN" = ( +/obj/machinery/shower{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/plating/rust, +/area/ruin/jungle/syndifort) +"zU" = ( +/obj/structure/closet/wall/white/directional/west, +/obj/structure/sink/chem{ + pixel_x = 4; + pixel_y = -5 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 + }, +/obj/structure/table/reinforced, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/cabbage, +/obj/item/food/grown/cabbage, +/obj/item/food/grown/onion, +/obj/item/reagent_containers/condiment/milk, +/obj/machinery/reagentgrinder{ + pixel_x = -8; + pixel_y = 9 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"zX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) "Aa" = ( /obj/structure/flora/junglebush/large, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) "Ai" = ( -/turf/closed/wall/r_wall/rust, -/area/ruin/jungle/syndifort/jerry) -"Al" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/light/directional/west, -/obj/structure/table, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" +/obj/effect/turf_decal/siding/wood{ + dir = 6 }, -/area/ruin/jungle/syndifort) -"Ao" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Window Shutters"; - id = "jsynwin"; +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -9; + pixel_y = -19 + }, +/turf/open/floor/carpet/red_gold, /area/ruin/jungle/syndifort/jerry) +"Aq" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, +/obj/machinery/door/airlock{ + id_tag = "jungle_syndie_shitter" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/dorms) "At" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/junglebush/c, -/obj/structure/flora/rock/pile/largejungle, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 + }, +/turf/open/floor/plasteel/white, +/area/ruin/jungle/syndifort/canteen) "Au" = ( /obj/structure/flora/grass/jungle, /obj/structure/spacevine/dense, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"AB" = ( -/obj/machinery/computer/security{ +"Ax" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort/jerry) -"AQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/corner/opaque/black{ + dir = 10 }, -/turf/open/floor/plating/jungleplanet, +/turf/open/floor/plating/rust, /area/ruin/jungle/syndifort) +"AJ" = ( +/obj/effect/spawner/bunk_bed, +/obj/effect/turf_decal/siding/wood{ + dir = 2; + color = "#543C30" + }, +/obj/structure/sign/poster/rilena/random{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/jungle/syndifort/dorms) "Ba" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/grass/jungle, /obj/structure/flora/rock, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Bv" = ( -/obj/machinery/suit_storage_unit/open, -/obj/item/toy/nuke, -/obj/effect/turf_decal/industrial/outline/red, -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" +"Bh" = ( +/obj/effect/turf_decal/borderfloorblack/corner{ + dir = 1 }, -/area/ruin/jungle/syndifort) -"By" = ( -/obj/structure/flora/junglebush/c, -/obj/structure/flora/junglebush/large, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/corner/opaque/syndiered/diagonal{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/ruin/jungle/syndifort/canteen) +"Bi" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"BC" = ( +"BS" = ( +/obj/effect/spawner/random/vending/cola, +/turf/open/floor/plasteel/mono/dark, +/area/ruin/jungle/syndifort/canteen) +"Cg" = ( /obj/structure/chair/plastic, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" +/mob/living/simple_animal/hostile/human/ramzi/ranged/cottonmouth{ + environment_smash = 0 }, -/area/ruin/jungle/syndifort) -"BH" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort) -"BK" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-2" +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"Co" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/item/shard{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/effect/decal/cleanable/glass, +/obj/item/storage/bag/tray/cafeteria{ + pixel_x = 2; + pixel_y = -10 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) "Cr" = ( -/obj/structure/flora/rock, -/turf/open/floor/plating/asteroid/dirt/jungle, +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/structure/spacevine/dense, +/turf/open/floor/plating/asteroid/dirt/jungle/dark, /area/overmap_encounter/planetoid/jungle/explored) +"CD" = ( +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/medical) "CI" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/mob/living/simple_animal/hostile/human/ramzi/ranged/space/shotgun, /obj/structure/cable{ - icon_state = "0-5" + icon_state = "4-8" }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/jungleplanet, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plating, /area/ruin/jungle/syndifort) +"CO" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/storage) +"Dc" = ( +/obj/effect/turf_decal/syndicateemblem/top/middle, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/mineral/plastitanium/red/jungle, +/area/ruin/jungle/syndifort/storage) +"Df" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/dorms) "Dt" = ( -/obj/structure/sign/poster/contraband/syndicate_recruitment, -/turf/closed/wall/rust, -/area/ruin/jungle/syndifort) -"DO" = ( -/obj/structure/cable{ - icon_state = "4-8" +/mob/living/basic/cow{ + faction = list("neutral","Ramzi Clique"); + name = "ramzi clique cow"; + desc = "Known for their milk, just don't tip them over... or do, considering that they're loyal to the Ramzi Clique." }, -/turf/open/floor/plating/jungleplanet, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"DC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/south, +/obj/structure/table, +/obj/structure/sign/poster/contraband/syndicate_recruitment{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark/jungleplanet, +/area/ruin/jungle/syndifort/storage) +"DE" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/wall/directional/north, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, +/obj/item/storage/bag/trash, +/obj/item/storage/bag/trash, +/obj/item/storage/bag/trash, +/obj/item/storage/bag/trash, +/obj/item/storage/bag/trash, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plasteel/dark, /area/ruin/jungle/syndifort) +"DF" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ + dir = 10 + }, +/obj/structure/table/chem, +/obj/item/storage/firstaid/medical{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/plasteel/white, +/area/ruin/jungle/syndifort/medical) "Ea" = ( /obj/structure/flora/rock/pile/largejungle, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Ee" = ( +"Eg" = ( +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-4" }, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" +/obj/structure/cable{ + icon_state = "1-10" + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/atmos) +"Eo" = ( +/obj/structure/cable{ + icon_state = "6-9" }, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Ef" = ( -/obj/machinery/suit_storage_unit/open, -/obj/effect/turf_decal/industrial/outline/red, -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" +"Ev" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 1 }, +/obj/effect/turf_decal/corner/opaque/black, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/bin, +/turf/open/floor/plating/rust, /area/ruin/jungle/syndifort) -"Es" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" +"EH" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 }, +/turf/open/floor/plating/rust, /area/ruin/jungle/syndifort) "EK" = ( /obj/structure/flora/rock, /turf/open/floor/plating/asteroid/dirt/jungle/dark, /area/overmap_encounter/planetoid/jungle/explored) -"ER" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Window Shutters"; - id = "jsynwin" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort/jerry) -"ET" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Gear Room Shutters"; - id = "jsyngear"; - dir = 4 +"EZ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-9" }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/yellow{ + icon_state = "4-10" }, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort/jerry) -"Fj" = ( -/obj/structure/cable{ - icon_state = "1-2" +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"Fs" = ( +/obj/structure/cable/yellow{ + icon_state = "6-9" }, -/obj/machinery/door/airlock/hatch{ - name = "Power Shack" +/obj/structure/cable/yellow{ + icon_state = "6-8" }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"Ft" = ( +/obj/machinery/suit_storage_unit/industrial, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/plastitanium, -/area/ruin/jungle/syndifort) -"Fm" = ( -/obj/effect/turf_decal/syndicateemblem/bottom/right, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"FP" = ( -/obj/structure/cable{ - icon_state = "2-4" +/area/ruin/jungle/syndifort/armory) +"FA" = ( +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/corner/opaque/black/diagonal{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 6 }, /turf/open/floor/plating/jungleplanet{ icon_state = "plating_rust" }, +/area/ruin/jungle/syndifort/storage) +"FP" = ( +/mob/living/simple_animal/hostile/human/ramzi/melee/machete, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Gb" = ( -/obj/structure/flora/junglebush/c, -/obj/structure/flora/rock/jungle, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +"Ge" = ( +/obj/effect/turf_decal/syndicateemblem/bottom/right, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24; + pixel_y = -3 + }, +/turf/open/floor/mineral/plastitanium/red/jungle, +/area/ruin/jungle/syndifort/storage) +"Gk" = ( +/obj/structure/cable/yellow{ + icon_state = "5-8" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) "Gs" = ( /obj/structure/flora/grass/jungle, /obj/structure/spacevine, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"GK" = ( -/obj/structure/flora/junglebush/b, -/obj/structure/flora/grass/jungle, -/obj/structure/flora/grass/jungle, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"GR" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" +"GL" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5; + color = "#543C30" }, -/area/ruin/jungle/syndifort) -"Hb" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/stairs{ - dir = 4 +/mob/living/simple_animal/hostile/human/ramzi/ranged{ + environment_smash = 0 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/dorms) +"GQ" = ( +/obj/machinery/atmospherics/components/trinary/mixer/flipped/on/layer4{ + node2_concentration = 0.78; + node1_concentration = 0.22 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/atmos) +"GR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/arcade/battle, +/obj/structure/sign/poster/contraband/syndicate{ + pixel_y = 32 + }, +/turf/open/floor/plating/rust, +/area/ruin/jungle/syndifort/canteen) +"Hb" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 }, +/turf/open/floor/plasteel/dark, /area/ruin/jungle/syndifort) "Hd" = ( /obj/structure/spacevine/dense, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) +"Hf" = ( +/obj/structure/closet/secure_closet/armorycage{ + anchored = 1; + locked = 0; + req_access = null + }, +/obj/item/ammo_box/magazine/m12g_bulldog/empty, +/obj/item/ammo_box/magazine/m12g_bulldog, +/obj/item/ammo_box/magazine/m10mm_ringneck, +/obj/item/ammo_box/magazine/m10mm_ringneck, +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_box/magazine/m10mm_cottonmouth, +/obj/item/ammo_box/magazine/m10mm_cottonmouth/empty, +/turf/open/floor/mineral/plastitanium, +/area/ruin/jungle/syndifort/armory) +"Hk" = ( +/obj/effect/spawner/bunk_bed{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 2; + color = "#543C30" + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plasteel/grimy, +/area/ruin/jungle/syndifort/dorms) +"Hz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ruin/jungle/syndifort/canteen) "HN" = ( /obj/structure/barricade/sandbags, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Il" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/rack, -/obj/item/gun/ballistic/automatic/pistol/ringneck, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort) -"Iv" = ( -/obj/structure/table/reinforced, -/obj/item/binoculars, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort/jerry) -"Iw" = ( -/obj/machinery/power/floodlight, -/obj/structure/cable, -/turf/open/floor/plating/jungleplanet, -/area/overmap_encounter/planetoid/jungle/explored) -"IA" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/camera/autoname{ - dir = 8 +"HV" = ( +/turf/closed/wall/concrete/reinforced, +/area/ruin/jungle/syndifort/medical) +"HY" = ( +/obj/structure/crate_shelf, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/wooden, +/obj/item/pickaxe/mini{ + pixel_x = 0; + pixel_y = 4 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) +/obj/item/shovel{ + pixel_x = 0; + pixel_y = -6 + }, +/obj/item/hatchet/wooden, +/obj/item/stack/sheet/mineral/wood/twentyfive, +/obj/item/storage/box/emptysandbags, +/obj/item/storage/box/emptysandbags, +/obj/item/storage/box/emptysandbags, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/mono/dark/jungleplanet, +/area/ruin/jungle/syndifort/storage) +"Ik" = ( +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/effect/turf_decal/syndicateemblem/top/left, +/turf/open/floor/mineral/plastitanium/red/jungle, +/area/ruin/jungle/syndifort/storage) "Jg" = ( /obj/structure/flora/junglebush/large, /obj/structure/flora/grass/jungle/b, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) "Ji" = ( -/obj/structure/closet/crate/secure/plasma, -/obj/item/stack/sheet/mineral/plasma/five, -/obj/item/stack/sheet/mineral/plasma/five, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"Jv" = ( -/turf/open/floor/plating/jungleplanet, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1; + color = "#543C30" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/dorms) +"Jq" = ( +/obj/machinery/atmospherics/components/trinary/filter/on/layer4{ + dir = 1; + filter_type = "n2" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/atmos) +"JI" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plating/rust, /area/ruin/jungle/syndifort) -"JY" = ( -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" +"JV" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, +/obj/structure/closet/crate/bin{ + name = "contamination bin"; + desc = "A bin marked to be used for radioactive waste, such as contaminated suits." + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 4 }, +/turf/open/floor/plating/rust, /area/ruin/jungle/syndifort) -"Kw" = ( -/obj/structure/flora/rock/jungle, +"JZ" = ( +/obj/structure/closet/crate/rations, +/obj/structure/crate_shelf, +/obj/effect/decal/cleanable/dirt, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/fork/plastic, +/obj/item/melee/knife/plastic, +/obj/item/melee/knife/plastic, +/obj/item/melee/knife/plastic, +/obj/item/melee/knife/plastic, +/obj/item/melee/knife/plastic, +/obj/item/melee/knife/plastic, +/turf/open/floor/plasteel/mono/dark/jungleplanet, +/area/ruin/jungle/syndifort/storage) +"Kb" = ( +/obj/structure/flora/junglebush/b, +/obj/structure/flora/stump, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"KC" = ( -/obj/structure/barricade/sandbags, -/obj/effect/decal/cleanable/dirt/dust, +"Kc" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort) +"Kh" = ( +/obj/item/ammo_casing/spent/pistol_steel, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"KO" = ( -/obj/structure/cable{ - icon_state = "6-9" +"Kj" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/dirt/jungle/dark, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"KP" = ( -/obj/structure/spacevine/dense, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +"Kk" = ( +/obj/effect/turf_decal/corner/opaque/syndiered, +/obj/machinery/microwave, +/obj/structure/table/reinforced, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"Kw" = ( +/obj/structure/flora/rock/jungle, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"KV" = ( -/obj/item/trash/chips{ - pixel_x = -10 +"KJ" = ( +/obj/effect/turf_decal/syndicateemblem/middle/left, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, /turf/open/floor/mineral/plastitanium/red/jungle, +/area/ruin/jungle/syndifort/storage) +"KM" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 + }, +/obj/item/geiger_counter, +/obj/structure/closet/radiation/empty, +/obj/item/geiger_counter, +/obj/item/clothing/head/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/radiation, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/turf/open/floor/plasteel/dark, /area/ruin/jungle/syndifort) +"KP" = ( +/obj/structure/spacevine/dense, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) "Lm" = ( -/obj/structure/closet/crate/freezer, -/obj/item/storage/box/donkpockets/donkpocketteriyaki, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets/donkpocketberry, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"Ln" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters, +/obj/machinery/griddle, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"Lr" = ( +/obj/machinery/suit_storage_unit/inherit/industrial, +/obj/item/clothing/suit/space/hardsuit/syndi/ramzi, +/obj/item/clothing/mask/gas/ramzi, +/obj/item/tank/internals/oxygen, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium, +/area/ruin/jungle/syndifort/armory) +"Ls" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 9 }, -/obj/item/ammo_casing/spent{ - dir = 1; - pixel_x = -5; - pixel_y = 6 +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"Lt" = ( -/obj/structure/cable{ - icon_state = "0-9" +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 }, -/obj/machinery/porta_turret/ruin/ramzi{ - dir = 6 +/obj/item/kitchen/fork/plastic{ + pixel_x = -3; + pixel_y = 9 }, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" +/mob/living/simple_animal/hostile/human/ramzi/ranged{ + environment_smash = 0 }, -/area/ruin/jungle/syndifort/jerry) +/obj/structure/flippedtable{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) "Lu" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/south, +/obj/machinery/fax/ruin, +/obj/structure/table/wood, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/jerry) +"LA" = ( +/obj/item/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/item/kitchen/fork/plastic{ + pixel_x = 11; + pixel_y = -12 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plasteel/patterned/ridged, +/area/ruin/jungle/syndifort/canteen) "LG" = ( /obj/structure/spacevine/dense, /obj/structure/flora/junglebush, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Ma" = ( -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"Mo" = ( -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/directional/south, -/obj/item/ammo_box/magazine/m10mm_ringneck, -/obj/item/ammo_box/magazine/m10mm_ringneck, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort) -"My" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/syndicate, -/obj/machinery/light/directional/north, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort) -"ML" = ( -/obj/structure/flora/junglebush/large, -/obj/structure/flora/junglebush/b, -/obj/structure/flora/grass/jungle, -/obj/structure/flora/grass/jungle, -/obj/structure/spacevine, +"LJ" = ( +/obj/machinery/porta_turret/ruin/ramzi/light{ + id = "jungle_syndicate_turrets"; + dir = 10 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating/jungleplanet{ + icon_state = "plating_rust" + }, +/area/ruin/jungle/syndifort/medical) +"LO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/item/ammo_casing/spent/pistol_steel, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"Mi" = ( +/obj/effect/turf_decal/solarpanel, +/obj/machinery/power/solar, +/obj/structure/cable/yellow{ + icon_state = "0-6" + }, +/obj/structure/cable/yellow{ + icon_state = "4-6" + }, +/turf/open/floor/plasteel, +/area/overmap_encounter/planetoid/jungle/explored) +"Mk" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/patterned/ridged, +/area/ruin/jungle/syndifort/canteen) +"MT" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/flora/junglebush/c, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) +"Nd" = ( +/obj/effect/turf_decal/solarpanel, +/obj/machinery/power/solar, +/obj/structure/cable/yellow{ + icon_state = "0-5" + }, +/turf/open/floor/plasteel, +/area/overmap_encounter/planetoid/jungle/explored) +"Nf" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort) +"Nn" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, +/obj/machinery/door/poddoor/preopen{ + id = "jungle_syndicate_lockdown" + }, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort) "Ny" = ( /obj/structure/flora/junglebush/large, /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Nz" = ( +"NI" = ( +/obj/effect/turf_decal/corner/opaque/orange/three_quarters{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating/jungleplanet{ - icon_state = "panelscorched" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 10 }, -/area/ruin/jungle/syndifort) -"NH" = ( -/obj/structure/mineral_door/wood, -/turf/open/floor/carpet, -/area/ruin/jungle/syndifort) -"NM" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Window Shutters"; - id = "jsynwin" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"NU" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/floordetail/pryhole, +/turf/open/floor/plasteel/dark, /area/ruin/jungle/syndifort) -"Oa" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/ammo_casing/spent{ - dir = 9; - pixel_x = 3; - pixel_y = -9 +"Oh" = ( +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 5 }, -/obj/item/trash/can/food{ - pixel_x = -7; - pixel_y = 7 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 10 }, -/obj/structure/cable{ - icon_state = "1-10" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 }, -/turf/open/floor/plating/jungleplanet{ - icon_state = "panelscorched" +/obj/structure/sign/poster/contraband/gec{ + pixel_y = 32 }, -/area/ruin/jungle/syndifort) -"Ob" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"Oe" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/decal/cleanable/crayon{ + icon_state = "x"; + layer = 3.5; + paint_colour = "#FF0000"; + pixel_x = 1; + pixel_y = 34 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/atmos) +"Oj" = ( +/obj/machinery/porta_turret/ruin/ramzi/light{ + id = "jungle_syndicate_turrets"; + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/plating/jungleplanet{ + icon_state = "plating_rust" }, -/turf/open/floor/plating/jungleplanet, /area/ruin/jungle/syndifort) "Ol" = ( /obj/structure/flora/grass/jungle/b, @@ -1298,139 +2659,307 @@ /area/overmap_encounter/planetoid/jungle/explored) "Oq" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "5-8" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"Ot" = ( +/obj/effect/turf_decal/syndicateemblem/middle/right, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red/jungle, +/area/ruin/jungle/syndifort/storage) +"OC" = ( +/turf/closed/wall/concrete/reinforced, +/area/ruin/jungle/syndifort/electrical) +"OE" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/obj/item/cutting_board{ + pixel_x = -1; + pixel_y = 0 + }, +/obj/structure/table/reinforced, +/obj/item/food/grown/potato{ + pixel_x = 0; + pixel_y = 3 + }, +/obj/item/melee/knife{ + pixel_x = -3; + pixel_y = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"OG" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"OI" = ( /obj/structure/cable{ - icon_state = "6-8" + icon_state = "0-4" }, -/obj/machinery/power/floodlight, +/obj/structure/frame/machine, +/obj/item/circuitboard/machine/turret/ruin, +/obj/structure/spacevine/dense, /turf/open/floor/plating/jungleplanet{ icon_state = "plating_rust" }, /area/overmap_encounter/planetoid/jungle/explored) -"OC" = ( -/obj/structure/cable, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/power/smes/magical{ - name = "power storage unit" +"OJ" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ + dir = 9 }, -/obj/structure/sign/poster/contraband/power{ - pixel_x = -32 +/obj/structure/table/chem, +/obj/item/clothing/neck/stethoscope, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/head/ramzi{ + pixel_x = -6; + pixel_y = 11 + }, +/turf/open/floor/plasteel/white, +/area/ruin/jungle/syndifort/medical) +"OO" = ( +/obj/structure/spacevine, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"OU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/item/chair{ + pixel_x = 5; + pixel_y = 0 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"OL" = ( -/obj/machinery/nuclearbomb/beer{ - desc = "A beer keg designed to look like a nuclear fission explosive. Its old and incredibly dusty. There seems to be a tap on the back."; - name = "Syndicate Beer Keg" +/turf/open/floor/plasteel/patterned/ridged, +/area/ruin/jungle/syndifort/canteen) +"OV" = ( +/obj/structure/cable{ + icon_state = "6-8" }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"OO" = ( -/obj/structure/spacevine, +/obj/structure/flora/grass/jungle/b, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) "OW" = ( -/obj/structure/table/reinforced, -/obj/item/trash/syndi_cakes, -/obj/machinery/fax/ruin, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort/jerry) -"Ph" = ( +/obj/item/analyzer{ + pixel_x = 0; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/orange/three_quarters{ + dir = 4 + }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "6-8" }, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) +/obj/structure/cable{ + icon_state = "4-6" + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"Pp" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ruin/jungle/syndifort/canteen) "Pq" = ( /obj/structure/flora/grass/jungle/b, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/grass/jungle, +/obj/structure/cable{ + icon_state = "1-10" + }, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) +"Ps" = ( +/obj/structure/barricade/sandbags, +/obj/structure/spacevine, +/turf/open/floor/plating/asteroid/dirt/jungle/dark, +/area/overmap_encounter/planetoid/jungle/explored) "PS" = ( /turf/open/floor/plating/asteroid/dirt/jungle/dark, /area/overmap_encounter/planetoid/jungle/explored) +"PW" = ( +/obj/structure/cable/yellow{ + icon_state = "5-10" + }, +/obj/structure/cable/yellow{ + icon_state = "8-10" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) "PX" = ( /obj/structure/flora/junglebush, /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Qr" = ( -/obj/structure/table, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"Qs" = ( -/obj/structure/cable, -/mob/living/simple_animal/hostile/human/ramzi{ - unsuitable_atmos_damage = 0 +"Qf" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 2; + color = "#543C30" }, -/obj/machinery/light/directional/north, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4; + color = "#543C30" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -9; + pixel_y = -19 + }, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/dorms) "Qx" = ( /obj/structure/flora/junglebush, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"QE" = ( +"QG" = ( /obj/structure/flora/junglebush/large, -/obj/structure/flora/junglebush/b, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"QT" = ( -/obj/item/ammo_casing/spent{ - dir = 6; - pixel_x = 2; - pixel_y = 6 +"QI" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"Rg" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/electrical) +"QN" = ( +/obj/effect/spawner/bunk_bed{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#543C30" + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/jungle/syndifort/dorms) +"QZ" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/syndicateemblem/top/middle, -/turf/open/floor/mineral/plastitanium/red/jungle, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plasteel/dark, /area/ruin/jungle/syndifort) +"Rk" = ( +/obj/structure/barricade/sandbags, +/turf/open/floor/plating/asteroid/dirt/jungle/dark, +/area/overmap_encounter/planetoid/jungle/explored) "Rl" = ( /obj/structure/flora/grass/jungle, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Rw" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"RD" = ( -/obj/structure/barricade/sandbags, -/obj/structure/cable{ - icon_state = "4-8" +"Rn" = ( +/obj/structure/spacevine, +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"Rq" = ( +/obj/structure/flora/stump, +/obj/structure/spacevine, +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 8 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort/jerry) -"RE" = ( -/obj/structure/spacevine/dense, -/obj/structure/spacevine/dense, -/obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"RT" = ( -/obj/structure/toilet{ - dir = 8; - pixel_x = 8 +"Ru" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10; + color = "#543C30" + }, +/obj/structure/closet/wall/red/directional/south, +/obj/item/toy/plush/rilena, +/obj/item/poster/random_rilena, +/obj/item/poster/random_rilena, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, -/obj/machinery/shower{ - pixel_x = -8; - pixel_y = 18 +/turf/open/floor/wood/walnut{ + icon_state = "wood-broken6" }, -/obj/structure/sink{ - pixel_x = 9; - pixel_y = 18 +/area/ruin/jungle/syndifort/dorms) +"Rv" = ( +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/carpet, -/area/ruin/jungle/syndifort) +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"Rz" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort/atmos) +"RD" = ( +/obj/effect/turf_decal/siding/wood/end, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/holopad/secure, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/carpet/red, +/area/ruin/jungle/syndifort/jerry) +"Sl" = ( +/obj/structure/cable{ + icon_state = "2-5" + }, +/obj/structure/flora/junglebush/c, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"Sp" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/storage) "Sz" = ( /obj/structure/flora/rock, /obj/structure/spacevine, @@ -1441,148 +2970,237 @@ /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"ST" = ( -/obj/structure/flora/grass/jungle/b, -/obj/structure/flora/junglebush, +"SP" = ( +/obj/structure/flora/junglebush/b, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Tb" = ( -/obj/structure/flora/junglebush/c, +"ST" = ( +/obj/structure/flora/grass/jungle/b, /obj/structure/flora/junglebush, -/obj/structure/flora/grass/jungle, -/obj/structure/flora/junglebush/c, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Td" = ( -/obj/item/ammo_casing/spent{ - dir = 5; - pixel_x = 10; - pixel_y = -2 +"SU" = ( +/obj/effect/turf_decal/corner/opaque/orange/three_quarters, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 4 }, -/turf/open/floor/plating/jungleplanet{ - icon_state = "panelscorched" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 9 }, -/area/ruin/jungle/syndifort) -"Tv" = ( -/turf/open/floor/plasteel/stairs{ - dir = 4 +/obj/structure/cable{ + icon_state = "5-8" }, -/area/ruin/jungle/syndifort) -"TC" = ( -/obj/item/trash/syndi_cakes, -/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/atmos) +"Te" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/orange/three_quarters{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"Tl" = ( /obj/structure/cable{ - icon_state = "0-4" + icon_state = "4-8" }, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort/jerry) +/obj/structure/flora/junglebush/b, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"Tz" = ( +/obj/structure/cable{ + icon_state = "4-10" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"TG" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/turf/open/floor/plating/rust, +/area/ruin/jungle/syndifort) "TK" = ( /obj/structure/flora/junglebush, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) +"TT" = ( +/obj/effect/turf_decal/solarpanel, +/obj/machinery/power/solar, +/obj/structure/cable/yellow{ + icon_state = "0-10" + }, +/obj/structure/cable/yellow{ + icon_state = "8-10" + }, +/turf/open/floor/plasteel, +/area/overmap_encounter/planetoid/jungle/explored) "TV" = ( /obj/structure/flora/grass/jungle, -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/stump, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Uc" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Base Gates"; - id = "jsyngate" +"Uj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 2; + color = "#543C30" }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort/jerry) -"Ug" = ( -/obj/item/ammo_casing/spent{ - dir = 6; - pixel_x = -8; - pixel_y = 10 +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 1 }, -/obj/machinery/camera/autoname{ - dir = 10 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"Ur" = ( -/obj/machinery/suit_storage_unit/open, -/obj/effect/turf_decal/industrial/outline/red, -/obj/machinery/camera/autoname, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort) -"UK" = ( -/obj/structure/barricade/sandbags, -/obj/structure/flora/grass/jungle/b, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 11; + pixel_y = -20 + }, +/obj/structure/table/wood, +/obj/item/pen{ + pixel_x = -8; + pixel_y = 2 + }, +/turf/open/floor/wood/walnut{ + icon_state = "wood-broken7" + }, +/area/ruin/jungle/syndifort/dorms) +"Uy" = ( +/obj/structure/closet/crate/wooden, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants, +/obj/item/seeds/grass, +/obj/item/seeds/potato, +/obj/item/seeds/potato, +/obj/item/seeds/sweet_potato, +/obj/item/seeds/wheat, +/obj/item/seeds/wheat, +/obj/item/seeds/berry, +/obj/item/seeds/berry, +/obj/item/seeds/eggplant, +/obj/item/seeds/garlic, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"UO" = ( +/obj/structure/flora/rock/pile/largejungle, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"UQ" = ( -/obj/structure/cable{ - icon_state = "1-6" +"UX" = ( +/obj/machinery/button/door{ + pixel_y = 23; + id = "jungle_syndie_shitter"; + name = "Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/jungle/syndifort/dorms) +"Vn" = ( +/mob/living/simple_animal/hostile/human/ramzi/civilian, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/orange/three_quarters{ + dir = 8 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"UY" = ( /obj/structure/cable{ - icon_state = "4-10" + icon_state = "2-8" }, -/obj/structure/sign/warning/securearea{ - pixel_y = 32 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 10 }, -/turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"UZ" = ( -/obj/structure/barricade/sandbags, -/obj/structure/flora/grass/jungle/b, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"Vx" = ( +/obj/structure/flora/junglebush/c, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Vf" = ( -/obj/machinery/suit_storage_unit/syndicate{ - storage_type = /obj/item/toy/balloon/syndicate +"VU" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 4 }, -/obj/effect/turf_decal/industrial/outline/red, -/turf/open/floor/plating, -/area/ruin/jungle/syndifort) -"Vi" = ( -/obj/structure/sign/poster/contraband/syndicate, -/turf/closed/wall, -/area/ruin/jungle/syndifort) -"Vn" = ( -/obj/structure/cable{ - icon_state = "0-6" +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 8 }, -/obj/machinery/porta_turret/ruin/ramzi{ - dir = 9 +/obj/machinery/door/airlock/hatch{ + dir = 4 }, -/turf/open/floor/plating/jungleplanet{ - icon_state = "plating_rust" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 }, -/area/ruin/jungle/syndifort/jerry) -"VE" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"VS" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 }, -/turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) "VV" = ( /obj/structure/spacevine, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) +"VX" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/structure/closet/crate/secure/weapon, +/obj/item/grenade/c4, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/obj/item/grenade/smokebomb, +/obj/item/grenade/smokebomb, +/obj/item/grenade/smokebomb, +/obj/item/grenade/smokebomb, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -12 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/armory) +"Wd" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 8 + }, +/obj/machinery/recharger{ + anchored = 0 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/armory) "Wj" = ( /obj/structure/flora/grass/jungle/b, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) "Wl" = ( -/obj/structure/flora/tree/jungle, -/obj/structure/flora/grass/jungle, -/obj/structure/flora/grass/jungle, +/obj/structure/flora/stump, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) "Wm" = ( @@ -1591,125 +3209,386 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"WF" = ( -/obj/effect/turf_decal/syndicateemblem/bottom/left, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) +"Wx" = ( +/obj/effect/turf_decal/corner/opaque/orange/three_quarters, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flippedtable{ + dir = 8 + }, +/mob/living/simple_animal/hostile/human/ramzi/ranged/cottonmouth, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) +"WA" = ( +/obj/structure/closet/secure_closet/engineering_personal{ + req_access = list(150,10); + populate = 0 + }, +/obj/item/clothing/under/syndicate/gec, +/obj/item/geiger_counter, +/obj/effect/turf_decal/box, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/head/ramzi/flap, +/obj/item/clothing/suit/hazardvest, +/turf/open/floor/plasteel/mono/dark, +/area/ruin/jungle/syndifort/electrical) "WG" = ( -/obj/structure/closet/crate/secure/weapon, -/obj/item/gun/ballistic/automatic/smg/cobra, -/obj/item/ammo_box/magazine/m45_cobra, -/obj/item/ammo_box/magazine/m45_cobra, -/turf/open/floor/plating/jungleplanet, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/closet/wall/red/directional/west, +/obj/item/clothing/under/syndicate/ramzi/officer, +/obj/item/clothing/suit/armor/ramzi/officer, +/obj/item/clothing/head/ramzi/beret, +/obj/item/spacecash/bundle/pocketchange, +/obj/item/blackmarket_uplink, +/obj/item/paper/crumpled{ + default_raw_text = "Some indies showed up a few weeks ago. Tried to attack the base. No dead on our end, and they had someone go down - they were carrying a pretty nice plushie, so I took it - but they ran off with a personnel manifest. If that gets to the Republic we're in some shit." + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 6 + }, +/obj/item/toy/plush/rilena, +/turf/open/floor/carpet/red_gold, /area/ruin/jungle/syndifort/jerry) -"WT" = ( -/obj/structure/barricade/sandbags, -/obj/effect/decal/cleanable/dirt/dust, +"WJ" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/end, +/obj/machinery/iv_drip, +/obj/structure/bed/roller, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plasteel/white, +/area/ruin/jungle/syndifort/medical) +"WN" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating/jungleplanet, +/area/ruin/jungle/syndifort/storage) +"WP" = ( +/obj/structure/flora/ash/garden, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) +"WQ" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/ruin/jungle/syndifort/canteen) +"WX" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ruin/jungle/syndifort) "Xc" = ( /obj/structure/flora/junglebush/large, /obj/structure/flora/junglebush, /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Xt" = ( -/obj/structure/spacevine/dense, -/obj/structure/flora/grass/jungle, +"Xd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating/rust, +/area/ruin/jungle/syndifort/electrical) +"Xo" = ( +/obj/structure/cable/yellow{ + icon_state = "1-6" + }, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"XE" = ( -/turf/closed/wall/r_wall/rust, -/area/ruin/jungle/syndifort) -"Ya" = ( -/obj/item/trash/syndi_cakes, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/camera/autoname{ +"Xs" = ( +/obj/item/paper/crumpled{ + default_raw_text = "jerry said we all need to go to lockdown. someone put out an open bounty to kill him pretty brutally and recover a plush. its gonna suck to put the tables back once this one lifts" + }, +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"Xt" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/flippedtable{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/jungle, +/obj/item/ammo_box/magazine/m10mm_ringneck{ + pixel_x = 9; + pixel_y = -1 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort) +"XE" = ( +/turf/closed/wall/concrete/reinforced, /area/ruin/jungle/syndifort/jerry) -"Yg" = ( -/obj/structure/flora/rock/pile/largejungle, -/obj/effect/decal/cleanable/dirt/dust, +"XR" = ( +/obj/structure/cable{ + icon_state = "2-5" + }, +/turf/open/floor/plating/asteroid/dirt/grass/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"XW" = ( +/obj/item/reagent_containers/glass/bucket/wooden, /turf/open/floor/plating/asteroid/dirt/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"Yk" = ( -/obj/effect/decal/cleanable/dirt/dust, +"XY" = ( +/obj/item/stack/cable_coil/cut/red{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/stock_parts/capacitor{ + pixel_x = -9; + pixel_y = -7 + }, +/obj/structure/spacevine, +/turf/open/floor/plating/asteroid/dirt/jungle/dark, +/area/overmap_encounter/planetoid/jungle/explored) +"XZ" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/atmos) +"Ya" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/north, +/obj/item/ammo_box/magazine/m45_cobra{ + pixel_x = 0; + pixel_y = 0 + }, +/obj/item/ammo_box/magazine/m45_cobra{ + pixel_x = -12; + pixel_y = 5 + }, +/obj/structure/flippedtable{ + icon_state = "wood_table"; + table_type = /obj/structure/table/wood; + dir = 2 + }, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/jerry) +"Yj" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"YH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/borderfloorblack, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "6-10" }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"Yz" = ( -/obj/structure/spacevine/dense, -/obj/structure/flora/junglebush, -/turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"YF" = ( +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/item/radio/intercom/directional/north, +/obj/machinery/nuclearbomb/beer{ + desc = "A Corporate War-era atomic bomb, stripped of its payload and filled with booze. Its control panel lights are dimly flickering, a beer-tap next to them."; + name = "syndicate beer keg"; + pixel_x = 0; + pixel_y = 0 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"YR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9; + color = "#543C30" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/wood/walnut{ + color = "#543c30"; + icon_state = "wood-broken5" + }, +/area/ruin/jungle/syndifort/dorms) +"Za" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 8 + }, +/obj/effect/turf_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/canteen) +"Zd" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/black{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable{ - icon_state = "5-8" + icon_state = "0-8" }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating/jungleplanet{ - icon_state = "panelscorched" +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 11; + pixel_y = -20 }, +/turf/open/floor/plating/rust, /area/ruin/jungle/syndifort) -"YK" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"YM" = ( -/obj/structure/flora/grass/jungle, -/obj/structure/flora/rock, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) -"YO" = ( -/obj/structure/flora/tree/jungle/small, -/turf/open/floor/plating/asteroid/dirt/grass/jungle, -/area/overmap_encounter/planetoid/jungle/explored) +"Zj" = ( +/obj/effect/spawner/bunk_bed{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#543C30" + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plasteel/grimy, +/area/ruin/jungle/syndifort/dorms) "Zo" = ( -/obj/item/ammo_casing/spent{ - dir = 8; - pixel_x = -8; - pixel_y = 5 +/obj/effect/turf_decal/siding/wood{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium/red/jungle, -/area/ruin/jungle/syndifort) -"Zr" = ( -/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/walnut, +/area/ruin/jungle/syndifort/jerry) +"ZB" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) -"Zs" = ( +/turf/open/floor/plating/asteroid/dirt/jungle, +/area/overmap_encounter/planetoid/jungle/explored) +"ZF" = ( +/obj/effect/turf_decal/corner/opaque/syndiered, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, /obj/structure/cable{ - icon_state = "4-9" + icon_state = "1-4" }, -/turf/open/floor/plating/asteroid/dirt/jungle, -/area/overmap_encounter/planetoid/jungle/explored) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/turf/open/floor/plating/rust, +/area/ruin/jungle/syndifort) "ZG" = ( -/obj/structure/flora/rock/jungle, -/obj/structure/flora/junglebush/c, +/obj/structure/spacevine, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating/asteroid/dirt/grass/jungle, /area/overmap_encounter/planetoid/jungle/explored) -"ZU" = ( -/obj/item/ammo_casing/spent{ - dir = 9; - pixel_x = 10; - pixel_y = 3 +"ZL" = ( +/obj/item/wrench/syndie{ + pixel_x = 0; + pixel_y = 12 }, -/turf/open/floor/plating/jungleplanet, -/area/ruin/jungle/syndifort) +/obj/item/weldingtool/largetank{ + pixel_x = -11; + pixel_y = -5 + }, +/obj/item/crowbar/syndie{ + pixel_x = -11; + pixel_y = 16 + }, +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "4-9" + }, +/obj/item/storage/toolbox/syndicate/empty{ + pixel_x = 5; + pixel_y = -6 + }, +/obj/item/wirecutters/syndie{ + pixel_x = 9; + pixel_y = 11 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/screwdriver/nuke{ + pixel_x = -11; + pixel_y = 6 + }, +/obj/item/multitool/syndie{ + pixel_x = -11; + pixel_y = -5 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/structure/flippedtable{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/jungle/syndifort/electrical) (1,1,1) = {" yZ @@ -1721,6 +3600,50 @@ yZ yZ yZ yZ +qx +bO +bO +dw +qx +Vx +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +"} +(2,1,1) = {" +yZ +yZ +yZ +yZ +yZ +yZ +yZ +yZ +Vx +dw +bO +qx +qx +Vx +qx +qx +yZ yZ yZ yZ @@ -1738,12 +3661,44 @@ yZ yZ yZ yZ +"} +(3,1,1) = {" +yZ +yZ +yZ +yZ +yZ +yZ +yZ +qx +ws +eF +bO +sR +ws +ws +qx +Vx +qx +ws +yZ +Gs +Sz +yZ +yZ +yZ +yZ +yZ +yZ +yZ yZ yZ yZ +qx +VV yZ "} -(2,1,1) = {" +(4,1,1) = {" yZ yZ yZ @@ -1751,18 +3706,22 @@ yZ yZ yZ yZ +TK +Kb +qx +bO +sR +qx +bO +FP +SP +Aa +qx dw +ws +ho yZ -yZ -tm -gb -Tb -dO dw -yZ -yZ -yZ -SO dO yZ yZ @@ -1770,30 +3729,34 @@ yZ yZ yZ yZ -yZ -yZ -ws -PS +SP +uf +uf +sw "} -(3,1,1) = {" -yZ -yZ +(5,1,1) = {" yZ yZ yZ yZ yZ +yJ +qt +Aa +TK +bO +bO +sR +qx +bO +qL +XW +Ol +Vx dw +Rl +ws dw -qq -es -PS -PS -Ea -SO -gG -yZ -yZ dw Wl dO @@ -1801,30 +3764,34 @@ yZ yZ yZ yZ -yZ -yZ -ws -iN -PS +qx +qx +uf +OI +Rk "} -(4,1,1) = {" -yZ -yZ -yZ +(6,1,1) = {" yZ yZ +qx dw -qq -dw -YM ws ws +SP +TK ws -PS -PS +bO +bO +bO +bO +bO +bO +Uy ws -SO -Wm +kf +qx +dw +Rl Wm es es @@ -1832,731 +3799,823 @@ an qq yZ yZ -yZ -yZ +qx +fU +Sz +XY Cr -PS -PS -PS +Ps "} -(5,1,1) = {" -yZ -yZ -yZ -yZ +(7,1,1) = {" yZ -dw -dw -At -ws -ws -zM -bC -Ao -zM -zM +TK +Ol +qx +qx +qt +ye +Nd +OO +gY +gY +gY +gY +bO +bO +bO +Dt +Ol ws +HN +HN +HN dw -ce -Ob -ws -Gs -yh +qx +qx +qx Ba yZ -yZ +fU Hd -ws -PS +fU +yf EK -yZ +jk "} -(6,1,1) = {" -yZ -yZ -yZ -yZ -yZ -yZ -dw -dO -PS -zM -gU -AB -OW -gf -zM -zM +(8,1,1) = {" +qx +qx +Aa +qx +Mi ws +PW +OO +gY +gY +Zj +QN +gY +bO +bO +bO +bO +WP +dw HN -HN -HN +nI +zX +zX +zX +MT +hH +Vx ws -ML -vX -yZ Hd -Hd -ws -ws +KP +kp +qx PS yZ "} -(7,1,1) = {" -yZ -yZ -yZ -yZ -yZ -yZ -yZ -dO -PS -ER -Iv -gx -gO -yD -TC -zM -PS +(9,1,1) = {" +Ol +dw +Ol ws -ii -HN -Ob -GK -zu +uc +EZ +qt +gY +gY +mh +sr +Ru +gY +XE +XE +XE +XE +XE +XE +XE +XE +yJ +ws +ws +eF +qx +Eo +qx +Wl +ky +VV ws -zv -OO -OO ws -yZ yZ "} -(8,1,1) = {" -yZ -yZ -yZ -yZ -yZ -yZ -yZ -Aa +(10,1,1) = {" ws -zM +Ol +mR +cT +Xo +Kj +ws +gY +Hk +YR +Ji +xA +gY +gQ WG qd gO ef rN -zM -ws -bM -PS -HN -ws -lc -Ob -ws -OO -OO +jb +XE +XE +HV +HV +HV +zv +qx +hL +fb +VV OO -yZ +ws yZ yZ "} -(9,1,1) = {" -yZ -yZ -yZ -yZ -yZ -yZ -dw -dw +(11,1,1) = {" +yJ +qx ws +ws +ws +Fs +ws +gY +AJ +uj +nT +Qf +gY zM Ai -Ai +XE Ya pF RD -zM -ws -VS -ws -ws +ii +fE +XE +OJ +DF +HV +HV +HN +xM ws ws -Ob -Ob -Cr ws yZ yZ yZ -yZ "} -(10,1,1) = {" -yZ -yZ -yZ +(12,1,1) = {" yZ -TK -ex -TK +ws dw -fe -fe -vJ +ye +yd +qY +ad +gY +gY +gY +gY +Df +gY XE +vJ XE +Zo xC wu -nH -nH -tZ -oq -vt -vt -ws -Ob -Ob -ws +bg +Lu +XE +jN +cf +WJ +HV +LJ +HN +wT OO -yZ +ws yZ yZ yZ "} -(11,1,1) = {" -yZ -yZ -yZ +(13,1,1) = {" yZ -ex -HN -HN +yd +dw +dJ +pC ws -nH -vJ -YK -vJ -NM -YK -uh -nH -Il -aj -ho -ud -Dt +ws +cA +gY +pB +gY +sQ +qh +gY +XE XE +XE +wo +uh +yh +fi +fi +pq +CD +HV +HV +Tl +hh ws -qx -YO OO OO yZ yZ yZ "} -(12,1,1) = {" -yZ -mq -wd +(14,1,1) = {" yZ -mq -HN +qx qx ws -fe +Bi +ws +OC +pi gY -JY -gQ -fe -Tv -Hb -fe -My -al -ZU -Ma -gP -XE +UX +Aq +tt +Uj +gY +Kk +zU +bs +Ev +ov +mo +fi +FA +kP +dk +DC +fi +ib +Kh ws -WT -WT -dK +HN ws yZ yZ yZ "} -(13,1,1) = {" +(15,1,1) = {" yZ -mq -TK -qx qx -mq -Gb -qx -nH -vJ -YK -dP -fe -hK -th -fe -Ji -al -fi -Td -Ug -vt -ws -ws -PS -Ob -ws +Ol +ye +Gk +zv +OC +Xd +gY +pZ +gY +GL +lG +gY +OE +At +bs +Ax +WX +tK +CO +WN +Ik +KJ +xu +hF +ZB +Xs +Cg +HN +jk OO yZ yZ "} -(14,1,1) = {" +(16,1,1) = {" yZ yZ -wh -HN -HN -Ob -Kw +yd +TT ws -tt -OL -Jv -CI -fe -eW -YF -Vi yJ -qA -nO -WF -QT -Uc +OC +eW +gY +gY +gY +kz +rG +gY +Lm +WQ +bs +DE +EH +tK +fi +rt +Dc +hJ +it +hF +LO +Kh ws +HN ws -nT -UK -Ol -Sz +OO yZ yZ "} -(15,1,1) = {" +(17,1,1) = {" yZ yZ -By -HN -Vn ws -Ob -FP -mt -Oe -gK -Oe -bs -gK -Yk +ws +ws +ws +OC +zB +sL +OC +BS +oA +Ls +px +rd +ur bs -wz -Rg -kr -ww -yd +hb +JI +ZF +Sp +jq +cS +Ot +Ge hF -lD -Iw -mY -UK -TK +LO +ws +Kh +ws +ws Ol yZ yZ "} -(16,1,1) = {" +(18,1,1) = {" yZ yZ -Aa -HN -ws -KO -dp -VE -tt -Lm -fS -jb -fe -oi -ug -Vi -nO -hZ -kP -Fm -KV -Uc -ws +yJ ws +yd +OC +OC +zB +yj +OC +ig +fj +cY +Pp +bN +OG +ym +bj +ej +Zd +fi +JZ +HY +cI +fi +fi +ZB +eF +HN +jk ws -cS -VV Ol Jg yZ "} -(17,1,1) = {" -yZ -yZ -mq +(19,1,1) = {" yZ -fE +SO +dO +qx ws -hQ -Ph -nH -yx -bg -lH -nH -BK -AQ -fe -sq -Oa -al -ks +OC +hg +tf +QI +OC +YH +oL +Hz +ha +Mk +yR +bs +NU +CI +Hb fi -vt -PS -PS -OO +fi +fi +fi +fi +Sl +Rv +Oj +HN ws -OO +yd PS Ol yZ "} -(18,1,1) = {" -yZ -yZ -yZ -yZ +(20,1,1) = {" yZ -QE +dw +Wl +qx +yJ +OC +OW +wN +Te +OC +Za +il +jS +OU +LA +kY +Yj +Nf +dp +QZ +Kc +TG +zN +Nn +ey +ws +HN +HN +HN ws -Zs -nH -BC -Qr -Rw -nH -Jv -DO -fe -Qs -fi -Nz -Zo -Mo -vt -PS -fn -UZ -jr ws PS ws yZ "} -(19,1,1) = {" -yZ -yZ -yZ -yZ -yZ +(21,1,1) = {" yZ -fE -VS -nH -eU -bP -Es -NM -JY -Zr -fe -IA -Jv -Ln -vt -XE -XE +cO +VV +TK ws -dO -ZG +OC +aX +ZL +Wx +OC +GR +uV +ic +Co +og +Bh +bs +hj +Xt +oK +wo +KM +JV +wo +OV +ws +ws +qt ws -zr +yJ ws +QG OO ws "} -(20,1,1) = {" -yZ -yZ -dw -dw +(22,1,1) = {" yZ -fE -fE -Ee -fe -Jv +cO +VV +qx +Ol +OC +OC +VU +OC +OC +xa +xa +XZ +xa xa -eR -fe -rk -ET -fe -fe +nH +nH +nH +sI +nH +nH +wo +wo wo -tZ -vt -ws -ws ws +en +eF Kw cX ws -iY -NH -iY +Kw +yd +zv OO "} -(21,1,1) = {" +(23,1,1) = {" yZ -dw -TV -dw +OO +VV qx -Aa -ws -sf -iN -fe +qx +OC +lD +NI +pX +OC +xF +qr +SU +Rz +hf nH -fe -kp -nO -GR -Al +bX +qV +mk +VX +mD nH +Kw ws -VS -PS ws -gl +ik vs zK -TK +yd Kw -iY -RT -iY -yZ +ws +yd +ws +ws "} -(22,1,1) = {" -dw +(24,1,1) = {" +yZ +yZ +cO dw dw +OC +WA +Vn +sm +uu +sf +Eg +Jq +lA +kL +nH +Hf +Wd +tE +pk +mD +nH ws ws ws -qx +Oq +yd +ug +ST +yJ ws -oE ws -np -nH -Bv -BH -rg -Ef -fe -qx -sf -PS -HN -TK -TK -Qx -ST -dw -iY -iY -iY -yZ +ws +yd "} -(23,1,1) = {" +(25,1,1) = {" +yZ +yZ +VV cO -ws -fe +cO +OC +OC +ve +sF +OC +Oh +qe +GQ +us +hk nH -fe nH -fe -qx -Oq -ws -ws -fe -fe -Ur -Vf +Lr +me +Ft +nH nH -fe -qx ws -Lt -HN -dK +yJ +hh +ws Qx kJ -yZ +uC tL qq -yZ +qx yZ yZ "} -(24,1,1) = {" +(26,1,1) = {" +yZ +yZ +Aa cO -ws -fe -pr +cO +qa OC -tf -fe +OC +OC +OC +xa +xa +xa +kZ +kZ +nH +nH +nH +nH +nH +nH +zv ws -xY -KO -dp +hh +qt ws -fe -yL -bt -fe -Aa -mO -HN -KC -HN -dw TK +VV +fU +OO +ws yZ yZ yZ +"} +(27,1,1) = {" yZ yZ yZ -yZ -"} -(25,1,1) = {" -mN OO -fe -xm -UQ -Lu -nH -UY -Ob +mN +gG +fU +ws ws -oE -Ob -Ob -yM +ws +qx VV +ws +Rn +Rq VV +XR +jr +ZG +ZG Wj Wj Pq qx -qx -qx +ws +yJ TK -YO +gu +OO +OO yZ yZ yZ yZ +"} +(28,1,1) = {" +yZ +yZ yZ yZ -"} -(26,1,1) = {" Au -oj -nH -fe -ik -sY -Fj -pY -qx -dK -Ee -ws -Yg -ws -ws +KP +VV +fU ws +qx +VV +VV +qx +VV +VV +Tz +yc +qx +qx +Kw Rl Rl zH TV PX TK -Cr -ws +Sz +OO KP -yZ +qx yZ yZ yZ yZ "} -(27,1,1) = {" +(29,1,1) = {" +yZ +yZ +yZ +yZ LG -oj -Yz -fe -nH -nH -fe -qL +KP +KP +VV +yc ws +bn +qx +UO ws -zB -PS -Ob +ws +ys +HN ws Ea ws @@ -2569,27 +4628,31 @@ KP KP KP KP -yZ +fU yZ yZ yZ yZ "} -(28,1,1) = {" +(30,1,1) = {" +yZ +yZ +yZ +yZ VV -RE -Xt -OO OO +KP +UO +qx ws -gl -gl -yZ +qx +qx +ws +ws +HN +HN +HN ws -PS -lR -zv -lq lq Ny qx @@ -2597,49 +4660,57 @@ qx qx dw qx +iN +VV +fU +iN yZ yZ yZ yZ yZ +"} +(31,1,1) = {" yZ yZ yZ yZ -"} -(29,1,1) = {" OO KP Au Au Au OO -yZ -yZ -yZ -yZ +qx +qx +yJ +ws +ws +ws ws -ys -HN Aa dw Rl yZ yZ yZ -dw +TV +yZ +ws +yd +iN yZ yZ yZ yZ yZ yZ +"} +(32,1,1) = {" yZ yZ yZ yZ -"} -(30,1,1) = {" yZ OO OO @@ -2647,12 +4718,12 @@ Au Au Gs dw +qx +qx yZ -yZ -yZ -HN -HN -HN +ws +ws +ws dw dw yZ diff --git a/_maps/RandomRuins/SpaceRuins/scrapstation.dmm b/_maps/RandomRuins/SpaceRuins/scrapstation.dmm index ff9fa1aa99..f93eba5414 100644 --- a/_maps/RandomRuins/SpaceRuins/scrapstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/scrapstation.dmm @@ -5914,7 +5914,7 @@ }, /obj/effect/turf_decal/trimline/opaque/syndiered/filled/corner, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/human/ramzi/melee/machete, +/mob/living/simple_animal/hostile/human/ramzi/melee/sawbones, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/powered/ramzi_station/med) "Hl" = ( diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt index 812ee6a24d..cd72a68501 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -23,7 +23,7 @@ Find the key for using this catalogue in "map_catalogue_key.txt" JungleRuins: File Name = "_maps\RandomRuins\JungleRuins\jungle_syndicate.dmm" - Size = (x = 15)(y = 15)(z = 1) + Size = (x = 30)(y = 33)(z = 1) Tags = "Medium Combat Challenge", "Medium Loot", "Liveable", "Antag Gear" File Name = "_maps\RandomRuins\JungleRuins\jungle_interceptor.dmm" diff --git a/code/datums/ruins/jungle.dm b/code/datums/ruins/jungle.dm index f9614ac2c2..8c43712100 100644 --- a/code/datums/ruins/jungle.dm +++ b/code/datums/ruins/jungle.dm @@ -5,9 +5,9 @@ ruin_type = RUINTYPE_JUNGLE /datum/map_template/ruin/jungle/syndicate - name = "Jungle Syndicate Bunker" + name = "Jungle ICW-era Bunker" id = "syndicatebunkerjungle" - description = "A small bunker owned by the Syndicate." + description = "An ICW-era nuclear bunker formerly operated by the Gorlex Marauders, now inhabited by the Ramzi Clique." suffix = "jungle_syndicate.dmm" ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE) diff --git a/code/game/area/areas/ruins/jungle.dm b/code/game/area/areas/ruins/jungle.dm index e68aec42ab..11c18562e3 100644 --- a/code/game/area/areas/ruins/jungle.dm +++ b/code/game/area/areas/ruins/jungle.dm @@ -128,11 +128,38 @@ // Syndicate fort /area/ruin/jungle/syndifort - name = "Syndicate Fort" + name = "Marauder Bunker" icon_state = "green" +/area/ruin/jungle/syndifort/electrical + name = "Marauder Bunker Electrical" + icon_state = "yellow" + +/area/ruin/jungle/syndifort/atmos + name = "Marauder Bunker Air Filtration" + +/area/ruin/jungle/syndifort/canteen + name = "Marauder Bunker Canteen" + icon_state = "crew_quarters" + +/area/ruin/jungle/syndifort/dorms + name = "Marauder Bunker Dorms" + icon_state = "crew_quarters" + +/area/ruin/jungle/syndifort/armory + name = "Marauder Bunker Armory" + icon_state = "red" + +/area/ruin/jungle/syndifort/storage + name = "Marauder Bunker Storage Room" + icon_state = "supply" + +/area/ruin/jungle/syndifort/medical + name = "Marauder Bunker Infirmary" + icon_state = "blue" + /area/ruin/jungle/syndifort/jerry - name = "Syndicate Fort Tower" + name = "Marauder Bunker Control Room" icon_state = "bridge" // Cave Crew diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index aca8f948bd..be46d3e404 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -26,6 +26,29 @@ neck = /obj/item/clothing/neck/dogtag/ramzi id = /obj/item/card/id/syndicate +/obj/effect/mob_spawn/human/corpse/ramzi/engi + name = "Ramzi Engineer" + outfit = /datum/outfit/ramzi/engi + +/datum/outfit/ramzi/engi + name = "Ramzi Technician Corpse" + suit = /obj/item/clothing/suit/ramzi + gloves = /obj/item/clothing/gloves/color/fyellow/old + head = /obj/item/clothing/head/hardhat/ramzi + glasses = /obj/item/clothing/glasses/welding + belt = /obj/item/storage/belt/utility + +/obj/effect/mob_spawn/human/corpse/ramzi/doctor + name = "Ramzi Field Medic" + outfit = /datum/outfit/ramzi/doctor + +/datum/outfit/ramzi/doctor + name = "Ramzi Sawbones Corpse" + uniform = /obj/item/clothing/under/syndicate/ramzi + suit = /obj/item/clothing/suit/ramzi/smock + gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil //EVIL + head = /obj/item/clothing/head/ramzi/surgical + /datum/outfit/ramzi/bulletproof name = "Ramzi Clique Rifleman" suit = /obj/item/clothing/suit/armor/ramzi/bulletproof diff --git a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm index 0614693726..6a25bf0da1 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm @@ -94,6 +94,43 @@ melee_damage_lower = 25 melee_damage_upper = 25 +/mob/living/simple_animal/hostile/human/ramzi/melee/hatchet + name = "Ramzi Clique Axeman" + desc = "A deserter from the Gorlex Marauders turned pirate. They wield a hatchet, preparing to swing right at you." + attack_verb_continuous = "chops" + attack_verb_simple = "chop" + + l_hand = /obj/item/hatchet/wooden + sharpness = SHARP_EDGED + rapid_melee = 2 //compensating for the weak weapon (and making the unarmoured engis more of a threat) + + melee_damage_lower = 16 + melee_damage_upper = 16 //theyre just good at swinging okay (weaker than regular knife guy but not irrelevant) + + weapon_drop_chance = 35 //loot value of a hatchet is limited + +/mob/living/simple_animal/hostile/human/ramzi/melee/hatchet/engi + name = "Ramzi Clique Defoliator" + desc = "A deserter from the Gorlex Marauders turned pirate. They clutch a hatchet in dirty old gloves, ready to take a firm swing." + mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/engi + armor_base = /obj/item/clothing/suit/ramzi //they're an engi not a combatant + +/mob/living/simple_animal/hostile/human/ramzi/melee/sawbones + name = "Ramzi Clique Field Medic" + desc = "A deserter from the Gorlex Marauders turned pirate. They clutch a bonesaw, its blade whirring away amidst the backdrop of their maroon smock." + mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/doctor + armor_base = /obj/item/clothing/suit/ramzi/smock //i am a surgeon + + l_hand = /obj/item/circular_saw //WHIRR + sharpness = SHARP_EDGED + attack_verb_continuous = "saws" + attack_verb_simple = "sawed" + + melee_damage_lower = 15 + melee_damage_upper = 15 + attack_sound = 'sound/weapons/circsawhit.ogg' + + /mob/living/simple_animal/hostile/human/ramzi/melee/sledge name = "Ramzi Clique Breaker" desc = "A deserter from the Gorlex Marauders turned pirate. Their palms are twisted around the shaft of a crimson-black sledgehammer." @@ -164,7 +201,7 @@ /mob/living/simple_animal/hostile/human/ramzi/melee/space/soft name = "Ramzi Clique Infiltrator" - desc = "A deserter from the Gorlex Marauders turned pirate. A softsuit's gauntlets hold a shard of polished steel in an veteran's guard." + desc = "A deserter from the Gorlex Marauders turned pirate. A softsuit's gauntlets hold a shard of polished steel in a veteran's guard." l_hand = /obj/item/melee/knife/combat mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/space/soft armor_base = /obj/item/clothing/suit/space/syndicate/ramzi @@ -331,6 +368,15 @@ projectilesound = 'sound/weapons/gun/revolver/viper.ogg' mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/officer + +/mob/living/simple_animal/hostile/human/ramzi/ranged/officer/smg + name = "Ramzi Clique Commander" + desc = "A deserter from the Gorlex Marauders turned pirate, clad in well-maintained officer garbs. They cradle a lightweight submachinegun in their hands, sweeping it side-to-side." + rapid = 3 + casingtype = /obj/item/ammo_casing/c45 + projectilesound = 'sound/weapons/gun/smg/cobra.ogg' + l_hand =/obj/item/gun/ballistic/automatic/smg/cobra + armor_base = /obj/item/clothing/suit/armor/ramzi/officer /mob/living/simple_animal/hostile/human/ramzi/ranged/officer/beach @@ -630,6 +676,8 @@ retreat_distance = 10 obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE + mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/engi + armor_base = /obj/item/clothing/suit/ramzi //nope /mob/living/simple_animal/hostile/human/ramzi/civilian/Aggro() ..() From dce2ac963366c7f5f293f94c9a47a90eae91d486 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 29 Jan 2026 17:35:19 -0600 Subject: [PATCH 12/17] Automatic changelog generation for PR #5579 [ci skip] --- html/changelogs/AutoChangeLog-pr-5579.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5579.yml diff --git a/html/changelogs/AutoChangeLog-pr-5579.yml b/html/changelogs/AutoChangeLog-pr-5579.yml new file mode 100644 index 0000000000..f364d706c3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5579.yml @@ -0,0 +1,7 @@ +author: Addust +changes: + - {rscadd: "Recent recon efforts have identified the Ramzi Clique's successful takeover + of various ICW-era nuclear bunkers on jungle planetoids, alongside a major increase + in the number of officers named \"Jerry\" who actually know how to operate their + personal submachineguns."} +delete-after: true From 868f7dfeddde4f16deec70ba879455b58eb0a4af Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 30 Jan 2026 01:42:46 +0000 Subject: [PATCH 13/17] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5579.yml | 7 ------- html/changelogs/AutoChangeLog-pr-5725.yml | 4 ---- html/changelogs/AutoChangeLog-pr-5831.yml | 4 ---- html/changelogs/archive/2026-01.yml | 10 ++++++++++ 4 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5579.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5725.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5831.yml diff --git a/html/changelogs/AutoChangeLog-pr-5579.yml b/html/changelogs/AutoChangeLog-pr-5579.yml deleted file mode 100644 index f364d706c3..0000000000 --- a/html/changelogs/AutoChangeLog-pr-5579.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: Addust -changes: - - {rscadd: "Recent recon efforts have identified the Ramzi Clique's successful takeover - of various ICW-era nuclear bunkers on jungle planetoids, alongside a major increase - in the number of officers named \"Jerry\" who actually know how to operate their - personal submachineguns."} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-5725.yml b/html/changelogs/AutoChangeLog-pr-5725.yml deleted file mode 100644 index ac156bf41a..0000000000 --- a/html/changelogs/AutoChangeLog-pr-5725.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Erikafox -changes: - - {rscadd: Atira interior expansion} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-5831.yml b/html/changelogs/AutoChangeLog-pr-5831.yml deleted file mode 100644 index 26177f0465..0000000000 --- a/html/changelogs/AutoChangeLog-pr-5831.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: generalthrax -changes: - - {bugfix: Added right cell to Mining Facility} -delete-after: true diff --git a/html/changelogs/archive/2026-01.yml b/html/changelogs/archive/2026-01.yml index 96bae90c95..75f4c9c4ab 100644 --- a/html/changelogs/archive/2026-01.yml +++ b/html/changelogs/archive/2026-01.yml @@ -137,3 +137,13 @@ Erikafox: - bugfix: simplemobs will no longer get stuck on railings when they're trying to kill you +2026-01-30: + Addust: + - rscadd: Recent recon efforts have identified the Ramzi Clique's successful takeover + of various ICW-era nuclear bunkers on jungle planetoids, alongside a major increase + in the number of officers named "Jerry" who actually know how to operate their + personal submachineguns. + Erikafox: + - rscadd: Atira interior expansion + generalthrax: + - bugfix: Added right cell to Mining Facility From 53df12624df7eed217a2ec3234a0f7258c516ce2 Mon Sep 17 00:00:00 2001 From: thearbiber <135081923+thearbiber@users.noreply.github.com> Date: Thu, 29 Jan 2026 22:13:34 -0500 Subject: [PATCH 14/17] kilo remap 400 (#5764) ## About The Pull Request featuring maurice cuck chair image image image ## Why It's Good For The Game the kilo had a lot of odd quirks (cramped as hell in some areas that shouldnt be. dorm space that barely exists. refinery that was basically slapped on) and this aims to fix most of it while staying relatively true to how it was, while still making it more Modern. ## Changelog :cl: add: remaps the kilo /:cl: --- .../shuttles/independent/independent_kilo.dmm | 3387 +++++++++-------- 1 file changed, 1844 insertions(+), 1543 deletions(-) diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm index 14d657e1f2..5bd5ac9f6f 100644 --- a/_maps/shuttles/independent/independent_kilo.dmm +++ b/_maps/shuttles/independent/independent_kilo.dmm @@ -2,78 +2,124 @@ "aa" = ( /turf/template_noop, /area/template_noop) +"ab" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable/pink{ + icon_state = "4-6" + }, +/obj/structure/cable/pink{ + icon_state = "1-6" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) "ac" = ( -/turf/closed/wall/r_wall, +/turf/closed/wall/r_wall/rust, /area/ship/cargo) "ak" = ( -/obj/machinery/power/shuttle/engine/fire, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/shuttle/engine/electric, /turf/open/floor/engine/hull, -/area/ship/engineering) +/area/ship/engineering/engine) "am" = ( -/obj/machinery/autolathe, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/cargo) -"ar" = ( -/obj/machinery/atmospherics/components/unary/shuttle/fire_heater, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 +/obj/structure/closet/crate/secure/weapon{ + name = "ammo crate" }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/item/storage/box/ammo/a8_50r{ + pixel_x = 6; + pixel_y = -5 }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "kilothrusters" +/obj/item/storage/box/ammo/c22lr{ + pixel_x = 5; + pixel_y = 5 }, -/turf/open/floor/plating, -/area/ship/engineering) +/obj/item/ammo_box/magazine/m17{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/item/ammo_box/magazine/m17{ + pixel_x = 0; + pixel_y = 4 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = -2; + pixel_y = -7 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 7; + pixel_y = -7 + }, +/obj/structure/cable/pink{ + icon_state = "5-10" + }, +/obj/item/ammo_box/magazine/m17{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 2; + pixel_y = -7 + }, +/obj/item/storage/box/ammo/a12g_buckshot, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "av" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 +/obj/machinery/power/terminal{ + dir = 8 }, /obj/structure/sign/poster/random{ pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, /obj/structure/table_frame, -/obj/item/shard, /obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/blood/old, +/obj/item/shard, +/obj/structure/cable/pink{ + icon_state = "2-4" + }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/open/floor/plating, -/area/ship/engineering) +/area/ship/engineering/engine) "ay" = ( -/obj/effect/decal/cleanable/glass, -/mob/living/basic/cockroach, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/cargo) -"aC" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/sign/poster/random{ - pixel_y = 32 - }, -/obj/effect/turf_decal/borderfloor, -/obj/effect/turf_decal/box/corners{ +/obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/turf_decal/box/corners{ - dir = 1 +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"aC" = ( +/obj/structure/crate_shelf, /obj/structure/cable/pink{ - icon_state = "0-2" + icon_state = "0-6" }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/port) +/area/ship/cargo) "aJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/chair/bench/olive/directional/east, -/obj/structure/railing{ - dir = 8 +/obj/structure/cable/pink{ + icon_state = "2-6" }, /obj/effect/turf_decal/corner/opaque/grey/half, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/dark, -/area/ship/hallway/port) +/area/ship/engineering/engine) "aS" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/closet/secure_closet/engineering_personal{ @@ -89,234 +135,247 @@ /obj/item/storage/belt/utility/full/engi, /obj/item/clothing/head/hardhat/orange, /obj/item/clothing/under/overalls/olive, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/tech, -/area/ship/engineering) +/area/ship/engineering/engine) "aU" = ( -/obj/structure/cable/cyan{ - icon_state = "0-8" +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/corner/opaque/black{ + dir = 1 }, -/obj/machinery/power/terminal{ +/obj/structure/cable/pink{ + icon_state = "2-6" + }, +/obj/structure/cable/pink{ + icon_state = "0-6" + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -21; + pixel_y = -12 + }, +/turf/open/floor/plasteel, +/area/ship/crew/canteen/kitchen) +"aZ" = ( +/obj/effect/turf_decal/corner/transparent/beige/full, +/obj/effect/turf_decal/corner/transparent/brown/diagonal, +/obj/machinery/griddle, +/obj/structure/extinguisher_cabinet/directional/west{ + pixel_y = -9; + pixel_x = -28 + }, +/obj/machinery/firealarm/directional/west{ + pixel_x = -32; + pixel_y = 4 + }, +/turf/open/floor/plasteel, +/area/ship/crew/canteen/kitchen) +"be" = ( +/obj/structure/catwalk/over/plated_catwalk, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, -/area/ship/engineering) -"aZ" = ( -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) +/area/ship/crew/canteen/kitchen) "bg" = ( -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable/pink{ - icon_state = "4-8" + icon_state = "4-9" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/light/small/directional/south{ - pixel_x = -5 +/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/pink{ + icon_state = "1-9" }, /obj/machinery/light_switch{ dir = 1; pixel_x = 5; pixel_y = -19 }, +/obj/machinery/firealarm/directional/south{ + pixel_x = -6; + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"bj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/structure/cable/pink{ + icon_state = "6-9" + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/ship/hallway/port) +/area/ship/engineering/engine) "bm" = ( /obj/item/toy/plush/moth/punished, /turf/open/floor/plating, -/area/ship/maintenance/fore) +/area/ship/cargo) "bn" = ( -/obj/structure/cable{ - icon_state = "0-4" +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_x = 0; + pixel_y = 5 }, -/obj/machinery/power/shuttle/engine/electric, -/turf/open/floor/engine/hull, -/area/ship/engineering) +/obj/effect/turf_decal/corner/transparent/beige/full, +/obj/effect/turf_decal/corner/transparent/brown/diagonal, +/turf/open/floor/plasteel, +/area/ship/crew/canteen/kitchen) "by" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/effect/turf_decal/siding/thinplating, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/plasteel/tech/techmaint, /area/ship/cargo) "bA" = ( -/obj/structure/chair/plastic, -/obj/structure/cable/pink{ - icon_state = "4-6" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/item/reagent_containers/food/drinks/mead, -/obj/effect/turf_decal/corner/opaque/black{ - dir = 1 +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/door/poddoor/shutters{ + id = "kilowindows" }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) +/turf/open/floor/plating, +/area/ship/crew/canteen/kitchen) "bF" = ( -/turf/closed/wall, +/turf/closed/wall/r_wall/rust, /area/ship/bridge) "bG" = ( -/obj/structure/cable/pink{ - icon_state = "5-8" - }, -/obj/structure/cable/pink{ - icon_state = "2-8" - }, +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/firedoor/heavy, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/decal/cleanable/oil, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/plasteel/dark, /area/ship/cargo) -"bH" = ( -/obj/machinery/firealarm/directional/west, -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 10 +"bM" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/ship/bridge) -"bL" = ( -/obj/structure/cable/pink{ - icon_state = "1-8" +/obj/machinery/button/door{ + dir = 4; + id = "cock_bathroom"; + normaldoorcontrol = 1; + specialfunctions = 4; + name = "Bathroom Lock"; + pixel_x = -23; + pixel_y = 5 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/firealarm/directional/east{ - pixel_y = -5 +/obj/effect/decal/cleanable/vomit/old{ + pixel_x = -5 }, -/obj/structure/extinguisher_cabinet/directional/east{ - pixel_y = 7 +/obj/structure/toilet{ + pixel_y = 15; + pixel_x = -12 }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"bM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/sink{ + pixel_x = 6; + pixel_y = 18 }, -/obj/structure/cable/pink{ - icon_state = "4-9" +/obj/structure/mirror{ + pixel_x = 0; + pixel_y = 34 }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/item/storage/pill_bottle/happy{ + pixel_x = 13; + pixel_y = 7 }, -/obj/item/radio/intercom/directional/south, -/obj/structure/cable/pink{ - icon_state = "1-9" +/obj/item/reagent_containers/glass/rag{ + pixel_x = 10; + pixel_y = -5 }, -/turf/open/floor/plating, -/area/ship/hallway/port) +/turf/open/floor/plasteel/patterned, +/area/ship/crew) "bP" = ( /turf/closed/wall/r_wall, /area/ship/bridge) "bQ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/light/small/directional/west, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/ship/engineering) -"bT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/power/terminal{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 6 }, -/obj/structure/cable/pink{ - icon_state = "4-9" +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 6 }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/obj/structure/cable/pink, +/turf/open/floor/plating, +/area/ship/engineering/engine) "bU" = ( /obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/plating, -/area/ship/hallway/port) -"bV" = ( -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable/pink{ - icon_state = "4-10" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/item/radio/intercom/directional/south, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/south{ - pixel_x = 7 + dir = 4 }, -/obj/machinery/firealarm/directional/south{ - pixel_x = -5 +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 9 }, /turf/open/floor/plating, -/area/ship/hallway/port) -"bX" = ( -/obj/machinery/door/airlock/mining{ - dir = 8; - name = "Cargo Bay" - }, -/obj/structure/cable/pink{ - icon_state = "4-8" - }, +/area/ship/engineering/engine) +"bV" = ( +/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning/fulltile, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"bY" = ( /obj/structure/cable/pink{ - icon_state = "4-8" + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"bX" = ( +/obj/docking_port/stationary{ + dheight = 1; + dir = 4; + disable_on_owner_ship_dock = 1; + dwidth = 15; + height = 30; + name = "Kilo Forward Bow Dock"; + width = 35 }, +/turf/template_noop, +/area/template_noop) +"bY" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) -"bZ" = ( -/obj/structure/closet/crate/secure/exo, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, -/obj/item/pickaxe/drill, -/obj/item/pinpointer/mineral, -/obj/structure/cable/pink{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) "ca" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/pink{ icon_state = "4-8" }, @@ -328,123 +387,124 @@ pixel_x = 4; pixel_y = -19 }, -/obj/structure/extinguisher_cabinet/directional/south{ - pixel_x = -6 - }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plating, -/area/ship/engineering) +/area/ship/engineering/engine) "cb" = ( -/obj/machinery/portable_atmospherics/canister/fuel, /obj/effect/turf_decal/box, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/rack, /turf/open/floor/plasteel/tech, -/area/ship/engineering) +/area/ship/engineering/engine) "cf" = ( -/obj/machinery/door/poddoor{ - id = "kilocargo" - }, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 8; - id = "kilofield" +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/structure/cable/pink{ - icon_state = "0-10" +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plating, /area/ship/cargo) "ci" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 1 +/obj/structure/guncloset, +/obj/effect/turf_decal/borderfloor, +/obj/effect/turf_decal/box/corners{ + dir = 4 }, -/obj/machinery/light/directional/south, -/obj/structure/ore_box, /obj/effect/turf_decal/box/corners{ - dir = 8 + dir = 1 }, -/obj/effect/turf_decal/box/corners, +/obj/item/gun/ballistic/rifle/illestren/empty, +/obj/item/gun/ballistic/automatic/pistol/m17/no_mag, +/obj/effect/decal/cleanable/dirt, +/obj/item/gun/ballistic/shotgun/doublebarrel/presawn/empty, +/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "cj" = ( -/obj/structure/closet/crate/internals, -/obj/effect/turf_decal/borderfloor{ - dir = 9 +/obj/machinery/autolathe, +/obj/effect/turf_decal/borderfloor, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/obj/machinery/firealarm/directional/south{ + pixel_x = -6; + pixel_y = -32 + }, +/obj/structure/extinguisher_cabinet/directional/south{ + pixel_x = 7; + pixel_y = -28 }, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/box/corners, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "ck" = ( -/obj/machinery/door/airlock{ - name = "Dormitory" +/turf/closed/wall, +/area/ship/engineering/engine) +"cq" = ( +/obj/effect/turf_decal/miskilamo_small{ + dir = 1 }, -/obj/structure/cable/pink{ - icon_state = "5-9" +/turf/open/floor/engine/hull, +/area/ship/external/dark) +"cr" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/door/poddoor/shutters{ + id = "kilowindows" }, +/turf/open/floor/plating, +/area/ship/crew) +"cs" = ( +/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable/pink{ - icon_state = "2-9" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/industrial/warning/fulltile, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"cq" = ( -/turf/closed/wall, -/area/ship/crew/dorm) -"cr" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable/pink{ - icon_state = "0-10" - }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/ship/engineering) -"cw" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/area/ship/crew/canteen/kitchen) +"cv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/item/reagent_containers/food/drinks/mead, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"cB" = ( -/obj/structure/closet/secure_closet/miner{ - anchored = 1; - populate = 0 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/turf_decal/borderfloor{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 4 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 10 +/obj/structure/cable/pink{ + icon_state = "4-8" }, -/obj/effect/turf_decal/box/corners{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"cw" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor/shutters{ + id = "kiloprivate" }, +/turf/open/floor/plating, +/area/ship/bridge) +"cB" = ( /obj/effect/turf_decal/box/corners, -/obj/item/storage/backpack/explorer, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/under/rank/cargo/miner/hazard, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/gloves/explorer, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/head/hardhat/mining, -/obj/item/clothing/suit/armor/vest, +/obj/effect/turf_decal/borderfloor{ + dir = 9 + }, +/obj/structure/ore_box, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "cC" = ( @@ -455,9 +515,6 @@ dir = 8; name = "Engine Bay" }, -/obj/structure/cable/pink{ - icon_state = "6-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -468,312 +525,479 @@ dir = 8 }, /obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/port) +/area/ship/engineering/engine) "cJ" = ( /obj/structure/chair/handrail{ dir = 1 }, /obj/machinery/advanced_airlock_controller/directional/south, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/pink{ - icon_state = "0-9" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ + dir = 4 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -19; - pixel_y = 13 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/fore) +/area/ship/cargo) "cK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 4 +/obj/structure/closet/emcloset/wall/directional/south{ + pixel_x = -4; + pixel_y = -28 }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"cM" = ( -/obj/structure/cable/pink{ - icon_state = "5-8" +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/mask/gas{ + pixel_x = 8; + pixel_y = -9 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/item/clothing/mask/gas{ + pixel_x = -10; + pixel_y = -9 }, -/obj/structure/cable/pink{ - icon_state = "6-8" +/obj/effect/turf_decal/borderfloor{ + dir = 5 }, -/turf/open/floor/plating, -/area/ship/engineering) -"cP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/machinery/door/poddoor/shutters{ - id = "kilowindows" +/obj/effect/turf_decal/box/corners{ + dir = 8 }, -/turf/open/floor/plating/airless, -/area/ship/hallway/port) -"cV" = ( /obj/structure/cable/pink{ - icon_state = "2-9" + icon_state = "1-5" }, -/obj/structure/cable/pink{ - icon_state = "2-5" +/obj/machinery/light/small/directional/west{ + pixel_x = -29; + pixel_y = -13 + }, +/obj/structure/extinguisher_cabinet/directional/west{ + pixel_x = -28; + pixel_y = 10 + }, +/obj/machinery/firealarm/directional/west{ + pixel_x = -32; + pixel_y = -2 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 10; + pixel_y = -19 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) +"cM" = ( +/obj/machinery/cryopod{ + dir = 4 }, +/obj/effect/turf_decal/box, +/obj/machinery/light/small/directional/north, +/obj/machinery/computer/cryopod/retro/directional/west, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/mono{ +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew) +"cV" = ( +/obj/effect/turf_decal/miskilamo_small/right{ dir = 1 }, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 10 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "cW" = ( -/obj/structure/sink/kitchen{ - dir = 8 +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = -12 +/obj/machinery/door/airlock{ + dir = 1; + name = "Cryo Room" }, -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/brown/diagonal, -/obj/effect/turf_decal/spline/fancy/opaque/grey, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/ship/crew) "cY" = ( +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /obj/structure/cable/pink{ - icon_state = "0-4" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/power/terminal{ +/obj/machinery/door/airlock{ + dir = 8; + name = "Dormitory" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/ship/engineering) +/turf/open/floor/plasteel/dark, +/area/ship/crew) "cZ" = ( -/obj/machinery/power/ship_gravity, -/obj/structure/cable/pink{ +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/obj/structure/cable/cyan{ icon_state = "0-8" }, /turf/open/floor/plating, -/area/ship/engineering) +/area/ship/engineering/engine) "da" = ( -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/grey/half, +/obj/machinery/vending/cigarette, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen/kitchen) "dc" = ( -/obj/item/kirbyplants/fullysynthetic{ - pixel_x = -11 +/obj/structure/table/wood, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 16; + pixel_y = -25 }, -/obj/structure/cable/pink, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/turf_decal/industrial/warning{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet, +/area/ship/crew/canteen/kitchen) +"de" = ( +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 9 + }, +/obj/effect/turf_decal/industrial/loading{ dir = 4 }, -/obj/effect/decal/cleanable/vomit/old{ - pixel_x = -5 +/obj/structure/cable/pink{ + icon_state = "2-5" }, -/turf/open/floor/plasteel/patterned, -/area/ship/hallway/central) -"de" = ( /obj/structure/cable/pink{ - icon_state = "2-9" + icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/internals, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 3; + pixel_y = -4 }, -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/airlock{ - dir = 1; - name = "Cryo Room" +/obj/item/tank/internals/oxygen{ + pixel_x = -6; + pixel_y = 4 }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/obj/item/tank/internals/oxygen{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -10; + pixel_y = 0 + }, +/obj/item/clothing/head/helmet/space/eva{ + pixel_x = 11; + pixel_y = 8 + }, +/obj/item/clothing/suit/space/eva{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/effect/mapping_helpers/crate_shelve, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "dt" = ( -/obj/machinery/vending/cigarette, -/obj/machinery/airalarm/directional/west, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/black/half{ - dir = 1 +/obj/effect/turf_decal/corner/opaque/black{ + dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/ship/hallway/central) -"dE" = ( -/obj/structure/sign/number/random, -/turf/closed/wall/r_wall, -/area/ship/engineering) +/area/ship/crew/canteen/kitchen) "dF" = ( -/obj/effect/turf_decal/miskilamo_small/right{ +/obj/effect/turf_decal/miskilamo_small/left{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 10 - }, /turf/open/floor/engine/hull, /area/ship/external/dark) +"ec" = ( +/obj/effect/turf_decal/corner/transparent/beige/full, +/obj/effect/turf_decal/corner/transparent/brown/diagonal, +/obj/effect/decal/cleanable/confetti, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/food/flour, +/turf/open/floor/plasteel, +/area/ship/crew/canteen/kitchen) "eo" = ( -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, -/obj/structure/cable/cyan{ +/obj/machinery/power/ship_gravity, +/obj/machinery/light/small/directional/north, +/obj/structure/cable/pink{ icon_state = "0-2" }, +/obj/structure/cable/pink{ + icon_state = "2-8" + }, /turf/open/floor/plating, -/area/ship/engineering) -"eK" = ( -/obj/machinery/button/door{ - pixel_x = -21; - pixel_y = -13; - dir = 4; - id = "dwayne_bathroom"; - normaldoorcontrol = 1; - specialfunctions = 4; - name = "Bathroom Lock" +/area/ship/engineering/engine) +"ep" = ( +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 1 }, -/turf/closed/wall, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/engineering/engine) "eN" = ( -/obj/machinery/light/directional/west, -/obj/structure/crate_shelf, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/cargo) -"fs" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) +"fs" = ( +/obj/effect/turf_decal/corner/transparent/green{ dir = 9 }, -/turf/open/floor/plating, -/area/ship/engineering) -"fv" = ( -/obj/structure/cable/cyan{ - icon_state = "1-10" +/obj/machinery/button/door{ + id = "kilodoor"; + name = "Door bolt"; + pixel_x = -22; + pixel_y = 8; + dir = 4; + specialfunctions = 4; + normaldoorcontrol = 1; + req_access_txt = "19"; + req_ship_access = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/firealarm/directional/west{ + pixel_x = -33; + pixel_y = -4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"fu" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/smes/shuttle, +/obj/effect/turf_decal/industrial/warning{ dir = 4 }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "kilothrusters" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plating, -/area/ship/engineering) -"gp" = ( -/obj/structure/closet/wall/blue/directional/north{ - name = "Captain's locker" +/area/ship/engineering/engine) +"fv" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/door/poddoor/shutters{ + id = "kilowindows" }, -/obj/item/clothing/under/rank/command/captain/suit, -/obj/item/clothing/under/rank/command/captain/skirt, -/obj/item/storage/backpack/captain, -/obj/item/clothing/gloves/color/white, -/obj/item/clothing/shoes/sneakers/brown, -/obj/item/clothing/suit/jacket/leather/duster/command, -/obj/item/clothing/glasses/cheapsuns, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/turf/open/floor/plating, +/area/ship/engineering/engine) +"gk" = ( +/obj/effect/turf_decal/trimline/transparent/green/filled/warning{ dir = 8 }, -/obj/item/storage/box/ammo/a12g_buckshot, /obj/structure/cable/pink{ - icon_state = "4-10" + icon_state = "1-8" }, -/obj/item/gun/ballistic/shotgun/doublebarrel/presawn/empty, -/obj/item/modular_computer/tablet/preset/cheap, -/turf/open/floor/plasteel, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, /area/ship/bridge) -"gs" = ( -/obj/structure/cable/pink{ - icon_state = "4-10" +"gp" = ( +/obj/structure/table, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4; + layer = 2.030 }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/effect/turf_decal/corner/transparent/green{ dir = 1 }, -/obj/structure/cable/pink{ - icon_state = "0-10" +/obj/effect/turf_decal/corner/transparent/green/border{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{ + pixel_x = 4; + pixel_y = 5 }, -/obj/item/cigbutt, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/engineering) -"gC" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/item/storage/toolbox/electrical{ - pixel_x = -3; - pixel_y = 8 +/obj/item/lighter/greyscale{ + pixel_x = -8; + pixel_y = 6 }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 4 +/obj/item/cigbutt{ + pixel_x = -8; + pixel_y = 3 }, -/obj/structure/table, -/obj/machinery/light/small/directional/west, -/obj/item/clothing/glasses/welding{ - pixel_x = 5; - pixel_y = -9 +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"gC" = ( +/obj/effect/turf_decal/corner/opaque/grey/half, +/obj/structure/chair/plastic, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/food/drinks/beer{ + list_reagents = null; + pixel_x = -17; + pixel_y = 3 }, -/turf/open/floor/plating, -/area/ship/engineering) +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen/kitchen) +"gG" = ( +/turf/closed/wall/r_wall/yesdiag, +/area/ship/bridge) "hh" = ( /obj/structure/chair, -/obj/effect/decal/cleanable/oil, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/ship/engineering) +/area/ship/engineering/engine) "hN" = ( -/obj/machinery/mineral/processing_unit{ - input_dir = 8 +/obj/effect/turf_decal/borderfloor{ + dir = 1 }, -/obj/structure/railing/corner{ +/obj/effect/turf_decal/box/corners, +/obj/effect/turf_decal/box/corners{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/drill, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "hR" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 6 +/obj/machinery/suit_storage_unit/inherit, +/obj/effect/turf_decal/borderfloor{ + dir = 1 }, -/obj/effect/turf_decal/arrows{ - dir = 4 +/obj/effect/turf_decal/box/corners{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/patterned, +/obj/effect/turf_decal/box/corners, +/obj/item/clothing/suit/space/hardsuit/mining/independent, +/obj/structure/chair/handrail, +/obj/item/clothing/mask/gas/explorer, +/obj/machinery/light/small/directional/west, +/obj/item/tank/internals/oxygen/yellow, +/turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "hS" = ( -/obj/structure/chair/sofa/brown/old/left/directional/east, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/effect/decal/cleanable/glass, +/obj/structure/cable/pink{ + icon_state = "2-4" + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 + dir = 6 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood/corner{ + color = "#543C30" + }, +/obj/item/kirbyplants/fullysynthetic{ + pixel_x = 11; + pixel_y = 21 + }, +/turf/open/floor/wood/walnut{ + icon_state = "wood-broken3" }, -/obj/machinery/light/directional/west, -/obj/effect/decal/cleanable/confetti, -/turf/open/floor/plasteel/grimy, /area/ship/crew) "ig" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/item/radio/intercom/directional/east, -/obj/item/mop{ - pixel_x = 17 +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/wall/directional/north, +/obj/item/clothing/under/shorts/dolphin{ + pixel_x = -10; + pixel_y = 14 + }, +/obj/item/clothing/under/overalls/brown{ + pixel_x = -10; + pixel_y = 1 + }, +/obj/item/clothing/under/overalls/brown{ + pixel_x = -8; + pixel_y = -4 + }, +/obj/item/clothing/shoes/workboots{ + pixel_x = 8; + pixel_y = -6 + }, +/obj/item/clothing/shoes/workboots{ + pixel_x = 8; + pixel_y = -1 + }, +/obj/item/clothing/head/soft/utility_olive{ + pixel_x = 2; + pixel_y = 16 }, -/obj/item/reagent_containers/glass/bucket{ - list_reagents = list(/datum/reagent/water = 20); +/obj/item/clothing/head/soft/utility_olive{ pixel_x = 8; + pixel_y = 16 + }, +/obj/item/clothing/neck/shemagh/olive{ + pixel_x = 0; + pixel_y = 8 + }, +/obj/item/clothing/neck/shemagh/olive{ + pixel_x = 9; pixel_y = 7 }, -/turf/open/floor/carpet, -/area/ship/crew/dorm) +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" + }, +/turf/open/floor/wood/walnut{ + icon_state = "wood-broken" + }, +/area/ship/crew) "im" = ( -/obj/structure/grille, -/obj/structure/window/fulltile, -/turf/open/floor/plating/airless, -/area/ship/hallway/central) +/turf/closed/wall/r_wall/yesdiag, +/area/ship/cargo) "io" = ( -/obj/machinery/door/airlock/command{ - dir = 4; - name = "Bridge"; - req_access_txt = "19" +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, /obj/structure/cable/pink{ icon_state = "4-8" @@ -782,99 +1006,112 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/door/airlock/command/glass{ + dir = 4; + id_tag = "kilodoor"; + name = "Bridge" }, -/obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"iM" = ( -/obj/structure/cable/pink{ - icon_state = "2-6" +"ix" = ( +/obj/machinery/atmospherics/components/trinary/mixer/airmix/inverse{ + piping_layer = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/chair/bench/beige/directional/east{ +/obj/machinery/button/door{ + dir = 8; + id = "kilothrusters"; + name = "Thruster Lockdown"; + pixel_x = 21 + }, +/obj/machinery/light/small/directional/east{ + pixel_y = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"iM" = ( +/obj/structure/chair/sofa/brown/old/left{ dir = 8 }, -/obj/structure/railing{ - dir = 4 +/obj/item/radio/intercom/directional/south{ + pixel_x = 6; + pixel_y = -31 }, -/obj/effect/turf_decal/corner/opaque/grey/half, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/port) +/obj/machinery/light/small/directional/east, +/turf/open/floor/carpet, +/area/ship/crew/canteen/kitchen) "iT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/effect/decal/cleanable/food/flour, -/mob/living/basic/cockroach, -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/brown/diagonal, -/obj/effect/turf_decal/spline/fancy/opaque/grey, -/turf/open/floor/plasteel, -/area/ship/crew) -"jl" = ( -/obj/machinery/mineral/processing_unit_console{ +/obj/item/cigbutt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch{ dir = 8; - machinedir = 1; - output_dir = 4; - pixel_x = 20 + pixel_x = 20; + pixel_y = -13 }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 5 +/obj/structure/closet/wall/directional/north, +/obj/item/radio{ + pixel_x = 9; + pixel_y = 11 }, -/obj/effect/turf_decal/industrial/loading, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/cargo) -"jx" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "kiloconveyor" +/obj/item/radio{ + pixel_x = 9; + pixel_y = 10 }, -/obj/structure/sign/poster/random{ - pixel_y = 32 +/obj/item/radio{ + pixel_x = 9; + pixel_y = 5 }, -/obj/structure/railing, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"jK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/item/radio{ + pixel_x = 9; + pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/turf/open/floor/plasteel/patterned, +/area/ship/crew) +"jl" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 }, -/obj/machinery/light_switch{ +/obj/machinery/light/small/directional/east, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/cargo) +"jx" = ( +/turf/closed/wall/r_wall/yesdiag, +/area/ship/crew) +"jH" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{ dir = 1; - pixel_x = -10; - pixel_y = -19 + piping_layer = 4 }, /obj/structure/cable/pink{ - icon_state = "4-8" + icon_state = "2-4" }, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, +/area/ship/engineering/engine) +"jK" = ( +/obj/effect/turf_decal/corner/transparent/green{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "jU" = ( +/obj/effect/decal/cleanable/oil/streak, +/obj/item/cigbutt, +/obj/effect/turf_decal/corner/opaque/grey/half, /obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/borderfloor, /obj/effect/turf_decal/box/corners{ - dir = 4 + dir = 1 }, /obj/effect/turf_decal/box/corners{ - dir = 1 + dir = 4 }, -/obj/effect/decal/cleanable/cobweb, -/obj/machinery/airalarm/directional/west, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1, /turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/port) +/area/ship/engineering/engine) "kb" = ( /obj/structure/chair/handrail, /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ @@ -886,149 +1123,235 @@ /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/fore) +/area/ship/cargo) "kA" = ( -/turf/closed/wall/r_wall, -/area/ship/engineering) -"lw" = ( -/turf/closed/wall/rust, +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 4; + piping_layer = 2 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"lO" = ( +/obj/effect/turf_decal/borderfloorblack/corner{ + layer = 2.030 + }, +/obj/effect/turf_decal/corner/transparent/green/bordercorner, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/bridge) +"mf" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{ + dir = 1; + piping_layer = 4 + }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/engineering/engine) "mr" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/mask/breath, -/obj/effect/turf_decal/borderfloor{ - dir = 1 +/obj/structure/table/reinforced, +/obj/effect/turf_decal/borderfloor, +/obj/effect/turf_decal/box/corners{ + dir = 4 }, /obj/effect/turf_decal/box/corners{ - dir = 8 + dir = 1 }, -/obj/effect/turf_decal/box/corners, -/obj/structure/cable/pink{ - icon_state = "1-5" +/obj/item/stack/sheet/metal/twenty{ + pixel_x = 9; + pixel_y = 3 }, -/obj/machinery/firealarm/directional/south, -/obj/structure/sign/warning/vacuum/external{ - pixel_x = 32 +/obj/item/stack/sheet/glass/twenty{ + pixel_x = -6; + pixel_y = -1 + }, +/obj/item/stack/sheet/plastic/five{ + pixel_x = 0; + pixel_y = 6 }, -/obj/item/clothing/suit/space/syndicate/generic, -/obj/item/clothing/head/helmet/space/syndicate/generic, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "mz" = ( -/obj/structure/bed{ - dir = 4 - }, -/obj/effect/spawner/random/bedsheet{ - dir = 4 +/turf/closed/wall/rust, +/area/ship/engineering/engine) +"nc" = ( +/obj/effect/turf_decal/siding/thinplating, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/cargo) +"ng" = ( /obj/machinery/light_switch{ - pixel_x = 7; - pixel_y = 20 + dir = 4; + pixel_x = -21; + pixel_y = 8 }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/carpet, -/area/ship/crew/dorm) -"nd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/firealarm/directional/west{ + pixel_x = -32; + pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/structure/extinguisher_cabinet/directional/west{ + pixel_x = -28; + pixel_y = -14 }, -/obj/structure/cable/pink{ - icon_state = "8-9" +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#543C30" }, -/obj/structure/cable/pink{ - icon_state = "1-5" +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4; + color = "#543C30" }, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"ng" = ( -/obj/structure/cable/pink{ - icon_state = "0-4" +/turf/open/floor/wood/walnut{ + icon_state = "wood-broken7" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/power/terminal{ - dir = 8 +/area/ship/crew) +"nj" = ( +/obj/effect/turf_decal/corner/transparent/beige/full, +/obj/effect/turf_decal/corner/transparent/brown/diagonal, +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ship/crew/canteen/kitchen) +"nD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 1 }, +/obj/machinery/light/small/directional/west, /obj/structure/cable/pink{ - icon_state = "4-5" + icon_state = "1-2" }, -/obj/item/cigbutt, /turf/open/floor/plating, -/area/ship/engineering) +/area/ship/engineering/engine) "nJ" = ( -/obj/machinery/button/door{ - dir = 4; - id = "kilocargo"; - name = "blast door control"; - pixel_x = -20; - pixel_y = 7 - }, -/obj/machinery/button/shieldwallgen{ - dir = 4; - id = "kilofield"; - pixel_x = -19; - pixel_y = -2 +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/item/clothing/head/cone{ - pixel_x = -8; - pixel_y = 4 +/obj/structure/cable/pink{ + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/mono{ - dir = 1 +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Bay" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, /area/ship/cargo) "nO" = ( -/turf/closed/wall/r_wall, -/area/ship/hallway/central) +/obj/structure/crate_shelf, +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/regular{ + pixel_x = -4; + pixel_y = 0 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = 6; + pixel_y = 0 + }, +/obj/item/roller, +/obj/item/clothing/gloves/color/latex/nitrile, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) "oj" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden, +/obj/machinery/power/terminal{ + dir = 8 + }, /obj/machinery/cell_charger, -/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/pink, /turf/open/floor/plating, -/area/ship/engineering) -"oI" = ( -/obj/docking_port/stationary{ - dheight = 1; - dwidth = 20; - height = 30; - name = "Kilo Port Beam Dock"; - width = 40 +/area/ship/engineering/engine) +"oO" = ( +/obj/structure/cable/pink{ + icon_state = "4-8" }, -/turf/template_noop, -/area/template_noop) -"oP" = ( -/obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/turf/open/floor/plating, +/area/ship/crew/canteen/kitchen) +"oP" = ( +/obj/structure/table, +/obj/machinery/light/small/directional/south, /obj/item/stack/sheet/mineral/plasma/ten, -/obj/item/reagent_containers/food/drinks/mead, +/obj/item/reagent_containers/food/drinks/beer{ + list_reagents = null; + pixel_x = -13; + pixel_y = 11 + }, /turf/open/floor/plating, -/area/ship/engineering) +/area/ship/engineering/engine) +"oY" = ( +/obj/effect/turf_decal/siding/thinplating, +/obj/effect/decal/cleanable/oil/streak, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) +"pT" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/oil/streak, +/obj/item/clothing/head/cone{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/mono{ + dir = 1 + }, +/area/ship/cargo) "pV" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "kiloconveyor"; - layer = 3.09; - pixel_x = 11; - pixel_y = 14 +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/patterned/grid, +/turf/open/floor/plasteel/patterned, /area/ship/cargo) +"qa" = ( +/obj/structure/table/wood, +/obj/item/food/grilled_cheese_sandwich, +/turf/open/floor/carpet, +/area/ship/crew/canteen/kitchen) "qv" = ( -/obj/machinery/door/airlock/external{ - dir = 4 +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/turf_decal/industrial/warning/fulltile, -/turf/open/floor/plasteel/dark, -/area/ship/maintenance/fore) +/obj/structure/cable/pink{ + icon_state = "0-2" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "kilofield" + }, +/obj/machinery/door/poddoor{ + id = "kilocargo" + }, +/turf/open/floor/engine/hull/interior, +/area/ship/cargo) "qw" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -1045,42 +1368,20 @@ preferred_direction = 4 }, /turf/open/floor/plasteel/dark, -/area/ship/maintenance/fore) +/area/ship/cargo) "rc" = ( -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/pink{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/ship/hallway/port) -"rq" = ( -/obj/structure/cable/pink{ - icon_state = "4-9" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/door/airlock/mining{ + dir = 8; + name = "Cargo Bay" }, -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable/pink{ icon_state = "4-8" }, -/turf/open/floor/plating, -/area/ship/hallway/central) -"rO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/airlock/glass{ - dir = 8; - name = "Crew Quarters" + dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1090,122 +1391,108 @@ }, /obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/plasteel/dark, -/area/ship/crew) -"rW" = ( -/turf/closed/wall/yesdiag, -/area/ship/maintenance/fore) -"sD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/computer/helm/viewscreen/directional/south, +/area/ship/cargo) +"rO" = ( +/obj/structure/catwalk/over/plated_catwalk, /obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/hallway/central) -"sG" = ( /obj/structure/cable/pink{ - icon_state = "1-10" + icon_state = "1-9" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/firealarm/directional/east{ - pixel_y = -5 +/obj/structure/cable/pink{ + icon_state = "1-4" }, -/obj/structure/extinguisher_cabinet/directional/east{ - pixel_y = 7 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/ship/crew/canteen/kitchen) +"sG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/structure/cable/pink{ - icon_state = "6-10" +/turf/open/floor/wood/walnut{ + icon_state = "wood-broken5" }, -/turf/open/floor/carpet, -/area/ship/crew/dorm) +/area/ship/crew) "sW" = ( -/obj/machinery/computer/cargo/retro{ +/obj/machinery/computer/helm/retro{ dir = 8 }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 10 +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) -"tb" = ( -/turf/closed/wall/rust, -/area/ship/crew/dorm) -"tW" = ( -/turf/closed/wall/rust, -/area/ship/crew) -"vl" = ( -/turf/closed/wall/r_wall/rust, -/area/ship/hallway/port) +"tP" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/structure/cable/pink{ + icon_state = "1-10" + }, +/obj/item/clothing/head/cone{ + pixel_x = 11; + pixel_y = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/mono{ + dir = 1 + }, +/area/ship/cargo) "vv" = ( /obj/structure/grille, -/obj/structure/window/reinforced/fulltile, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/poddoor/shutters{ - id = "kilowindows" + id = "kilobridge" }, -/turf/open/floor/plating/airless, -/area/ship/hallway/central) -"vU" = ( +/turf/open/floor/plating, +/area/ship/bridge) +"wc" = ( +/turf/closed/wall/rust, +/area/ship/crew) +"ww" = ( +/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable/pink{ icon_state = "1-2" }, -/turf/open/floor/plasteel/patterned, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, /area/ship/cargo) -"wc" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/item/toy/cards/deck{ - pixel_y = 22 - }, -/obj/item/food/sandwich, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"wh" = ( -/turf/closed/wall/r_wall/rust, -/area/ship/crew/dorm) "xe" = ( -/obj/machinery/door/airlock/external/glass{ - dir = 8 +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/airlock/external/glass{ dir = 8 }, -/obj/structure/cable/pink{ - icon_state = "6-10" - }, -/obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/plasteel/dark, -/area/ship/maintenance/fore) +/area/ship/cargo) "xk" = ( -/turf/closed/wall, -/area/ship/hallway/central) -"xn" = ( -/turf/closed/wall/rust, -/area/ship/hallway/central) -"xF" = ( -/obj/structure/cable/pink{ - icon_state = "8-9" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/effect/turf_decal/corner/transparent/beige/full, +/obj/effect/turf_decal/corner/transparent/brown/diagonal, +/obj/effect/turf_decal/siding/thinplating{ dir = 1 }, -/obj/item/kirbyplants/fullysynthetic{ - pixel_x = 11 - }, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/spline/fancy/opaque/grey{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/turf/open/floor/plasteel/grimy, -/area/ship/crew/dorm) +/turf/open/floor/plasteel, +/area/ship/crew/canteen/kitchen) +"xy" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "kilobridge" + }, +/turf/open/floor/plating, +/area/ship/bridge) "yd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1213,26 +1500,29 @@ /obj/structure/cable/pink{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/south{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/structure/extinguisher_cabinet/directional/south{ + pixel_x = -4; + pixel_y = -28 + }, /turf/open/floor/plating, -/area/ship/engineering) -"yn" = ( +/area/ship/engineering/engine) +"yF" = ( +/turf/closed/wall/r_wall, +/area/ship/crew/canteen/kitchen) +"zc" = ( /obj/structure/closet/secure_closet/freezer/fridge{ populate = 0 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = -8 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/pink{ - icon_state = "0-10" - }, -/obj/effect/decal/cleanable/cobweb, /obj/item/reagent_containers/food/drinks/waterbottle/large, /obj/item/reagent_containers/food/drinks/soda_cans/cola, /obj/item/reagent_containers/food/drinks/soda_cans/cola, @@ -1246,818 +1536,829 @@ /obj/item/food/icecreamsandwich, /obj/effect/turf_decal/corner/transparent/beige/full, /obj/effect/turf_decal/corner/transparent/brown/diagonal, -/turf/open/floor/plasteel, -/area/ship/crew) -"yF" = ( -/turf/closed/wall/r_wall, -/area/ship/crew) -"zc" = ( -/obj/structure/curtain, -/obj/machinery/shower{ - dir = 1 - }, -/obj/item/soap{ - pixel_y = 4 - }, -/obj/item/bikehorn/rubberducky/plasticducky{ - pixel_x = -9; - pixel_y = -7 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 6 - }, -/obj/machinery/button/door{ - dir = 8; - id = "cock_bathroom"; - normaldoorcontrol = 1; - specialfunctions = 4; - name = "Bathroom Lock"; - pixel_x = 20; - pixel_y = 10 - }, -/turf/open/floor/plasteel/freezer, -/area/ship/crew) -"zH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/item/food/meat/slab{ + pixel_x = -8; + pixel_y = -6 }, -/obj/structure/cable/pink{ - icon_state = "5-9" +/obj/item/food/meat/slab{ + pixel_x = -6; + pixel_y = -1 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/item/food/bread/plain{ + pixel_x = 5; + pixel_y = -4 }, +/turf/open/floor/plasteel, +/area/ship/crew/canteen/kitchen) +"zA" = ( +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ - dir = 4 + dir = 1 }, /obj/machinery/door/airlock{ - dir = 8; - name = "Dormitory" - }, -/obj/effect/turf_decal/siding/wood{ - color = "#E3994E"; - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - color = "#E3994E"; - dir = 4 + name = "Restroom"; + id_tag = "cock_bathroom" }, -/turf/open/floor/wood/yew, +/turf/open/floor/plasteel/dark, /area/ship/crew) +"zH" = ( +/obj/structure/chair/sofa/brown/old/right, +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet, +/area/ship/crew/canteen/kitchen) "AB" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/patterned, +/turf/closed/wall/r_wall, /area/ship/cargo) "AE" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility/skirt, -/obj/item/clothing/under/utility/skirt, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/pink{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/spline/fancy/opaque/grey{ +/obj/effect/spawner/bunk_bed{ dir = 1 }, -/turf/open/floor/plasteel/grimy, -/area/ship/crew/dorm) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet, +/area/ship/crew) "AP" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "engine fuel pump"; - target_pressure = 500 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plating, -/area/ship/engineering) +/obj/structure/sign/number/random, +/turf/closed/wall/r_wall/rust, +/area/ship/engineering/engine) "AQ" = ( -/turf/closed/wall, -/area/ship/engineering) -"AV" = ( -/obj/structure/cable/cyan{ - icon_state = "4-5" - }, -/obj/structure/cable/pink{ - icon_state = "0-6" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/power/terminal{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ship/engineering) +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) "Bm" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 +/obj/machinery/power/smes/engineering, +/obj/structure/cable/pink{ + icon_state = "0-9" }, /turf/open/floor/plating, -/area/ship/engineering) -"Bu" = ( -/turf/closed/wall/r_wall/yesdiag, -/area/ship/bridge) +/area/ship/engineering/engine) "BP" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/effect/turf_decal/borderfloorblack{ + dir = 6; + layer = 2.030 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/effect/turf_decal/corner/transparent/green/border{ + dir = 6 }, -/obj/effect/turf_decal/corner_techfloor_grid/full{ +/obj/effect/decal/cleanable/greenglow, +/obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "BS" = ( /obj/structure/grille, -/obj/structure/window/reinforced/fulltile, +/obj/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor{ dir = 4; id = "kilobridge" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/bridge) -"Ce" = ( -/turf/closed/wall/rust, -/area/ship/maintenance/fore) "Co" = ( -/obj/machinery/door/poddoor{ - id = "kilocargo" - }, -/turf/open/floor/plasteel/patterned/ridged, +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/turf/open/floor/plating, /area/ship/cargo) "Cv" = ( -/obj/structure/cable/pink{ - icon_state = "2-8" - }, +/obj/effect/turf_decal/siding/thinplating, +/obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/closet/crate/medical, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/storage/firstaid/regular, -/obj/item/roller, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"Da" = ( -/obj/item/cigbutt, /turf/open/floor/plasteel/patterned, /area/ship/cargo) -"Ds" = ( -/obj/structure/filingcabinet/chestdrawer{ - dir = 8 - }, -/obj/item/folder/blue, -/obj/item/folder/yellow, -/obj/item/folder, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/computer_hardware/card_slot, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/pink{ - icon_state = "0-8" - }, -/turf/open/floor/plasteel, -/area/ship/bridge) -"Ew" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"CO" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/borderfloor, +/obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/light/small/directional/south, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -8; - pixel_y = -19 +/obj/effect/turf_decal/box/corners{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/structure/cable/pink{ - icon_state = "4-6" +/obj/item/pickaxe/drill{ + pixel_x = -2; + pixel_y = -5 }, -/obj/item/cigbutt, -/turf/open/floor/plating, -/area/ship/hallway/central) -"EG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/item/pinpointer/mineral{ + pixel_x = 7; + pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) +"Da" = ( +/obj/item/clothing/under/rank/command/captain/suit, +/obj/item/clothing/under/rank/command/captain/skirt, +/obj/item/storage/backpack/captain, +/obj/item/clothing/gloves/color/white, +/obj/item/clothing/shoes/sneakers/brown, +/obj/item/clothing/suit/jacket/leather/duster/command, +/obj/item/clothing/glasses/cheapsuns, +/obj/effect/turf_decal/borderfloorblack{ + layer = 2.030 + }, +/obj/effect/turf_decal/corner/transparent/green{ dir = 1 }, -/obj/effect/decal/cleanable/confetti, -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/brown/diagonal, -/obj/effect/turf_decal/spline/fancy/opaque/grey, -/turf/open/floor/plasteel, -/area/ship/crew) -"EU" = ( -/obj/structure/cable/pink{ - icon_state = "1-2" +/obj/effect/turf_decal/corner/transparent/green/border, +/obj/structure/closet/secure_closet/wall/directional/west{ + req_access_txt = "20"; + icon_state = "solgov_wall"; + name = "Captain's closet"; + pixel_x = -28; + pixel_y = -3 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"Ds" = ( +/obj/structure/table, +/obj/item/radio/intercom/wideband/table{ + dir = 1; + pixel_x = 5; + pixel_y = 0 }, -/obj/item/cigbutt, -/obj/machinery/computer/cryopod/retro/directional/west, /obj/effect/turf_decal/industrial/warning{ - dir = 4 + dir = 8 }, -/turf/open/floor/plasteel/patterned, -/area/ship/hallway/central) -"GK" = ( -/obj/structure/table, -/obj/machinery/light_switch{ +/obj/machinery/button/door{ + id = "kilowindows"; + name = "Window Lockdown"; pixel_x = -10; - pixel_y = 20 + pixel_y = 21 }, -/obj/item/radio{ - pixel_y = 5 +/obj/machinery/button/door{ + id = "kilobridge"; + name = "Bridge Lockdown"; + pixel_x = 12; + pixel_y = 21 }, -/obj/item/radio{ - pixel_y = 5 +/obj/machinery/button/door{ + pixel_x = 1; + pixel_y = 21; + id = "kiloprivate"; + name = "Privacy Shutters" }, -/obj/item/radio{ - pixel_y = 5 +/obj/machinery/light/small/directional/east, +/obj/item/radio/intercom/table{ + dir = 1; + pixel_x = -13; + pixel_y = 0 }, -/obj/item/radio{ - pixel_y = 5 +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"EU" = ( +/obj/structure/chair/sofa/brown/old{ + dir = 8 }, -/obj/item/radio{ - pixel_y = 5 +/obj/machinery/computer/helm/viewscreen/directional/east, +/turf/open/floor/carpet, +/area/ship/crew/canteen/kitchen) +"FC" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"GM" = ( -/obj/machinery/computer/crew/retro{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 1 }, +/obj/effect/decal/cleanable/dirt, /obj/structure/cable/pink{ - icon_state = "4-6" - }, -/obj/structure/sign/poster/random{ - pixel_y = 32 + icon_state = "2-6" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"GK" = ( +/turf/closed/wall, /area/ship/bridge) -"HP" = ( -/obj/item/kirbyplants/fullysynthetic{ - pixel_x = 11 +"GM" = ( +/obj/structure/filingcabinet/double/grey{ + pixel_x = -10; + pixel_y = 0; + dir = 4; + density = 0 }, -/obj/structure/extinguisher_cabinet/directional/east{ - pixel_y = 7 +/obj/item/folder, +/obj/item/folder, +/obj/item/pen, +/obj/item/pen, +/obj/item/modular_computer/tablet/preset/cheap, +/obj/item/modular_computer/tablet/preset/cheap{ + pixel_x = 0; + pixel_y = 0 }, -/obj/machinery/firealarm/directional/east{ - pixel_y = -5 +/obj/effect/turf_decal/corner/transparent/green{ + dir = 9 }, -/obj/effect/decal/cleanable/confetti, -/obj/item/cigbutt, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"Ih" = ( +/obj/effect/turf_decal/corner/transparent/green{ + dir = 4 + }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/light/small/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -22; + pixel_y = -10 + }, +/obj/item/computer_hardware/card_slot, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"II" = ( +/obj/machinery/atmospherics/pipe/layer_manifold, /obj/structure/cable/pink{ icon_state = "1-6" }, -/obj/structure/ore_box, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/pink{ + icon_state = "6-9" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"IW" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/patterned, /area/ship/cargo) -"IJ" = ( -/obj/structure/sign/number/random, -/turf/closed/wall/r_wall/rust, -/area/ship/crew/dorm) "Jf" = ( -/turf/closed/wall/r_wall, -/area/ship/hallway/port) -"Jt" = ( -/obj/structure/sign/warning/docking, -/turf/closed/wall/yesdiag, -/area/ship/maintenance/fore) +/turf/closed/wall/r_wall/rust, +/area/ship/engineering/engine) "Kz" = ( +/obj/structure/closet/secure_closet/miner{ + anchored = 1; + populate = 0 + }, /obj/effect/turf_decal/borderfloor{ - dir = 5 + dir = 1 }, -/obj/structure/rack, -/obj/item/stack/sheet/plastic/five, -/obj/item/stack/sheet/glass/twenty, -/obj/item/stack/sheet/metal/twenty, /obj/effect/turf_decal/box/corners{ dir = 8 }, +/obj/effect/turf_decal/box/corners, +/obj/item/storage/backpack/explorer, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/clothing/under/rank/cargo/miner/hazard, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/gloves/explorer, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/head/hardhat/mining, +/obj/item/clothing/suit/armor/vest, +/obj/item/clothing/head/helmet/m10, +/obj/item/storage/bag/ore{ + pixel_x = 6; + pixel_y = -9 + }, +/obj/item/storage/bag/ore{ + pixel_x = 6; + pixel_y = -10 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/light/small/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "KB" = ( -/turf/closed/wall, -/area/ship/maintenance/fore) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/wrapping, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/cargo) "KM" = ( -/obj/effect/decal/cleanable/oil/streak, -/obj/item/cigbutt, -/obj/effect/turf_decal/corner/opaque/grey/half, -/obj/machinery/atmospherics/components/binary/volume_pump/layer4{ - dir = 1 +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/borderfloor, +/obj/effect/turf_decal/box/corners{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/port) -"KR" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" +/obj/effect/turf_decal/box/corners{ + dir = 1 }, +/obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/pink{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 + icon_state = "0-2" }, -/obj/effect/turf_decal/industrial/warning/fulltile, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/engine) "La" = ( -/obj/item/clothing/head/cone{ - pixel_x = 11; - pixel_y = 4 - }, -/obj/structure/extinguisher_cabinet/directional/east{ - pixel_y = 7 - }, -/obj/machinery/firealarm/directional/east{ - pixel_y = -5 - }, -/obj/item/cigbutt, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/mono{ - dir = 1 +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor/shutters{ + id = "kilowindows" }, +/turf/open/floor/plating, /area/ship/cargo) "LC" = ( -/obj/structure/cable/cyan{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{ + dir = 10 }, /obj/structure/cable/pink{ - icon_state = "2-5" + icon_state = "8-9" }, /turf/open/floor/plating, -/area/ship/engineering) +/area/ship/engineering/engine) "Mj" = ( -/obj/machinery/mineral/unloading_machine, -/obj/structure/railing, +/obj/machinery/suit_storage_unit/inherit, +/obj/effect/turf_decal/borderfloor{ + dir = 1 + }, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/box/corners, +/obj/item/clothing/suit/space/syndicate/generic, +/obj/item/clothing/head/helmet/space/syndicate/generic, +/obj/structure/chair/handrail, +/obj/item/clothing/mask/gas, +/obj/item/tank/internals/oxygen/yellow, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "MI" = ( -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/shower{ + dir = 8 }, -/obj/machinery/power/smes/shuttle, -/obj/effect/turf_decal/industrial/warning{ +/obj/effect/turf_decal/steeldecal/steel_decals10, +/obj/effect/turf_decal/steeldecal/steel_decals10{ dir = 4 }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "kilothrusters" +/obj/machinery/door/window/westright, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plasteel/freezer, +/area/ship/crew) +"MY" = ( +/obj/structure/dresser{ + dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/light/small/directional/east, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 6; + color = "#543C30" }, -/turf/open/floor/plating, -/area/ship/engineering) -"MY" = ( -/obj/structure/chair/sofa/brown/old/corner/directional/north, -/obj/structure/sign/poster/random{ - pixel_x = -32 +/turf/open/floor/wood/walnut{ + icon_state = "wood-broken7" }, -/turf/open/floor/plasteel/grimy, /area/ship/crew) -"Ng" = ( -/obj/structure/cable/pink{ - icon_state = "1-8" +"Nq" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, /obj/structure/cable/pink{ - icon_state = "4-9" + icon_state = "0-2" }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/pink{ - icon_state = "8-10" +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "kilofield" }, -/mob/living/simple_animal/hostile/netherworld/migo{ - environment_smash = 0; - faction = list("neutral"); - melee_damage_lower = 5; - melee_damage_upper = 10; - name = "maurice" +/obj/machinery/door/poddoor{ + id = "kilocargo" }, -/turf/open/floor/plating, -/area/ship/engineering) -"Nq" = ( -/turf/closed/wall/r_wall/yesdiag, +/turf/open/floor/engine/hull/interior, /area/ship/cargo) +"Ny" = ( +/obj/machinery/holopad/secure, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) "NB" = ( -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/power/terminal{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/airlock{ - dir = 4; - name = "Restroom"; - id_tag = "cock_bathroom" - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) +/obj/structure/cable/cyan, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plating, +/area/ship/engineering/engine) "NI" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 14 - }, -/obj/structure/mirror{ - pixel_x = 24 - }, -/obj/structure/toilet{ - pixel_y = 18 - }, -/obj/machinery/light/small/directional/north{ - pixel_x = 11 - }, -/obj/machinery/light_switch{ - pixel_x = -12; - pixel_y = 20 - }, -/obj/item/storage/pill_bottle/happy{ - pixel_x = 12; - pixel_y = 12 - }, -/mob/living/basic/cockroach, -/obj/effect/decal/cleanable/vomit/old{ - pixel_x = -5 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/crew) +/obj/effect/turf_decal/corner/transparent/beige/full, +/obj/effect/turf_decal/corner/transparent/brown/diagonal, +/turf/open/floor/plasteel, +/area/ship/crew/canteen/kitchen) "NT" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 3 +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/ship/bridge) -"NU" = ( -/obj/structure/table/wood, -/obj/structure/cable/pink{ - icon_state = "2-5" +/obj/effect/turf_decal/borderfloorblack{ + dir = 4; + layer = 2.030 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/corner/transparent/green/border{ dir = 4 }, -/obj/item/flashlight/lamp/green{ - pixel_y = 3 - }, -/obj/structure/sign/poster/random{ - pixel_x = -32 +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"NU" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/mono{ + dir = 1 }, -/turf/open/floor/carpet, -/area/ship/crew/dorm) -"Of" = ( -/turf/closed/wall/r_wall, -/area/ship/maintenance/fore) +/area/ship/cargo) "OH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/docking_port/stationary{ + dheight = 1; + dwidth = 20; + height = 30; + name = "Kilo Port Beam Dock"; + width = 40 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/turf/template_noop, +/area/template_noop) +"Pg" = ( +/obj/machinery/computer/cargo/retro{ + dir = 8 }, /obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/cable/pink{ - icon_state = "2-10" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"OQ" = ( -/turf/closed/wall/r_wall/rust, -/area/ship/engineering) -"Pg" = ( -/obj/machinery/computer/helm/retro{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) -"PJ" = ( -/turf/closed/wall/r_wall/rust, -/area/ship/cargo) "PS" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave, -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/brown/diagonal, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, -/area/ship/crew) +/turf/closed/wall/rust, +/area/ship/cargo) "PW" = ( -/turf/closed/wall/r_wall/yesdiag, -/area/ship/crew/dorm) +/turf/closed/wall/yesdiag, +/area/ship/bridge) "Qw" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, -/area/ship/maintenance/fore) -"Rq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/door/poddoor/shutters{ - id = "kilowindows" +/area/ship/cargo) +"Qy" = ( +/obj/machinery/suit_storage_unit/inherit, +/obj/effect/turf_decal/borderfloor{ + dir = 1 }, -/turf/open/floor/plating/airless, -/area/ship/crew/dorm) -"RJ" = ( -/obj/structure/chair/stool{ +/obj/effect/turf_decal/box/corners{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/button/door{ - id = "kilowindows"; - name = "Window Lockdown"; - pixel_x = -6; - pixel_y = 20 - }, -/obj/machinery/button/door{ - id = "kilobridge"; - name = "Bridge Lockdown"; - pixel_x = 6; - pixel_y = 20 - }, -/obj/structure/cable/pink{ - icon_state = "2-8" +/obj/effect/turf_decal/box/corners, +/obj/item/clothing/suit/space/syndicate/generic, +/obj/item/clothing/head/helmet/space/syndicate/generic, +/obj/structure/chair/handrail, +/obj/item/clothing/mask/gas, +/obj/effect/decal/cleanable/dirt, +/obj/item/tank/internals/oxygen/yellow, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) +"RD" = ( +/obj/effect/spawner/bunk_bed{ + dir = 1 }, -/turf/open/floor/plasteel, -/area/ship/bridge) +/obj/machinery/light/small/directional/west, +/turf/open/floor/carpet, +/area/ship/crew) +"Su" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "Sx" = ( +/obj/effect/turf_decal/corner/transparent/beige/full, +/obj/effect/turf_decal/corner/transparent/brown/diagonal, /obj/structure/table/reinforced, -/obj/item/cutting_board{ - anchored = 1 +/obj/item/cutting_board, +/obj/item/melee/knife/kitchen{ + pixel_x = -8; + pixel_y = 9 }, -/obj/item/melee/knife/kitchen, +/obj/item/kitchen/rollingpin{ + pixel_x = -8; + pixel_y = 0 + }, +/turf/open/floor/plasteel, +/area/ship/crew/canteen/kitchen) +"SL" = ( /obj/effect/turf_decal/corner/transparent/beige/full, /obj/effect/turf_decal/corner/transparent/brown/diagonal, +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/machinery/light/dim/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = 0; + pixel_y = -8 + }, /turf/open/floor/plasteel, -/area/ship/crew) +/area/ship/crew/canteen/kitchen) "Ti" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/door/poddoor/shutters{ - id = "kilowindows" - }, -/turf/open/floor/plating/airless, +/turf/closed/wall/r_wall, /area/ship/crew) -"Tn" = ( -/obj/structure/bed{ +"Tm" = ( +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 9 + }, +/obj/effect/turf_decal/industrial/loading{ dir = 4 }, /obj/structure/cable/pink{ - icon_state = "1-6" + icon_state = "1-2" }, -/obj/effect/spawner/random/bedsheet{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/trashcart, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, +/obj/item/pushbroom{ + pixel_x = 5; + pixel_y = -3 }, -/obj/machinery/light/directional/west, -/turf/open/floor/carpet, -/area/ship/crew/dorm) +/obj/item/storage/bag/trash{ + pixel_x = 10; + pixel_y = -4 + }, +/obj/effect/mapping_helpers/crate_shelve, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "To" = ( -/obj/machinery/door/poddoor{ - id = "kilocargo" +/obj/structure/chair/sofa/brown/old/corner, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/confetti, +/obj/machinery/button/door{ + id = "kilodoor"; + name = "Door bolt"; + pixel_x = 21; + pixel_y = 8; + dir = 8; + specialfunctions = 4; + normaldoorcontrol = 1; + req_access_txt = "19"; + req_ship_access = 1 }, -/obj/structure/cable/pink{ - icon_state = "0-6" +/turf/open/floor/carpet, +/area/ship/crew/canteen/kitchen) +"Ty" = ( +/obj/machinery/button/door{ + pixel_x = 22; + pixel_y = 3; + dir = 8; + id = "kilocargo"; + name = "Cargo door control" }, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 4; +/obj/machinery/button/shieldwallgen{ + pixel_x = 21; + pixel_y = 13; + dir = 8; id = "kilofield" }, -/turf/open/floor/plasteel/patterned/ridged, +/turf/open/floor/plasteel/tech/techmaint, /area/ship/cargo) -"Tr" = ( -/turf/closed/wall/rust, -/area/ship/engineering) +"TB" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet, +/area/ship/crew) "TD" = ( -/obj/machinery/light/directional/south, -/obj/structure/table/reinforced, -/obj/item/megaphone/cargo{ - pixel_x = 4; - pixel_y = 5 +/obj/machinery/computer/crew/retro{ + dir = 1 }, -/obj/item/cigbutt{ - pixel_x = -17; - pixel_y = 5 +/obj/effect/turf_decal/industrial/warning{ + dir = 9 }, +/obj/machinery/light/small/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "TG" = ( -/turf/closed/wall, -/area/ship/hallway/port) -"TY" = ( -/turf/closed/wall/r_wall/rust, -/area/ship/bridge) -"Ua" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/door/poddoor/shutters{ - id = "kilowindows" +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, -/turf/open/floor/plating/airless, -/area/ship/engineering) -"Ud" = ( -/turf/closed/wall, +/obj/machinery/door/poddoor{ + id = "kilocargo" + }, +/turf/open/floor/engine/hull/interior, /area/ship/cargo) -"Un" = ( +"Ua" = ( /obj/structure/grille, -/obj/structure/window/reinforced/fulltile, +/obj/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor/shutters{ id = "kilowindows" }, -/turf/open/floor/plating/airless, -/area/ship/hallway/port) -"Uv" = ( -/obj/docking_port/stationary{ - dheight = 1; - dir = 4; - disable_on_owner_ship_dock = 1; - dwidth = 15; - height = 30; - name = "Kilo Forward Bow Dock"; - width = 35 - }, -/turf/template_noop, -/area/template_noop) -"UY" = ( -/obj/structure/chair/sofa/brown/old/right/directional/north, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"Va" = ( -/obj/structure/closet/crate/secure/weapon, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Ud" = ( +/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable/pink{ - icon_state = "6-10" + icon_state = "1-10" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable/pink{ - icon_state = "9-10" + icon_state = "2-10" }, -/obj/effect/decal/cleanable/oil, -/obj/item/storage/box/ammo/a12g_buckshot, -/obj/item/gun/ballistic/shotgun/doublebarrel/empty, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"Vd" = ( -/obj/structure/cable/pink{ - icon_state = "8-10" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, /obj/structure/cable/pink{ - icon_state = "5-10" + icon_state = "9-10" }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ +/turf/open/floor/plating, +/area/ship/cargo) +"Un" = ( +/obj/structure/sign/number/random, +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) +"Uv" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/light/small/directional/east{ - pixel_y = 8 +/obj/machinery/airalarm/directional/east, +/obj/item/paper_bin{ + pixel_x = 6; + pixel_y = 5 }, -/obj/effect/decal/cleanable/oil, -/obj/machinery/button/door{ - dir = 8; - id = "kilothrusters"; - name = "Thruster Lockdown"; - pixel_x = 21 +/obj/item/pen{ + pixel_x = 6; + pixel_y = 7 }, -/turf/open/floor/plating, -/area/ship/engineering) -"Vh" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8; - piping_layer = 2 +/obj/machinery/emergency_panel{ + pixel_x = -10; + pixel_y = 2 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/plating, -/area/ship/engineering) -"Vq" = ( -/turf/closed/wall/r_wall/yesdiag, -/area/ship/crew) -"Vt" = ( -/obj/effect/turf_decal/miskilamo_small{ - dir = 1 +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"UY" = ( +/obj/structure/catwalk/over/plated_catwalk, +/obj/structure/cable/pink{ + icon_state = "2-8" }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"Vx" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/item/cigbutt, -/turf/open/floor/carpet, -/area/ship/crew/dorm) -"VQ" = ( -/obj/effect/turf_decal/miskilamo_small/left{ - dir = 1 +/turf/open/floor/plating, +/area/ship/cargo) +"Vd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 4 }, /turf/open/floor/engine/hull, /area/ship/external/dark) -"We" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/effect/turf_decal/borderfloor{ +"Vh" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax/indie, +/obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/pink, -/obj/effect/turf_decal/box/corners{ +/obj/machinery/light/small/directional/west, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"Vq" = ( +/turf/closed/wall/r_wall/rust, +/area/ship/crew/canteen/kitchen) +"Vs" = ( +/obj/structure/table, +/obj/machinery/power/terminal{ dir = 8 }, -/obj/effect/turf_decal/box/corners, -/obj/item/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/clothing/suit/space/hardsuit/mining/independent, -/obj/item/clothing/mask/breath, -/obj/structure/cable/pink{ - icon_state = "1-5" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"Xd" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -7; +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 5 + }, +/obj/item/clothing/glasses/welding{ + pixel_x = 5; + pixel_y = -9 + }, +/obj/item/storage/toolbox/electrical{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/storage/toolbox/mechanical{ pixel_y = 4 }, -/obj/item/pen/fourcolor, -/obj/machinery/airalarm/directional/south, -/obj/item/radio/intercom/wideband/directional/west, -/obj/item/reagent_containers/food/drinks/coffee{ - pixel_x = 10; +/obj/structure/cable/pink{ + icon_state = "1-2" + }, +/obj/structure/cable/pink, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Vx" = ( +/turf/closed/wall, +/area/ship/crew) +"VQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1; + color = "#543C30" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4; + color = "#543C30" + }, +/turf/open/floor/wood/walnut{ + icon_state = "wood-broken2" + }, +/area/ship/crew) +"Ww" = ( +/obj/machinery/atmospherics/pipe/layer_manifold, +/mob/living/basic/cockroach, +/obj/item/radio/intercom/directional/east{ + pixel_x = 31; pixel_y = 7 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Xd" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 6; + layer = 2.030 + }, +/obj/effect/turf_decal/corner/transparent/green/border{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/office/dark, +/turf/open/floor/plasteel/dark, /area/ship/bridge) -"XQ" = ( -/obj/machinery/cryopod{ - dir = 8 +"XF" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 }, -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/box, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) +"XQ" = ( +/turf/closed/wall/rust, +/area/ship/bridge) "XR" = ( -/turf/closed/wall, -/area/ship/crew) -"Yn" = ( -/turf/closed/wall/r_wall/rust, +/obj/structure/chair/comfy/olive/old/alt/directional{ + dir = 1 + }, +/mob/living/simple_animal/hostile/netherworld/migo{ + environment_smash = 0; + faction = list("neutral"); + melee_damage_lower = 5; + melee_damage_upper = 10; + name = "maurice" + }, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut{ + icon_state = "wood-broken5" + }, /area/ship/crew) "Yu" = ( -/obj/structure/grille, -/obj/structure/window/fulltile, -/obj/structure/curtain/cloth/grey, -/turf/open/floor/plating/airless, -/area/ship/crew) +/turf/closed/wall, +/area/ship/cargo) "YJ" = ( -/obj/structure/dresser{ - dir = 1 - }, -/obj/item/reagent_containers/food/drinks/mead, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/grimy, -/area/ship/crew/dorm) +/turf/open/floor/carpet, +/area/ship/crew) "YL" = ( -/obj/structure/chair/sofa/brown/old/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/pink, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#543C30" + }, +/turf/open/floor/wood/walnut{ + icon_state = "wood-broken4" }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/plasteel/grimy, /area/ship/crew) +"YM" = ( +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) "ZC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/catwalk/over/plated_catwalk, +/obj/structure/cable/pink{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"ZG" = ( -/obj/structure/cable/pink{ - icon_state = "4-9" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/mob/living/basic/cockroach, /turf/open/floor/plating, -/area/ship/engineering) +/area/ship/crew/canteen/kitchen) (1,1,1) = {" aa @@ -2065,11 +2366,11 @@ aa aa AQ ak +ak AQ -bn -bn -bn -Tr +Jf +Jf +ak ak AQ aa @@ -2079,15 +2380,15 @@ aa aa aa aa -OQ -ar -kA -MI -MI -MI -kA -ar +AQ +fu +fu +ck kA +mz +fu +fu +AQ aa aa "} @@ -2095,15 +2396,15 @@ aa aa aa aa -kA +Jf av bQ -AV -cY -ng -gC +ep +FC +nD +Vs oj -Ua +Un aa aa "} @@ -2111,15 +2412,15 @@ aa aa aa aa -kA +AQ eo -fv -LC -Ng -cM +ab +jH +mf +II hh oP -dE +Un aa aa "} @@ -2127,15 +2428,15 @@ aa aa aa aa -kA AQ -gs -aU -Vd -fs -ZG -AP -dE +ck +cv +LC +ix +Ww +bj +NB +Un aa aa "} @@ -2146,12 +2447,12 @@ aa Ua cb yd -cr -AQ -Vh +ck +mz +mz cZ Bm -dE +AP aa aa "} @@ -2162,265 +2463,265 @@ aa Ua aS ca -tb -cq -cq -cq -cq -IJ -aa +mz +cM +Vx +Vx +Vx +Ti +jx aa "} (8,1,1) = {" aa aa -aa -vl -TG +Vd +AQ +ck cC -cq -mz -NU -Tn +ck +iT +cW +ng +RD AE -wh -PW +Ti aa "} (9,1,1) = {" aa aa -aa -Jf +cV +fv jU bU ck -sG +Vx Vx ig -xF YJ -Rq +TB +cr aa "} (10,1,1) = {" aa aa -cK -Un +cq +Ua aJ bV +ck +bM +zA +VQ +sG XR -XR -zH -XR -tW -XR -yF +cr aa "} (11,1,1) = {" aa aa dF -cP +Ua KM bg -XR -yn -EG +ck +MI +Vx hS YL MY Ti -aa +jx "} (12,1,1) = {" aa aa -Vt -Un -iM +im +AB +PS rc Yu -Sx -iT -cw +Vx +Vx +cY +wc wc -UY Ti -aa +Ti "} (13,1,1) = {" aa -aa -VQ -Jf +im +AB +nO aC -bM -XR +UY +cK PS -cW +aU ZC -HP +SL aZ -yF +bn Vq "} (14,1,1) = {" aa -aa -Nq -ac -Ud -bX +qv +pT +Tm +de Ud -XR -XR +ww +nJ +cs rO -tW -NB -XR -Yn +nj +ec +Sx +bA "} (15,1,1) = {" -aa -Nq -ac +OH +TG +NU am -eN +Su bY cB -im +Co dt -sD -xn +oO +xk NI zc -yF +bA "} (16,1,1) = {" aa -To -nJ -da -AB -bZ +Nq +tP +Ty +KB +eN Kz -im -bA -Ew -xk -xk -eK -nO +Yu +gC +be +zH +qa +dc +yF "} (17,1,1) = {" -oI -Co -cV -Ih -Da +aa +im +ac +PS +YM bG -vU -KR -bL -rq -de +Yu +Yu +da +be +To EU -dc -vv +iM +yF "} (18,1,1) = {" aa -cf -La +aa +AB hR -Va +pV by cj -bF -bF +XQ +XQ io -bF +XQ GK XQ -vv +bP "} (19,1,1) = {" aa -Nq -ac +aa +La Mj -ay -bT +IW +nc ci -bF +XQ GM -jK -bF -bF -lw -bP +gk +fs +Da +Vh +vv "} (20,1,1) = {" aa aa -ac -jx -pV -Cv -We -bF -RJ -nd -bH +La +Qy +XF +oY +mr +cw +jK +Ny +lO Xd -bF -bP +Uv +vv "} (21,1,1) = {" aa aa -PJ +ac hN jl -OH -mr -bF +Cv +CO +cw gp NT BP TD bP -Bu +gG "} (22,1,1) = {" aa aa -Of -Of -Of +ac +AB +AB xe -Of +cf bP Ds sW Pg -BS +xy BS aa "} (23,1,1) = {" aa aa -KB +Yu bm -Ce +PS kb cJ -TY -TY +bF +bF BS BS BS @@ -2430,12 +2731,12 @@ aa (24,1,1) = {" aa aa -rW -KB +Yu +Yu Qw qw -qv -Jt +ay +PW aa aa aa @@ -2449,7 +2750,7 @@ aa aa aa aa -Uv +bX aa aa aa From 099b60f554d80f600135b1f25dcebc9e1ec5850c Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 29 Jan 2026 21:35:07 -0600 Subject: [PATCH 15/17] Automatic changelog generation for PR #5764 [ci skip] --- html/changelogs/AutoChangeLog-pr-5764.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5764.yml diff --git a/html/changelogs/AutoChangeLog-pr-5764.yml b/html/changelogs/AutoChangeLog-pr-5764.yml new file mode 100644 index 0000000000..0bca525966 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5764.yml @@ -0,0 +1,4 @@ +author: thearbiber +changes: + - {rscadd: remaps the kilo} +delete-after: true From 554c75becbc54fa3e4edd7dd20ce659f1dbd1cd2 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 31 Jan 2026 01:28:32 +0000 Subject: [PATCH 16/17] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5764.yml | 4 ---- html/changelogs/archive/2026-01.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5764.yml diff --git a/html/changelogs/AutoChangeLog-pr-5764.yml b/html/changelogs/AutoChangeLog-pr-5764.yml deleted file mode 100644 index 0bca525966..0000000000 --- a/html/changelogs/AutoChangeLog-pr-5764.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: thearbiber -changes: - - {rscadd: remaps the kilo} -delete-after: true diff --git a/html/changelogs/archive/2026-01.yml b/html/changelogs/archive/2026-01.yml index 75f4c9c4ab..79a815b870 100644 --- a/html/changelogs/archive/2026-01.yml +++ b/html/changelogs/archive/2026-01.yml @@ -147,3 +147,6 @@ - rscadd: Atira interior expansion generalthrax: - bugfix: Added right cell to Mining Facility +2026-01-31: + thearbiber: + - rscadd: remaps the kilo From 9a4119efd07e05c52a37b10b506dcafd96a271f0 Mon Sep 17 00:00:00 2001 From: Patrick Meade Date: Sat, 31 Jan 2026 21:21:29 -0600 Subject: [PATCH 17/17] Don't run the publish action during pull requests --- .github/workflows/publish_ghcr.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/publish_ghcr.yml b/.github/workflows/publish_ghcr.yml index 561b75e831..9b134c6d5c 100644 --- a/.github/workflows/publish_ghcr.yml +++ b/.github/workflows/publish_ghcr.yml @@ -5,9 +5,6 @@ on: push: branches: - main - pull_request: - branches: - - main jobs: publish: