diff --git a/.github/MC_tab.md b/.github/MC_tab.md new file mode 100644 index 000000000000..01ad1e6aa174 --- /dev/null +++ b/.github/MC_tab.md @@ -0,0 +1,36 @@ +The MC tab hold information on how the game is performing. Here's a crash course on what the most important of those numbers mean. + +If you already know what these numbers mean and you want to see them update faster than the default refresh rate of once every 2 seconds, you can enable the admin pref to make the MC tab refresh every 4 deciseconds. Please don't do this unless you actually need that information at a faster refresh rate since updating every subsystems information is expensive. + +# Main Entries: + + * CPU: What percentage of a tick the game is using before starting the next tick. If this is above 100 it means we are over budget. + + * TickCount: How many ticks should have elapsed since the start of the game if no ticks were ever delayed from starting. + + * TickDrift: How many ticks since the game started that have been delayed. Essentially this is how many ticks the game is running behind. If this is increasing then the game is currently not able to keep up with demand. + + * Internal Tick Usage: You might have heard of this referred to as "maptick". It's how much of the tick that an internal byond function called SendMaps() has taken recently. The higher this is the less time our code has to run. SendMaps() deals with sending players updates of their view of the game world so it has to run every tick but it's expensive so ideally this is optimized as much as possible. You can see a more detailed breakdown of the cost of SendMaps by looking at the profiler in the debug tab -> "Send Maps Profile". + +# Master Controller Entry: + + * TickRate: How many Byond ticks go between each master controller iteration. By default this is 1 meaning the MC runs once every byond tick. But certain configurations can increase this slightly. + + * Iteration: How many times the MC has ran since starting. + + * TickLimit: This SHOULD be what percentage of the tick the MC can use when it starts a run, however currently it just represents how much of the tick the MC can use by the time that SSstatpanels fires. Someone should fix that. + +# Subsystem Entries: + +Subsystems will typically have a base stat entry of the form: +[ ] Name 12ms|28%(2%)|3 + +The brackets hold a letter if the subsystem is in a state other than idle. + +The first numbered entry is the cost of the subsystem, which is a running average of how many milliseconds the subsystem takes to complete a full run. This is increased every time the subsystem resumes an uncompleted run or starts a new run and decays when runs take less time. If this balloons to huge values then it means that the amount of work the subsystem needs to complete in a run is far greater than the amount of time it actually has to execute in whenever it is its turn to fire. + +The second numbered entry is like cost, but in percentage of an ideal tick this subsystem takes to complete a run. They both represent the same data. + +The third entry (2%) is how much time this subsystem spent executing beyond the time it was allocated by the MC. This is bad, it means that this subsystem doesn't yield when it's taking too much time and makes the job of the MC harder. The MC will attempt to account for this but it is better for all subsystems to be able to correctly yield when their turn is done. + +The fourth entry represents how many times this subsystem fires before it completes a run. diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm index 4e47f54d4970..998e43b9085a 100644 --- a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm @@ -230,7 +230,7 @@ /turf/open/floor/plating, /area/ruin/unpowered) "kH" = ( -/obj/item/book/manual/wiki/engineering_construction, +/obj/item/book/manual/wiki/construction, /turf/open/floor/plating/beach/sand{ light_range = 2 }, @@ -453,7 +453,7 @@ /turf/open/floor/plasteel/tech, /area/ruin/unpowered) "sB" = ( -/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering, /turf/open/floor/plating/beach/sand{ light_range = 2 }, @@ -858,7 +858,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "Kl" = ( /obj/effect/radiation, -/obj/item/book/manual/wiki/engineering_singulo_tesla, +/obj/item/book/manual/wiki/engineering, /turf/open/water/beach/deep, /area/overmap_encounter/planetoid/beachplanet/explored) "Ko" = ( diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm index c65fe197ed88..583c196e3dc3 100644 --- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm @@ -3308,7 +3308,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "MY" = ( /obj/structure/table, -/obj/item/book/manual/wiki/barman_recipes, +/obj/item/book/manual/wiki/drinks, /turf/open/floor/wood{ light_range = 2 }, @@ -3321,7 +3321,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "Ni" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/medical_cloning, +/obj/item/book/manual/wiki/medicine, /obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/ruin/beach/oceantown) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm index 4e44e6fb41e0..b514b1c40f9c 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm @@ -617,7 +617,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/item/book/manual/wiki/engineering_singulo_tesla, +/obj/item/book/manual/wiki/engineering, /turf/open/floor/plasteel/icemoon, /area/ruin) "bE" = ( @@ -828,7 +828,7 @@ /turf/open/floor/plasteel/icemoon, /area/ruin) "cc" = ( -/obj/item/book/manual/wiki/atmospherics, +/obj/item/book/manual/wiki/engineering, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm index b63742662227..162934ae538b 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm @@ -1416,7 +1416,6 @@ "ex" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/book/manual/wiki/security_space_law, /obj/effect/turf_decal/corner/opaque/red{ dir = 1 }, diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm index 71b31e40d1fd..007b969e0985 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm @@ -597,7 +597,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/medical_cloning{ +/obj/item/book/manual/wiki/medicine{ pixel_x = 14 }, /obj/structure/fluff/paper/stack{ @@ -1305,7 +1305,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/engineering_guide{ +/obj/item/book/manual/wiki/engineering{ pixel_x = -6; pixel_y = 9 }, @@ -1581,7 +1581,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/plumbing{ +/obj/item/book/manual/wiki/piloting{ pixel_y = 7; pixel_x = 5 }, @@ -2058,7 +2058,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/telescience{ +/obj/item/book/manual/wiki/surgery{ pixel_y = 11; pixel_x = -4 }, @@ -2760,7 +2760,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/robotics_cyborgs{ +/obj/item/book/manual/wiki/robotics{ pixel_x = -5; pixel_y = 4 }, @@ -2929,7 +2929,7 @@ /turf/open/floor/wood, /area/ruin/jungle) "SN" = ( -/obj/item/book/manual/wiki/research_and_development{ +/obj/item/book/manual/wiki/command{ pixel_y = 5; pixel_x = -5 }, @@ -2980,7 +2980,7 @@ /turf/closed/mineral/random/jungle, /area/ruin/jungle) "TE" = ( -/obj/structure/bookcase/manuals/research_and_development, +/obj/structure/bookcase/manuals/chemistry, /turf/open/floor/wood, /area/ruin/jungle) "TH" = ( @@ -3254,7 +3254,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/infections{ +/obj/item/book/manual/wiki/piloting{ pixel_x = 2; pixel_y = 10 }, diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm index c8cd0dfd8964..7f5b18cd2014 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm @@ -544,7 +544,7 @@ /area/overmap_encounter/planetoid/jungle/explored) "dZ" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering, /obj/machinery/light/small/broken/directional/west, /turf/open/floor/wood, /area/ruin/jungle/starport) @@ -1939,7 +1939,7 @@ /area/overmap_encounter/planetoid/jungle/explored) "nI" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/toxins, +/obj/item/book/manual/wiki/chemistry, /obj/machinery/light/small/broken/directional/east, /turf/open/floor/wood{ icon_state = "wood-broken3" @@ -4117,10 +4117,10 @@ /area/overmap_encounter/planetoid/jungle/explored) "Co" = ( /obj/structure/closet, -/obj/item/clothing/under/syndicate/aclfgrunt, -/obj/item/clothing/under/syndicate/aclfgrunt, -/obj/item/clothing/under/syndicate/aclfgrunt, -/obj/item/clothing/under/syndicate/aclfgrunt, +/obj/item/clothing/under/syndicate/ngr, +/obj/item/clothing/under/syndicate/ngr, +/obj/item/clothing/under/syndicate/ngr, +/obj/item/clothing/under/syndicate/ngr, /turf/open/floor/plating{ icon_state = "platingdmg2" }, @@ -5382,7 +5382,7 @@ }, /area/overmap_encounter/planetoid/jungle/explored) "Kx" = ( -/obj/item/clothing/under/syndicate/aclfgrunt, +/obj/item/clothing/under/syndicate/ngr, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -5611,8 +5611,8 @@ /area/overmap_encounter/planetoid/jungle/explored) "LM" = ( /obj/structure/closet, -/obj/item/clothing/suit/gorlex, -/obj/item/clothing/under/syndicate/officer, +/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain, +/obj/item/clothing/under/syndicate/ngr/officer, /obj/item/gun/ballistic/automatic/pistol, /obj/item/ammo_box/magazine/m10mm, /obj/item/ammo_box/magazine/m10mm, @@ -7295,8 +7295,8 @@ "XC" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/vomit/old, -/obj/item/clothing/under/syndicate/officer, -/obj/item/clothing/suit/gorlex, +/obj/item/clothing/under/syndicate/ngr/officer, +/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain, /obj/item/clothing/shoes/combat, /turf/open/floor/mineral/plastitanium, /area/ruin/jungle/starport/tower) diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm index b27656ab1742..4242fcba0327 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm @@ -2331,14 +2331,10 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood/corner, -/obj/item/book/manual/wiki/engineering_guide{ +/obj/item/book/manual/wiki/engineering{ pixel_x = 5; pixel_y = -7 }, -/obj/item/book/manual/wiki/grenades{ - pixel_x = -3; - pixel_y = 1 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/wrapping, /turf/open/floor/wood, @@ -2817,11 +2813,11 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, -/obj/item/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/hacking{ pixel_x = -8; pixel_y = 6 }, -/obj/item/book/manual/wiki/cooking_to_serve_man{ +/obj/item/book/manual/wiki/cooking{ pixel_x = 5; pixel_y = -6 }, @@ -3781,7 +3777,7 @@ color = "#66b266"; dir = 4 }, -/obj/item/book/manual/wiki/experimentor{ +/obj/item/book/manual/wiki/surgery{ pixel_x = 10; pixel_y = -5 }, diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm index cc5902f26a82..5aff7b4501b5 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm @@ -5802,7 +5802,7 @@ /area/overmap_encounter/planetoid/cave/explored) "Lv" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/tcomms{ +/obj/item/book/manual/wiki/construction{ pixel_x = -7; pixel_y = 4 }, @@ -6376,10 +6376,6 @@ /obj/item/radio/intercom/directional/south{ name = "Station Intercom (General)" }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -4; - pixel_y = 4 - }, /turf/open/floor/mineral/plastitanium/red/brig, /area/overmap_encounter/planetoid/cave/explored) "OC" = ( diff --git a/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm b/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm index 1952fa3e16c8..ca1c8dc0794f 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm @@ -219,11 +219,6 @@ /area/overmap_encounter/planetoid/jungle/explored) "wK" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/grenades{ - desc = "Some kind of manual about making hellish grenades and explosives. Completely unreadable, but you feel as though you've gained a level in explosives."; - name = "Pete's Lesson"; - pixel_y = 3 - }, /turf/open/floor/wood{ icon_state = "wood-broken5" }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm index 1bbc1b76a834..1ff358a4dd8b 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm @@ -545,7 +545,7 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/codelab/storage) "gz" = ( -/obj/structure/bookcase/manuals/research_and_development, +/obj/structure/bookcase/manuals/chemistry, /turf/open/floor/plasteel/white, /area/ruin/unpowered/codelab/reception) "gC" = ( diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm index 74e490508f4b..d78e01dbae06 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm @@ -1608,10 +1608,6 @@ /area/ruin/powered) "AY" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 12; - pixel_y = 2 - }, /obj/item/flashlight/lamp{ pixel_y = 4 }, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm b/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm index 8a494f719a2c..3b597c46f4e4 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm @@ -291,7 +291,7 @@ /area/overmap_encounter/planetoid/rockplanet/explored) "hj" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/barman_recipes{ +/obj/item/book/manual/wiki/drinks{ pixel_x = -2; pixel_y = 12 }, diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm index 1cd150e9b8dc..244eef61fa03 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm @@ -1,156 +1,137 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"as" = ( -/obj/machinery/light/directional/north, -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder{ - pixel_x = 6; - pixel_y = 14 +"ab" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-141" }, -/obj/item/reagent_containers/food/snacks/meat/slab/xeno, -/turf/open/floor/plastic, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) +"as" = ( +/obj/machinery/door/airlock/public/glass, +/turf/open/floor/plasteel, +/area/ruin/whitesands/pubbycrash/split) "aR" = ( -/obj/structure/sign/number/one, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/stack/ore/salvage/scrapmetal, -/turf/open/floor/engine, -/area/ruin/whitesands/pubbycrash) -"ba" = ( -/obj/machinery/door/airlock/external/glass, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"by" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/pod, -/area/ruin/whitesands/pubbycrash) -"bS" = ( -/obj/item/t_scanner/adv_mining_scanner/lesser, -/obj/item/kinetic_crusher, -/obj/structure/rack, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/mini, -/obj/effect/turf_decal/siding/brown, -/obj/item/gun/energy/kinetic_accelerator, -/obj/machinery/firealarm/directional/south, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech/techmaint, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"ba" = ( +/obj/structure/salvageable/computer, +/obj/item/stack/ore/salvage/scrapgold, +/turf/open/floor/plasteel/tech, /area/ruin/whitesands/pubbycrash) -"bW" = ( +"by" = ( /obj/effect/turf_decal/box, -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/item/storage/toolbox/electrical{ - pixel_x = 2; - pixel_y = 3 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/railing{ dir = 1 }, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/salvageable/computer, /turf/open/floor/plasteel, /area/ruin/whitesands/pubbycrash) +"bS" = ( +/obj/structure/girder/displaced, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) +"bW" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/light/directional/east, +/obj/effect/gibspawner, +/obj/item/stack/ore/salvage/scrapmetal/five, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/engine_room) "bZ" = ( /turf/open/floor/plating/asteroid/whitesands, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) +"ch" = ( +/turf/closed/wall/mineral/titanium, +/area/ruin/whitesands/pubbycrash/engine_room) "ck" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/button/door{ + id = "pubbywspodsw"; + name = "Pod Door Control"; + pixel_x = -25; dir = 4 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) "co" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/patterned/grid, /area/ruin/whitesands/pubbycrash) "cp" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) "ct" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 +/obj/structure/bed/dogbed{ + anchored = 1; + name = "citrus's bed" }, -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/plasteel/grimy, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 9 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/pod, /area/ruin/whitesands/pubbycrash) "cx" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/stack/ore/salvage/scrapmetal, -/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "cN" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ruin/whitesands/pubbycrash) -"di" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 12 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/ash{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/effect/decal/cleanable/ash{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/ash{ + pixel_x = -6; + pixel_y = 8 + }, +/turf/open/floor/plating{ + icon_state = "panelscorched"; + initial_gas_mix = "ws_atmos" }, +/area/ruin/whitesands/pubbycrash/split) +"di" = ( +/obj/effect/turf_decal/box, +/obj/structure/table/reinforced, /obj/structure/railing, -/obj/machinery/airalarm/directional/east, -/obj/item/stack/sheet/cotton/cloth, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plastic, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel, /area/ruin/whitesands/pubbycrash) "dm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "engine fuel pump" - }, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"dW" = ( -/obj/item/stack/cable_coil/cut/red, -/obj/item/stack/ore/salvage/scrapgold, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) -"ek" = ( /obj/effect/turf_decal/industrial/stand_clear, /obj/effect/turf_decal/industrial/warning, /obj/machinery/button/door{ @@ -164,434 +145,475 @@ /obj/structure/salvageable/server, /turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) -"eq" = ( -/obj/structure/sign/number/one, -/obj/effect/decal/cleanable/vomit/old, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, -/area/ruin/whitesands/pubbycrash) -"ff" = ( -/obj/structure/railing{ - dir = 4 +"dW" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/stairs{ - dir = 1 - }, -/area/ruin/whitesands/pubbycrash) -"fk" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box{ - pixel_y = 2 - }, +/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 + dir = 4 }, -/obj/structure/railing{ +/obj/effect/turf_decal/number/nine{ dir = 4 }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"fA" = ( -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/item/stock_parts/cell/hyper, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"ek" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/item/stack/ore/salvage/scrapmetal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"fO" = ( -/obj/machinery/power/terminal{ +"eq" = ( +/obj/structure/railing{ dir = 8 }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/item/kirbyplants/random, +/obj/structure/railing{ + dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"fR" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/firealarm/directional/west, -/obj/item/stack/ore/salvage/scraptitanium, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, +/area/ruin/whitesands/pubbycrash/split) +"ff" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/ore/salvage/scraptitanium, +/turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) -"fX" = ( -/obj/effect/turf_decal/box/corners{ - dir = 4 +"fk" = ( +/obj/structure/closet/wall/blue{ + dir = 1; + name = "Captain's locker"; + pixel_y = -28 }, -/obj/item/stack/ore/salvage/scrapmetal/five, +/obj/item/clothing/suit/space/hardsuit/mining/heavy, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/ash/large, +/turf/open/floor/plating{ + icon_state = "panelscorched"; + initial_gas_mix = "ws_atmos" + }, +/area/ruin/whitesands/pubbycrash/split) +"fr" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"gg" = ( -/obj/structure/reagent_dispensers/servingdish, +"fA" = ( +/obj/effect/turf_decal/box, /obj/structure/table/reinforced, -/obj/item/kitchen/spoon/plastic{ +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/spawner/lootdrop/maintenance/five, +/obj/effect/spawner/lootdrop/maintenance/five, +/turf/open/floor/plasteel, +/area/ruin/whitesands/pubbycrash) +"fO" = ( +/obj/item/stack/ore/salvage/scrapmetal/five{ + pixel_y = -9; pixel_x = 6 }, -/obj/item/kitchen/spoon/plastic{ - pixel_x = -1 +/turf/open/floor/plating/asteroid/whitesands/lit, +/area/overmap_encounter/planetoid/sand/explored) +"fR" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" }, -/obj/item/kitchen/spoon/plastic{ - pixel_x = 13 +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/machinery/power/port_gen/pacman, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"fX" = ( +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/plastic, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 9 + }, +/obj/effect/decal/cleanable/glass, +/obj/effect/turf_decal/industrial/warning{ + dir = 9 + }, +/obj/structure/salvageable/machine, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/engine_room) +"ge" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/ash{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/effect/decal/cleanable/ash{ + pixel_y = -3; + pixel_x = -6 + }, +/obj/item/gun/energy/laser/hitscanpistol, +/turf/open/floor/plating{ + icon_state = "panelscorched"; + initial_gas_mix = "ws_atmos" + }, +/area/ruin/whitesands/pubbycrash/split) +"gg" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/decal/cleanable/vomit/old, +/obj/item/stack/ore/salvage/scrapmetal, +/obj/effect/mob_spawn/human/corpse/nanotrasenassaultsoldier, +/obj/effect/gibspawner, +/turf/open/floor/plasteel/tech, /area/ruin/whitesands/pubbycrash) "gs" = ( /obj/effect/decal/fakelattice{ icon_state = "lattice-8" }, /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) "gu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/whitesands/pubbycrash) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/engine_room) "gx" = ( /obj/effect/decal/fakelattice{ icon_state = "lattice-5" }, /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) "gy" = ( -/obj/effect/turf_decal/box, -/obj/structure/table/reinforced, -/obj/structure/railing, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel, -/area/ruin/whitesands/pubbycrash) +/obj/machinery/power/apc/auto_name/directional/east{ + start_charge = 0 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/engine_room) "gG" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/chair{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/industrial/warning{ dir = 4 }, -/obj/machinery/door/airlock/engineering{ +/obj/effect/turf_decal/number/seven{ dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) "gL" = ( -/obj/effect/turf_decal/box/corners{ +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/industrial/outline/orange, +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/engine_room) +"hh" = ( +/turf/closed/mineral/random/whitesands, +/area/ruin/whitesands/pubbycrash) +"ho" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, +/obj/structure/railing/corner, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/garbage, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"hz" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/salvageable/safe_server, +/turf/open/floor/plasteel/dark, +/area/ruin/whitesands/pubbycrash) +"ih" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/item/stack/ore/salvage/scraptitanium, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/engine, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"hh" = ( -/obj/machinery/door/airlock/external/glass, +"iw" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/noticeboard{ + pixel_y = 31 + }, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/effect/turf_decal/industrial/warning{ +/obj/structure/railing{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"ho" = ( +"iW" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "engine fuel pump" + }, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"jt" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, -/obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) -"hz" = ( -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 6 + }, +/obj/structure/salvageable/server, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"jA" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-2" + }, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) +"jF" = ( /obj/structure/railing/corner{ dir = 8 }, -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"hA" = ( -/obj/structure/closet/wall/red{ - dir = 4; - name = "Pilots locker"; - pixel_x = -29; - welded = 1 +/obj/structure/railing{ + dir = 4 }, -/obj/item/clothing/under/suit/black, -/obj/item/clothing/under/suit/black, -/obj/item/clothing/suit/jacket, -/obj/item/clothing/suit/jacket, -/obj/item/clothing/head/beret/black, -/obj/item/clothing/head/beret/black, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 1 }, -/obj/item/clothing/under/rank/security/officer/nt, -/obj/item/clothing/under/rank/security/officer/nt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/ruin/whitesands/pubbycrash) -"iw" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/poddoor{ - id = "whiteship_windows" - }, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) -"iW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) -"jt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/engine, -/area/ruin/whitesands/pubbycrash) -"jA" = ( -/obj/item/trash/cheesie{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/turf/open/floor/plasteel/grimy, -/area/ruin/whitesands/pubbycrash) -"jF" = ( -/obj/item/stack/ore/salvage/scraptitanium, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) +/area/ruin/whitesands/pubbycrash/split) "jG" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/ntspaceworks_small/left{ - dir = 4 - }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ - dir = 4; - faction = list("saloon") - }, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4, +/turf/open/floor/engine/hull, +/area/ruin/whitesands/pubbycrash/engine_room) "kp" = ( /obj/structure/girder/displaced, /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) "kA" = ( -/obj/item/reagent_containers/food/drinks/britcup{ - pixel_x = 9; - pixel_y = -3 - }, -/obj/item/trash/pistachios{ - pixel_y = 5 - }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" +/obj/structure/railing/corner, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-23" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/grimy, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) "kM" = ( -/obj/structure/table/reinforced, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/holopad, +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ - icon_state = "0-2" - }, -/obj/item/flashlight/lamp{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 8 + icon_state = "2-8" }, -/obj/item/photo{ - pixel_y = -12 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/item/toy/figure/captain{ - pixel_x = 7; - pixel_y = 12 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, -/obj/machinery/airalarm/directional/west, -/obj/item/stack/ore/salvage/scrapmetal, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/grimy, /area/ruin/whitesands/pubbycrash) "kP" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) +/obj/item/stack/cable_coil/cut/red, +/obj/item/stack/ore/salvage/scrapgold, +/obj/item/stack/ore/salvage/scrapgold, +/obj/item/stack/ore/salvage/scrapmetal/five, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) "kU" = ( /obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + icon_state = "4-8" }, -/turf/open/floor/plasteel/stairs{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-4" }, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "ln" = ( -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset/wall{ + dir = 1; + pixel_y = -28 }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/salvageable/machine, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plasteel/tech/grid, +/area/ruin/whitesands/pubbycrash/engine_room) "ly" = ( -/obj/machinery/door/airlock/hatch, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/showroomfloor, -/area/ruin/whitesands/pubbycrash) -"lA" = ( -/obj/structure/table/reinforced, -/obj/item/laser_pointer, -/obj/item/radio/off{ - pixel_x = 6; - pixel_y = 14 +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 }, +/obj/effect/gibspawner, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"lB" = ( +"lA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/ruin/whitesands/pubbycrash) +"lB" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing{ - dir = 8 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "engine fuel pump" }, -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 +/obj/machinery/light/small/directional/north, +/obj/effect/spawner/lootdrop/maintenance/two, +/obj/item/stack/sheet/mineral/wood/fifty, +/obj/structure/closet/crate, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"lI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/ash, +/turf/open/floor/plating{ + icon_state = "panelscorched"; + initial_gas_mix = "ws_atmos" }, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) +/area/ruin/whitesands/pubbycrash/split) "lK" = ( -/obj/effect/turf_decal/box, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/industrial/warning, -/obj/structure/salvageable/autolathe, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "lR" = ( /obj/effect/decal/fakelattice{ icon_state = "lattice-46" }, /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) "mp" = ( -/obj/effect/decal/fakelattice{ - icon_state = "lattice-3" +/obj/effect/turf_decal/box/corners{ + dir = 4 }, -/turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/obj/item/stack/ore/salvage/scrapmetal/five, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine, +/area/ruin/whitesands/pubbycrash) "mH" = ( -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "mU" = ( +/obj/structure/railing, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/ash{ - pixel_x = 2; - pixel_y = -2 +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/mob_spawn/human/corpse/damaged/whitesands/survivor, +/turf/open/floor/plastic, +/area/ruin/whitesands/pubbycrash/split) +"mW" = ( +/obj/item/stack/ore/salvage/scrapmetal/five{ + pixel_y = -12; + pixel_x = 5 }, -/obj/effect/decal/cleanable/ash{ - pixel_y = -3; - pixel_x = -6 +/obj/effect/decal/fakelattice{ + icon_state = "lattice-4" }, -/obj/item/gun/energy/laser/hitscanpistol, +/turf/open/floor/plating/asteroid/whitesands/lit, +/area/overmap_encounter/planetoid/sand/explored) +"no" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/ash/large, /turf/open/floor/plating{ icon_state = "panelscorched"; initial_gas_mix = "ws_atmos" }, -/area/ruin/whitesands/pubbycrash) -"mW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ruin/whitesands/pubbycrash) +/area/ruin/whitesands/pubbycrash/split) "nq" = ( /obj/effect/decal/fakelattice{ icon_state = "lattice-55" }, /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) "nG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -599,128 +621,113 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/firealarm/directional/south, +/obj/effect/decal/cleanable/wrapping, +/obj/effect/decal/cleanable/plastic, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "nP" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/suit_storage_unit/open, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) "nQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned/grid, /area/ruin/whitesands/pubbycrash) -"oo" = ( +"oj" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/emcloset/wall{ +/obj/effect/decal/cleanable/ash{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/effect/decal/cleanable/ash{ + pixel_y = -2; + pixel_x = 5 + }, +/turf/open/floor/plating{ + icon_state = "panelscorched"; + initial_gas_mix = "ws_atmos" + }, +/area/ruin/whitesands/pubbycrash/split) +"oo" = ( +/obj/structure/closet/wall/white{ dir = 1; - pixel_y = -28 + name = "Medicine storage"; + pixel_y = -30 }, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plasteel/tech/grid, +/obj/item/storage/firstaid/ancient{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/storage/firstaid/medical, +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, +/turf/open/floor/pod, /area/ruin/whitesands/pubbycrash) "oq" = ( +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/obj/item/stack/ore/salvage/scrapmetal, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/dark, +/turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) "oO" = ( -/obj/effect/decal/fakelattice, -/turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) -"oS" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/table/reinforced, +/obj/item/laser_pointer, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 14 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) +"oS" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-55" + }, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) "pe" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/railing{ dir = 8 }, -/obj/structure/catwalk, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/obj/item/stock_parts/cell/hyper{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/stack/ore/salvage/scrapmetal/five{ - pixel_x = -9 - }, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) -"pu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/effect/turf_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/turf_decal/ntspaceworks_small/right{ +/obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/decal/cleanable/vomit/old, -/obj/effect/mob_spawn/human/corpse/nanotrasensoldier, -/obj/item/storage/box/stockparts/basic{ - pixel_x = -3; - pixel_y = 4 +/turf/open/floor/plasteel/tech/grid, +/area/ruin/whitesands/pubbycrash/engine_room) +"pu" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-139" }, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) "pE" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/railing/corner{ dir = 8 }, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, +/obj/structure/railing/corner, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/plasteel/tech, /area/ruin/whitesands/pubbycrash) "pG" = ( -/obj/machinery/firealarm/directional/west, -/turf/closed/mineral/random/whitesands, -/area/overmap_encounter/planetoid/cave/explored) -"pR" = ( /obj/effect/turf_decal/industrial/stand_clear, /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -730,73 +737,75 @@ /obj/structure/salvageable/server, /turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) -"pT" = ( -/obj/effect/turf_decal/box, -/obj/structure/table/reinforced, -/obj/structure/railing{ - dir = 1 +"pR" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, /obj/effect/turf_decal/industrial/warning{ - dir = 1 + dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance/five, -/obj/effect/spawner/lootdrop/maintenance/five, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"qz" = ( -/obj/structure/window/reinforced{ +"pT" = ( +/obj/effect/turf_decal/industrial/caution, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/corner{ dir = 8 }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Engine Access" - }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/catwalk, +/obj/machinery/button/door{ + id = "whiteshipubbyEngines"; + name = "Engine Lockdown Control"; + pixel_x = -25; + dir = 4 }, -/obj/structure/frame/machine, -/obj/item/stack/cable_coil/cut/red, -/obj/item/circuitboard/machine/shuttle/smes, +/obj/structure/salvageable/circuit_imprinter, /turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) +/area/ruin/whitesands/pubbycrash/engine_room) +"qz" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/engine_room) "qN" = ( /obj/effect/decal/fakelattice{ icon_state = "lattice-74" }, /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) "re" = ( -/obj/machinery/shower{ - dir = 1 +/obj/machinery/power/terminal{ + dir = 8 }, -/obj/structure/railing/corner{ - dir = 1 +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) "rT" = ( +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/effect/turf_decal/siding/brown, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/ash/large, -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/whitesands/pubbycrash) +/obj/machinery/suit_storage_unit/open, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/split) "rW" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) +/obj/item/stack/cable_coil/cut/red, +/obj/item/stack/ore/salvage/scrapgold, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) "rZ" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/grimy, +/obj/machinery/door/airlock/hatch, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/showroomfloor, /area/ruin/whitesands/pubbycrash) "sd" = ( /obj/effect/decal/fakelattice{ @@ -809,100 +818,77 @@ }, /obj/effect/decal/cleanable/vomit, /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) "so" = ( -/obj/effect/turf_decal/industrial/caution, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/catwalk, -/obj/structure/sign/poster/retro/nanotrasen_logo_70s{ - pixel_x = -32 - }, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ruin/whitesands/pubbycrash/engine_room) "ss" = ( -/obj/machinery/light/directional/west, +/obj/machinery/door/airlock/glass, /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/ruin/whitesands/pubbycrash) +"sA" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-2" }, -/obj/item/folder/blue{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/folder/white, -/obj/item/pen, -/obj/structure/railing{ - dir = 8 - }, -/obj/item/stamp/captain{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/spacecash/bundle/c1000{ - pixel_x = 2; - pixel_y = -14 - }, -/obj/item/spacecash/bundle/c1000{ - pixel_x = 2; - pixel_y = -14 - }, -/obj/item/spacecash/bundle/c1000{ - pixel_x = 4; - pixel_y = -16 - }, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"sA" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) "sC" = ( /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "sD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/ash, -/obj/effect/decal/cleanable/ash{ - pixel_y = -3; - pixel_x = -6 +/obj/structure/railing/corner{ + dir = 4 }, -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" +/obj/effect/turf_decal/siding/brown{ + dir = 1 }, -/area/ruin/whitesands/pubbycrash) -"sV" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 +/obj/structure/closet/wall{ + icon_door = "orange_wall"; + name = "Mining equipment"; + pixel_y = 28 }, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "0-4" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/auto_name/directional/west{ + start_charge = 0 }, -/obj/structure/railing, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/split) +"sV" = ( +/obj/structure/frame/machine, +/obj/item/circuitboard/machine/shuttle/engine/plasma, +/obj/item/stack/cable_coil/cut/red, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"tB" = ( +/obj/structure/sign/number/one, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, +/obj/item/stack/ore/salvage/scrapmetal, +/turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) "uh" = ( /obj/effect/decal/cleanable/dirt, @@ -912,329 +898,320 @@ }, /area/ruin/whitesands/pubbycrash) "ul" = ( -/mob/living/simple_animal/hostile/asteroid/whitesands/ranged, -/turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash) "up" = ( -/obj/effect/turf_decal/box/corners{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/stack/ore/salvage/scrapmetal, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, -/area/ruin/whitesands/pubbycrash) +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) "uB" = ( +/obj/effect/turf_decal/siding/brown, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 5 + }, +/obj/effect/turf_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/ash, -/obj/effect/decal/cleanable/ash{ - pixel_x = -6; - pixel_y = 8 +/obj/machinery/suit_storage_unit/open, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/split) +"vc" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 }, -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" +/obj/effect/turf_decal/industrial/warning{ + dir = 10 }, -/area/ruin/whitesands/pubbycrash) -"vc" = ( -/obj/effect/turf_decal/box/corners, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/ore/salvage/scraptitanium, -/turf/open/floor/engine, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/engine_room) "vw" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 +/obj/effect/turf_decal/box/corners{ + dir = 4 }, -/obj/effect/gibspawner, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"vL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/decal/cleanable/dirt, -/obj/item/stack/ore/salvage/scraptitanium, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) -"vO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/ash{ - pixel_x = 6; - pixel_y = 8 +"vL" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + dir = 4; + id = "whiteship_windows" }, -/obj/effect/decal/cleanable/ash{ - pixel_x = -2; - pixel_y = 3 +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"vO" = ( +/obj/structure/railing{ + dir = 1 }, -/obj/effect/decal/cleanable/ash{ - pixel_x = -6; - pixel_y = 8 +/obj/effect/turf_decal/siding/brown{ + dir = 1 }, -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" +/obj/structure/cable{ + icon_state = "4-8" }, -/area/ruin/whitesands/pubbycrash) -"vX" = ( -/obj/item/radio/intercom/directional/west, -/obj/structure/chair/office/light{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/grimy, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/split) +"vX" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ruin/whitesands/pubbycrash) "wn" = ( -/obj/effect/turf_decal/siding/brown, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 5 +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/effect/turf_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, +/obj/effect/spawner/lootdrop/maintenance/two, /obj/effect/decal/cleanable/dirt, -/obj/machinery/suit_storage_unit/open, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "wL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/wall/red{ - dir = 8; - name = "Firearm Locker"; - pixel_x = 29; - welded = 1 - }, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/obj/item/gun/ballistic/automatic/pistol/commander, -/obj/item/gun/ballistic/automatic/pistol/commander, -/obj/item/ammo_box/magazine/co9mm, -/obj/item/ammo_box/magazine/co9mm, -/obj/item/ammo_box/magazine/co9mm, -/obj/item/ammo_box/magazine/co9mm, +/obj/effect/decal/cleanable/vomit/old, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "wV" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/structure/catwalk, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" }, /turf/open/floor/plating, /area/ruin/whitesands/pubbycrash) "xa" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 - }, -/obj/effect/decal/cleanable/glass, -/obj/effect/turf_decal/industrial/warning{ - dir = 9 + dir = 4 }, -/obj/structure/salvageable/machine, -/turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/gibspawner, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) "xc" = ( /mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ dir = 4 }, /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) "xy" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/door/airlock/grunge{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"xA" = ( -/obj/effect/turf_decal/industrial/warning/corner{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/salvageable/computer, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"yj" = ( +"xz" = ( +/obj/effect/turf_decal/box, /obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/noticeboard{ - pixel_y = 31 +/obj/item/storage/toolbox/mechanical{ + pixel_x = 2; + pixel_y = -2 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/obj/item/storage/toolbox/mechanical{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/storage/toolbox/electrical{ + pixel_x = 2; + pixel_y = 3 }, /obj/structure/railing{ - dir = 4 + dir = 1 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/ruin/whitesands/pubbycrash) +"xA" = ( +/turf/open/floor/plating{ + icon_state = "panelscorched"; + initial_gas_mix = "ws_atmos" + }, +/area/ruin/whitesands/pubbycrash) +"xH" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/industrial/warning/corner, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"xX" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ruin/whitesands/pubbycrash/engine_room) +"yj" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/railing, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) "ym" = ( -/obj/effect/gibspawner, -/turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/obj/item/stack/ore/salvage/scraptitanium, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) "yt" = ( /obj/effect/decal/fakelattice{ icon_state = "lattice-141" }, /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) "yx" = ( -/obj/structure/railing/corner, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ - dir = 4; - faction = list("adobe"); - desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body, twisted by the heavy metals and high background radiation of the sandworlds. Their helmet also seems to be filled with vomit" - }, -/obj/effect/decal/cleanable/vomit, -/turf/open/floor/plasteel, -/area/ruin/whitesands/pubbycrash) +/obj/effect/decal/fakelattice, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) "yK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/grunge{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/patterned/grid, /area/ruin/whitesands/pubbycrash) "yU" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 +/obj/effect/decal/fakelattice{ + icon_state = "lattice-46" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/gibspawner, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) "zi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/box, +/obj/structure/table/reinforced, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/multitool, +/obj/structure/railing, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel, /area/ruin/whitesands/pubbycrash) "zP" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) -"zX" = ( -/obj/structure/railing/corner{ - dir = 1 +/obj/effect/decal/cleanable/oil{ + icon_state = "floor6" }, /obj/effect/turf_decal/industrial/warning/corner{ dir = 1 }, -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/obj/structure/reagent_dispensers/servingdish, -/obj/item/kitchen/spoon/plastic{ - pixel_x = -1 +/obj/effect/turf_decal/ntspaceworks_small{ + dir = 4 }, -/obj/item/kitchen/spoon/plastic{ - pixel_x = 13 +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"zX" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, -/obj/item/kitchen/spoon/plastic{ - pixel_x = 6 +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/directional/west, +/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ + dir = 1; + faction = list("saloon") }, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) +"Ai" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ruin/whitesands/pubbycrash/engine_room) "Ak" = ( -/obj/structure/closet/crate/bin, +/obj/item/reagent_containers/food/drinks/britcup{ + pixel_x = 9; + pixel_y = -3 + }, /obj/item/trash/pistachios{ pixel_y = 5 }, -/obj/item/trash/energybar, -/obj/item/trash/cheesie, -/obj/item/trash/can/food, -/obj/item/trash/sosjerky{ - pixel_x = 5 +/obj/structure/table/reinforced{ + color = "#c1b6a5" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/grimy, /area/ruin/whitesands/pubbycrash) -"AH" = ( +"AA" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ruin/whitesands/pubbycrash/split) +"AD" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/oil{ - icon_state = "floor6" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel/stairs{ + dir = 8 }, -/turf/open/floor/plasteel/tech, /area/ruin/whitesands/pubbycrash) +"AH" = ( +/obj/structure/frame/machine, +/obj/item/stack/cable_coil/cut/red, +/obj/item/stack/ore/salvage/scrapgold, +/obj/item/stack/ore/salvage/scrapgold, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) "AJ" = ( -/turf/closed/wall/mineral/titanium, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) "AO" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/industrial/warning, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"Bd" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"Bz" = ( +"Bd" = ( /obj/effect/turf_decal/box/corners{ dir = 8 }, @@ -1242,21 +1219,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) -"BD" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/salvageable/machine, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"BH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 - }, -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"Cg" = ( +"Bi" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical{ pixel_x = -2; @@ -1274,220 +1237,270 @@ }, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"Cs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +"Bw" = ( +/turf/closed/mineral/random/whitesands, +/area/ruin/whitesands/pubbycrash/engine_room) +"Bz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "1-8" }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"BD" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-9" + }, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) +"BH" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) -"Ct" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/catwalk, /obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 + dir = 8 }, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ - faction = list("saloon") +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"Cg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/airlock/highsecurity, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"Cw" = ( -/obj/item/stack/ore/salvage/scraptitanium, -/turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) -"Dg" = ( +"Cs" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/turf_decal/ntspaceworks_small/right{ + dir = 4 + }, +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/mob_spawn/human/corpse/nanotrasensoldier, +/obj/item/storage/box/stockparts/basic{ + pixel_x = -3; + pixel_y = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"Ct" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, -/obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) -"Di" = ( -/obj/structure/railing/corner, -/turf/closed/mineral/random/whitesands, -/area/overmap_encounter/planetoid/cave/explored) -"Dn" = ( -/obj/structure/railing, -/obj/structure/salvageable/computer{ +/area/ruin/whitesands/pubbycrash/engine_room) +"Cw" = ( +/obj/item/stack/ore/salvage/scraptitanium, +/turf/open/floor/plating/asteroid/whitesands/lit, +/area/overmap_encounter/planetoid/sand/explored) +"Dg" = ( +/obj/effect/turf_decal/industrial/warning/corner{ dir = 8 }, -/obj/item/stack/ore/salvage/scrapgold, +/obj/structure/salvageable/computer, /turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"Di" = ( +/obj/structure/sign/number/one, +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine, +/area/ruin/whitesands/pubbycrash) +"Dn" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/structure/salvageable/machine, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "Dx" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/poddoor{ - id = "whiteship_windows" +/obj/effect/decal/fakelattice{ + icon_state = "lattice-141" }, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plating/asteroid/whitesands, +/area/overmap_encounter/planetoid/cave/explored) "DB" = ( -/obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/structure/salvageable/machine, -/turf/open/floor/plastic, -/area/ruin/whitesands/pubbycrash) -"DQ" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/item/stack/ore/salvage/scraptitanium, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"DY" = ( -/obj/structure/cable{ - icon_state = "0-4" +/obj/effect/decal/cleanable/ash, +/obj/effect/decal/cleanable/ash{ + pixel_x = -6; + pixel_y = 8 }, +/turf/open/floor/plating{ + icon_state = "panelscorched"; + initial_gas_mix = "ws_atmos" + }, +/area/ruin/whitesands/pubbycrash/split) +"DQ" = ( /obj/structure/cable{ - icon_state = "0-2" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 6 +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/engine_room) +"DY" = ( +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/structure/salvageable/machine, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Engine Access" + }, +/obj/structure/frame/machine, +/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/stack/cable_coil/cut/red, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) "Ea" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel/patterned/grid, /area/ruin/whitesands/pubbycrash) "Eb" = ( -/obj/structure/frame/machine, -/obj/item/circuitboard/machine/shuttle/engine/plasma, -/obj/item/stack/cable_coil/cut/red, -/turf/open/floor/plating, +/obj/item/trash/cheesie{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/turf/open/floor/plasteel/grimy, /area/ruin/whitesands/pubbycrash) "Eh" = ( -/obj/machinery/door/airlock/public/glass, -/turf/open/floor/plasteel, -/area/ruin/whitesands/pubbycrash) -"Em" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/ash{ pixel_x = 3; pixel_y = -3 }, -/obj/item/lighter/enigma, +/obj/item/lighter, /turf/open/floor/plating{ icon_state = "panelscorched"; initial_gas_mix = "ws_atmos" }, -/area/ruin/whitesands/pubbycrash) -"Et" = ( -/obj/effect/decal/cleanable/oil{ - icon_state = "floor6" +/area/overmap_encounter/planetoid/sand/explored) +"Em" = ( +/obj/machinery/light/directional/north, +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + pixel_x = 6; + pixel_y = 14 }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 1 +/obj/item/reagent_containers/food/snacks/meat/slab/xeno, +/turf/open/floor/plastic, +/area/ruin/whitesands/pubbycrash/split) +"Et" = ( +/obj/item/stack/ore/salvage/scraptitanium{ + pixel_x = -3; + pixel_y = -10 }, -/obj/effect/turf_decal/ntspaceworks_small{ - dir = 4 +/obj/effect/decal/fakelattice{ + icon_state = "lattice-21" }, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) "Ew" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 10 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) "EG" = ( /obj/machinery/door/airlock/hatch{ welded = 1 }, /turf/template_noop, -/area/ruin/whitesands/pubbycrash) +/area/ruin/whitesands/pubbycrash/split) "ET" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/directional/west, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ - dir = 1; - faction = list("saloon") +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"Fc" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/number/four{ + dir = 4 }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Engine Access" +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"Fc" = ( +/obj/item/stack/ore/salvage/scraptitanium{ + pixel_x = 8 }, -/obj/structure/frame/machine, -/obj/item/circuitboard/machine/shuttle/heater, -/obj/item/stack/cable_coil/cut/red, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plating/asteroid/whitesands/lit, +/area/overmap_encounter/planetoid/sand/explored) "Fn" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/chair/office/light{ dir = 4 }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/grimy, +/area/ruin/whitesands/pubbycrash) +"Fo" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/stairs{ - dir = 4 +/obj/effect/decal/cleanable/ash, +/obj/effect/decal/cleanable/ash{ + pixel_y = -3; + pixel_x = -6 }, -/area/ruin/whitesands/pubbycrash) -"Fq" = ( /turf/open/floor/plating{ - icon_state = "platingdmg1"; + icon_state = "panelscorched"; initial_gas_mix = "ws_atmos" }, -/area/ruin/whitesands/pubbycrash) -"FP" = ( -/obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/salvageable/machine, -/turf/open/floor/plasteel, -/area/ruin/whitesands/pubbycrash) -"FY" = ( +/area/ruin/whitesands/pubbycrash/split) +"Fq" = ( /obj/structure/railing/corner{ dir = 8 }, @@ -1501,158 +1514,179 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/structure/salvageable/machine, +/obj/structure/salvageable/server, +/turf/open/floor/plasteel/dark, +/area/ruin/whitesands/pubbycrash) +"FP" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/structure/railing{ + dir = 10; + layer = 4.1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/item/stack/ore/salvage/scrapgold, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash) +"FY" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/industrial/warning, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "Ga" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "Gi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/airlock/highsecurity, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "Gl" = ( /turf/template_noop, /area/template_noop) -"GA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/closed/wall/mineral/titanium/nodiagonal, +"Gp" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mob_spawn/human/corpse/nanotrasensoldier, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"GF" = ( -/obj/structure/window/reinforced{ +"GA" = ( +/obj/structure/railing, +/obj/structure/salvageable/computer{ dir = 8 }, -/obj/machinery/door/window/northright{ - dir = 4; - name = "Engine Access" - }, -/obj/structure/frame/machine, -/obj/item/circuitboard/machine/shuttle/heater, -/obj/item/stack/cable_coil/cut/red, -/obj/item/stack/ore/salvage/scrapplasma/five, -/turf/open/floor/plating, +/obj/item/stack/ore/salvage/scrapgold, +/turf/open/floor/plasteel/tech, /area/ruin/whitesands/pubbycrash) -"GK" = ( -/obj/structure/closet/wall/blue{ - dir = 1; - name = "Captain's locker"; - pixel_y = -28 - }, -/obj/item/clothing/suit/space/hardsuit/mining/heavy, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +"GF" = ( +/obj/machinery/newscaster/directional/west, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/ash/large, /turf/open/floor/plating{ icon_state = "panelscorched"; initial_gas_mix = "ws_atmos" }, -/area/ruin/whitesands/pubbycrash) +/area/ruin/whitesands/pubbycrash/split) +"GK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plastic, +/area/ruin/whitesands/pubbycrash/split) "Ha" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ruin/whitesands/pubbycrash/engine_room) "Hb" = ( -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 + dir = 8 }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/salvageable/machine, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"Ho" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/binary/dp_vent_pump{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/light/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /obj/effect/gibspawner, -/obj/item/stack/ore/salvage/scrapmetal/five, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech/grid, +/area/ruin/whitesands/pubbycrash/engine_room) +"Ho" = ( +/obj/effect/turf_decal/box/corners, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/ore/salvage/scraptitanium, +/turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) "Hq" = ( -/obj/item/stack/cable_coil/cut/red, -/obj/item/stack/ore/salvage/scrapgold, -/obj/item/stack/ore/salvage/scrapgold, -/obj/item/stack/ore/salvage/scrapmetal/five, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/office/light{ + dir = 8 + }, +/turf/open/floor/plasteel/grimy, /area/ruin/whitesands/pubbycrash) "HQ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 +/obj/item/stack/ore/salvage/scrapmetal/five{ + pixel_y = -12; + pixel_x = 4 }, -/obj/structure/railing/corner, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/garbage, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) "If" = ( -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" +/obj/structure/railing{ + dir = 8 }, -/area/ruin/whitesands/pubbycrash) -"Ig" = ( +/obj/effect/turf_decal/industrial/outline/yellow, /obj/effect/turf_decal/industrial/warning{ - dir = 10 + dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/salvageable/machine, +/obj/machinery/suit_storage_unit/open, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"Ik" = ( +"Ig" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = 12 + }, +/obj/structure/railing, +/obj/machinery/airalarm/directional/east, +/obj/item/stack/sheet/cotton/cloth, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plastic, +/area/ruin/whitesands/pubbycrash/split) +"Ik" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box{ + pixel_y = 2 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "In" = ( -/obj/structure/railing, -/turf/closed/mineral/random/whitesands, -/area/overmap_encounter/planetoid/cave/explored) +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash) "IC" = ( /obj/item/stack/ore/salvage/scrapmetal/five, /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) "IQ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/spline/fancy/opaque/black, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"Ji" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ruin/whitesands/pubbycrash) -"Jz" = ( -/obj/item/stack/ore/salvage/scrapmetal/five, -/obj/item/stack/ore/salvage/scraptitanium, -/turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) -"JI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/spline/fancy/opaque/black, @@ -1661,7 +1695,20 @@ }, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"Kt" = ( +"IR" = ( +/obj/machinery/camera/autoname{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/plasteel/grimy, +/area/ruin/whitesands/pubbycrash) +"IU" = ( /obj/machinery/door/airlock/external/glass, /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -1673,454 +1720,524 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"Ky" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 +"Ji" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/chair/office/light{ + dir = 8 }, -/turf/open/floor/plasteel/tech/grid, -/area/ruin/whitesands/pubbycrash) -"KB" = ( -/obj/structure/salvageable/computer, -/obj/item/stack/ore/salvage/scrapgold, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/grimy, /area/ruin/whitesands/pubbycrash) -"KI" = ( +"Jz" = ( +/obj/item/stack/ore/salvage/scrapmetal/five, +/obj/item/stack/ore/salvage/scraptitanium, +/turf/open/floor/plating/asteroid/whitesands/lit, +/area/overmap_encounter/planetoid/sand/explored) +"JI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/decal/cleanable/plasma, -/obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"KO" = ( -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 10 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "0-2" +/obj/structure/railing{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) -"KS" = ( -/obj/effect/turf_decal/box, -/obj/structure/table/reinforced, -/obj/item/storage/belt/utility, -/obj/item/storage/belt/utility, -/obj/item/multitool, -/obj/structure/railing, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel, +/obj/structure/catwalk, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/obj/structure/salvageable/protolathe, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"Kt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ + faction = list("saloon") + }, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"KT" = ( +"Ky" = ( +/turf/closed/wall/mineral/titanium, +/area/ruin/whitesands/pubbycrash/split) +"KB" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/chair/office/light{ +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/effect/decal/cleanable/vomit/old, /turf/open/floor/plasteel/grimy, /area/ruin/whitesands/pubbycrash) -"Lj" = ( -/obj/machinery/door/airlock/glass, -/obj/structure/cable{ - icon_state = "1-2" +"KI" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"Lm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +"KO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/ntspaceworks_small/left{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ + dir = 4; + faction = list("saloon") }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"KS" = ( +/obj/effect/turf_decal/industrial/caution, +/obj/structure/railing/corner{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-4" +/obj/structure/railing/corner{ + dir = 1 }, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/whitesands/pubbycrash) -"Ls" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/turf_decal/siding/brown, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/suit_storage_unit/open, -/turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) -"LM" = ( -/turf/closed/mineral/random/whitesands, -/area/ruin/whitesands/pubbycrash) -"LU" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/structure/catwalk, +/obj/structure/sign/poster/retro/nanotrasen_logo_70s{ + pixel_x = -32 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"KT" = ( +/obj/structure/railing, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-12" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) +"Li" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 }, -/obj/effect/turf_decal/number/nine{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/wall/red{ + dir = 8; + name = "Firearm Locker"; + pixel_x = 29; + welded = 1 }, -/obj/item/stock_parts/cell/hyper, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"LW" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/poddoor{ - dir = 4; - id = "whiteship_windows" +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 }, -/turf/open/floor/plating, +/obj/item/gun/ballistic/automatic/pistol/commander, +/obj/item/gun/ballistic/automatic/pistol/commander, +/obj/item/ammo_box/magazine/co9mm, +/obj/item/ammo_box/magazine/co9mm, +/obj/item/ammo_box/magazine/co9mm, +/obj/item/ammo_box/magazine/co9mm, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"Mi" = ( -/obj/structure/sign/number/two, +"Lj" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/item/stack/ore/salvage/scraptitanium, -/obj/effect/gibspawner, -/turf/open/floor/engine, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/pod, /area/ruin/whitesands/pubbycrash) -"Ml" = ( -/obj/structure/window/reinforced{ +"Lm" = ( +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/railing{ dir = 8 }, -/obj/machinery/door/window/northright{ - dir = 4; - name = "Engine Access" +/obj/structure/catwalk, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/obj/item/stock_parts/cell/hyper{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/stack/ore/salvage/scrapmetal/five{ + pixel_x = -9 }, -/obj/structure/frame/machine, -/obj/item/stack/cable_coil/cut/red, -/obj/item/circuitboard/machine/shuttle/smes, /turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"Ls" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg1"; + initial_gas_mix = "ws_atmos" + }, /area/ruin/whitesands/pubbycrash) -"Mr" = ( +"LM" = ( +/obj/item/stack/ore/salvage/scrapmetal/five, +/obj/item/stack/ore/salvage/scraptitanium, +/obj/effect/decal/fakelattice{ + icon_state = "lattice-4" + }, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) +"LU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/salvageable/computer{ dir = 8 }, /turf/open/floor/plasteel/tech, /area/ruin/whitesands/pubbycrash) -"NI" = ( -/obj/machinery/holopad, -/obj/effect/decal/cleanable/dirt/dust, +"LW" = ( /obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/oil{ + icon_state = "floor6" }, -/turf/open/floor/plasteel/grimy, -/area/ruin/whitesands/pubbycrash) -"Og" = ( +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"Mi" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-8" }, -/obj/structure/table/reinforced, -/obj/machinery/recharger, /obj/structure/railing{ - dir = 10; - layer = 4.1 + dir = 1 }, -/obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/item/stack/ore/salvage/scrapgold, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"Oz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/ash{ - pixel_x = 2; - pixel_y = -2 +/turf/open/floor/plasteel/stairs{ + dir = 4 }, -/obj/effect/decal/cleanable/ash{ - pixel_y = -2; - pixel_x = 5 +/area/ruin/whitesands/pubbycrash/engine_room) +"Ml" = ( +/obj/structure/sign/poster/official/random{ + pixel_x = 32 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/ash/large, /turf/open/floor/plating{ icon_state = "panelscorched"; initial_gas_mix = "ws_atmos" }, -/area/ruin/whitesands/pubbycrash) -"Pr" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/industrial/warning/corner, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"Pu" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) -"PA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/area/ruin/whitesands/pubbycrash/split) +"Mr" = ( +/obj/structure/closet/crate/bin, +/obj/item/trash/pistachios{ + pixel_y = 5 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/item/trash/energybar, +/obj/item/trash/cheesie, +/obj/item/trash/can/food, +/obj/item/trash/sosjerky{ + pixel_x = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/whitesands/pubbycrash) +"NI" = ( +/obj/structure/railing{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/whitesands/pubbycrash) -"PI" = ( /obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/railing{ - dir = 1 + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/stairs{ - dir = 4 - }, -/area/ruin/whitesands/pubbycrash) -"PK" = ( -/obj/effect/gibspawner, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) -"PY" = ( -/obj/effect/decal/cleanable/generic, -/obj/structure/chair/office/light{ - dir = 8 + dir = 1 }, -/turf/open/floor/plasteel/grimy, /area/ruin/whitesands/pubbycrash) -"PZ" = ( +"Og" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "engine fuel pump" +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/light/small/directional/north, -/obj/effect/spawner/lootdrop/maintenance/two, -/obj/item/stack/sheet/mineral/wood/fifty, -/obj/structure/closet/crate, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"Qb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/decal/cleanable/vomit/old, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/vomit/old, -/obj/item/stack/ore/salvage/scrapmetal, -/obj/effect/mob_spawn/human/corpse/nanotrasenassaultsoldier, -/obj/effect/gibspawner, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"Qo" = ( -/obj/effect/decal/fakelattice{ - icon_state = "lattice-9" - }, -/turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) -"Qu" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 +/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ + dir = 1; + faction = list("saloon") }, +/obj/effect/mob_spawn/human/corpse/nanotrasensoldier, +/turf/open/floor/plasteel/dark, +/area/ruin/whitesands/pubbycrash) +"Oz" = ( +/obj/structure/table/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/structure/salvageable/machine, +/turf/open/floor/plastic, +/area/ruin/whitesands/pubbycrash/split) +"ON" = ( +/obj/structure/railing/corner, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + icon_state = "1-2" }, -/obj/structure/railing, -/obj/structure/railing{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 1 }, -/turf/open/floor/plasteel/stairs{ - dir = 4 +/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ + dir = 4; + faction = list("adobe"); + desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body, twisted by the heavy metals and high background radiation of the sandworlds. Their helmet also seems to be filled with vomit" }, -/area/ruin/whitesands/pubbycrash) -"Qw" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/plasteel, +/area/ruin/whitesands/pubbycrash/split) +"Pr" = ( +/obj/structure/closet/wall/red{ + dir = 4; + name = "Pilots locker"; + pixel_x = -29; + welded = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/item/clothing/under/suit/black, +/obj/item/clothing/under/suit/black, +/obj/item/clothing/suit/jacket, +/obj/item/clothing/suit/jacket, +/obj/item/clothing/head/beret/black, +/obj/item/clothing/head/beret/black, +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 1 + }, +/obj/item/clothing/under/rank/security/officer/nt, +/obj/item/clothing/under/rank/security/officer/nt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/whitesands/pubbycrash/split) +"Pu" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, -/obj/structure/chair{ - dir = 1 +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) +"PA" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" }, -/obj/effect/turf_decal/industrial/warning{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/number/seven{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"QD" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/whitesands/pubbycrash) -"QI" = ( -/obj/machinery/power/terminal{ +/area/ruin/whitesands/pubbycrash/engine_room) +"PI" = ( +/obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/door/window/northright{ + dir = 4; + name = "Engine Access" }, -/obj/machinery/portable_atmospherics/canister/toxins, -/turf/open/floor/plasteel/tech, +/obj/structure/frame/machine, +/obj/item/stack/cable_coil/cut/red, +/obj/item/circuitboard/machine/shuttle/smes, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"PK" = ( +/obj/effect/turf_decal/box, +/obj/structure/railing, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/industrial/warning, +/obj/structure/salvageable/autolathe, +/turf/open/floor/plasteel, /area/ruin/whitesands/pubbycrash) -"QR" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/camera/autoname{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plasteel/grimy, +"PY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"RC" = ( -/obj/structure/railing{ - dir = 8 +"PZ" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-21" }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/turf_decal/industrial/warning{ +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) +"Qb" = ( +/obj/effect/gibspawner, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) +"Qo" = ( +/mob/living/simple_animal/hostile/asteroid/whitesands/ranged, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) +"Qu" = ( +/obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/suit_storage_unit/open, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"RL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/window/northright{ + dir = 4; + name = "Engine Access" + }, +/obj/structure/frame/machine, +/obj/item/circuitboard/machine/shuttle/heater, +/obj/item/stack/cable_coil/cut/red, +/obj/item/stack/ore/salvage/scrapplasma/five, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"Qw" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/turf/open/floor/plasteel/tech/grid, +/area/ruin/whitesands/pubbycrash/engine_room) +"QD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/airlock/engineering{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/wrapping, -/obj/effect/decal/cleanable/plastic, /turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"RT" = ( -/turf/closed/mineral/random/whitesands, +/area/ruin/whitesands/pubbycrash/engine_room) +"QI" = ( +/obj/item/stack/ore/salvage/scraptitanium{ + pixel_y = 8; + pixel_x = 6 + }, +/turf/open/floor/plating/asteroid/whitesands/dried, /area/overmap_encounter/planetoid/cave/explored) -"Sy" = ( +"QR" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/industrial/outline/grey, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/engine_room) +"RC" = ( /obj/effect/spawner/lootdrop/maintenance/two, /obj/item/stack/ore/salvage/scraptitanium, /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) -"SO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/gibspawner, -/turf/open/floor/plasteel/tech/grid, -/area/ruin/whitesands/pubbycrash) -"SU" = ( +"RL" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/turf/open/floor/plasteel/patterned/grid, /area/ruin/whitesands/pubbycrash) -"Tg" = ( -/obj/structure/railing, +"RT" = ( +/turf/closed/mineral/random/whitesands, +/area/overmap_encounter/planetoid/cave/explored) +"Sy" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/vomit/old, -/obj/effect/mob_spawn/human/corpse/damaged/whitesands/survivor, -/turf/open/floor/plastic, -/area/ruin/whitesands/pubbycrash) -"TB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plasteel/stairs{ dir = 4 }, +/area/ruin/whitesands/pubbycrash/engine_room) +"SO" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"SU" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-4" + }, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) +"Tg" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Engine Access" + }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-8" + }, +/obj/structure/frame/machine, +/obj/item/stack/cable_coil/cut/red, +/obj/item/circuitboard/machine/shuttle/smes, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"TB" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/patterned/grid, /area/ruin/whitesands/pubbycrash) "TF" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/ash/large, -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" +/turf/open/floor/plasteel/stairs{ + dir = 4 }, -/area/ruin/whitesands/pubbycrash) +/area/ruin/whitesands/pubbycrash/split) "Uo" = ( /obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/decal/cleanable/vomit/old, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mob_spawn/human/corpse/nanotrasensoldier, -/turf/open/floor/plasteel/dark, -/area/ruin/whitesands/pubbycrash) -"Us" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/decal/cleanable/vomit/old, -/mob/living/simple_animal/hostile/asteroid/whitesands/survivor{ - dir = 1; - faction = list("saloon") + icon_state = "0-4" }, -/obj/effect/mob_spawn/human/corpse/nanotrasensoldier, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) -"Uy" = ( +"Us" = ( /obj/machinery/door/airlock/hatch{ welded = 1 }, @@ -2135,217 +2252,258 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/pod, /area/ruin/whitesands/pubbycrash) +"Uy" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/plasma, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/whitesands/pubbycrash) "Vj" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4, -/turf/open/floor/engine/hull, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "Vt" = ( /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) +/area/overmap_encounter/planetoid/sand/explored) "VG" = ( /obj/structure/sign/number/two, -/obj/item/stack/ore/salvage/scrapmetal, -/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/stack/ore/salvage/scraptitanium, +/obj/effect/gibspawner, /turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) "VK" = ( /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" }, -/obj/effect/turf_decal/industrial/outline/orange, -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) "VP" = ( /obj/effect/decal/fakelattice{ icon_state = "lattice-2" }, /turf/open/floor/plating/asteroid/whitesands/lit, -/area/overmap_encounter/planetoid/sand) -"Wg" = ( -/obj/structure/frame/machine, -/obj/item/stack/cable_coil/cut/red, -/obj/item/stack/ore/salvage/scrapgold, -/obj/item/stack/ore/salvage/scrapgold, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) -"Wo" = ( -/obj/structure/bed/dogbed{ - anchored = 1; - name = "citrus's bed" +/area/overmap_encounter/planetoid/sand/explored) +"VZ" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 9 +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" }, -/obj/machinery/light/directional/east, -/turf/open/floor/pod, -/area/ruin/whitesands/pubbycrash) -"WD" = ( -/obj/effect/turf_decal/industrial/stand_clear, -/obj/effect/turf_decal/industrial/warning, -/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/split) +"Wg" = ( +/obj/structure/sign/number/two, +/obj/item/stack/ore/salvage/scrapmetal, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/engine, /area/ruin/whitesands/pubbycrash) -"Xm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/ash, -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/whitesands/pubbycrash) -"Xn" = ( -/obj/effect/turf_decal/industrial/caution, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/corner{ +"Wo" = ( +/obj/structure/railing{ dir = 8 }, -/obj/structure/catwalk, -/obj/machinery/button/door{ - id = "whiteshipubbyEngines"; - name = "Engine Lockdown Control"; - pixel_x = -25; - dir = 4 +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, -/obj/structure/salvageable/destructive_analyzer, +/obj/machinery/airalarm/directional/north, +/obj/machinery/suit_storage_unit/open, +/turf/open/floor/plasteel/dark, +/area/ruin/whitesands/pubbycrash) +"WD" = ( +/obj/item/stack/ore/salvage/scraptitanium, /turf/open/floor/plating, /area/ruin/whitesands/pubbycrash) -"XA" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/item/kirbyplants/random, -/obj/structure/railing{ +"Xi" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/chair/office/light{ dir = 4 }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel/grimy, +/area/ruin/whitesands/pubbycrash) +"Xm" = ( +/obj/item/t_scanner/adv_mining_scanner/lesser, +/obj/item/kinetic_crusher, +/obj/structure/rack, +/obj/item/pickaxe/mini, +/obj/item/pickaxe/mini, +/obj/effect/turf_decal/siding/brown, +/obj/item/gun/energy/kinetic_accelerator, +/obj/machinery/firealarm/directional/south, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/tech/techmaint, +/area/ruin/whitesands/pubbycrash/split) +"Xn" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ruin/whitesands/pubbycrash) +"XA" = ( +/obj/item/stack/ore/salvage/scrapmetal/five, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) "XK" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/firealarm/directional/west, +/obj/item/stack/ore/salvage/scraptitanium, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "Yt" = ( -/obj/machinery/newscaster/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/ash/large, -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" +/obj/structure/reagent_dispensers/servingdish, +/obj/structure/table/reinforced, +/obj/item/kitchen/spoon/plastic{ + pixel_x = 6 }, -/area/ruin/whitesands/pubbycrash) +/obj/item/kitchen/spoon/plastic{ + pixel_x = -1 + }, +/obj/item/kitchen/spoon/plastic{ + pixel_x = 13 + }, +/turf/open/floor/plastic, +/area/ruin/whitesands/pubbycrash/split) "Yu" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/girder, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash/engine_room) +"YC" = ( +/obj/structure/railing/corner{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/industrial/warning/corner{ - dir = 4 + dir = 1 }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/number/four{ - dir = 4 +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ruin/whitesands/pubbycrash) -"YC" = ( -/obj/structure/closet/wall/white{ - dir = 1; - name = "Medicine storage"; - pixel_y = -30 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, -/obj/item/storage/firstaid/ancient{ - pixel_x = 6; - pixel_y = -5 +/obj/structure/reagent_dispensers/servingdish, +/obj/item/kitchen/spoon/plastic{ + pixel_x = -1 }, -/obj/item/storage/firstaid/medical, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 +/obj/item/kitchen/spoon/plastic{ + pixel_x = 13 }, -/turf/open/floor/pod, +/obj/item/kitchen/spoon/plastic{ + pixel_x = 6 + }, +/turf/open/floor/plasteel/dark, /area/ruin/whitesands/pubbycrash) "YL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/power/terminal{ + dir = 8 + }, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "0-4" }, -/obj/effect/turf_decal/industrial/outline/grey, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash/engine_room) "Zg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/turf/open/floor/engine/hull, +/area/overmap_encounter/planetoid/cave/explored) +"Zj" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-3" + }, +/turf/open/floor/plating/asteroid/whitesands/dried, +/area/overmap_encounter/planetoid/cave/explored) +"Zk" = ( +/obj/effect/gibspawner, +/turf/open/floor/plating, +/area/ruin/whitesands/pubbycrash) +"Zp" = ( +/obj/structure/table/reinforced, +/obj/machinery/power/apc/auto_name/directional/north{ + start_charge = 0 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/item/flashlight/lamp{ + pixel_x = -6; + pixel_y = 8 }, +/obj/effect/decal/cleanable/dirt, /obj/structure/railing{ dir = 8 }, -/obj/structure/catwalk, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 +/obj/item/photo{ + pixel_y = -12 }, -/obj/structure/salvageable/protolathe, -/turf/open/floor/plating, -/area/ruin/whitesands/pubbycrash) -"Zj" = ( -/turf/open/floor/engine/hull, -/area/ruin/whitesands/pubbycrash) -"Zk" = ( -/obj/structure/railing/corner{ - dir = 4 +/obj/item/toy/figure/captain{ + pixel_x = 7; + pixel_y = 12 }, -/obj/effect/turf_decal/siding/brown{ - dir = 1 +/obj/item/stack/ore/salvage/scrapmetal, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash) +"Zu" = ( +/obj/machinery/light/directional/west, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/closet/wall{ - icon_door = "orange_wall"; - name = "Mining equipment"; - pixel_y = 28 +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -4 }, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/structure/cable{ - icon_state = "0-4" +/obj/item/folder/blue{ + pixel_x = 3; + pixel_y = 2 }, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) -"Zp" = ( +/obj/item/folder/white, +/obj/item/pen, /obj/structure/railing{ - dir = 1 + dir = 8 }, -/obj/effect/turf_decal/siding/brown{ - dir = 1 +/obj/item/stamp/captain{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/spacecash/bundle/c1000{ + pixel_x = 2; + pixel_y = -14 + }, +/obj/item/spacecash/bundle/c1000{ + pixel_x = 2; + pixel_y = -14 + }, +/obj/item/spacecash/bundle/c1000{ + pixel_x = 4; + pixel_y = -16 }, +/turf/open/floor/plasteel/tech, +/area/ruin/whitesands/pubbycrash) +"Zx" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/vomit/old, /turf/open/floor/plasteel/tech/techmaint, -/area/ruin/whitesands/pubbycrash) +/area/ruin/whitesands/pubbycrash/engine_room) (1,1,1) = {" Gl @@ -2354,15 +2512,15 @@ Gl Gl Gl Gl -RT -RT -RT -RT -RT -RT -RT -RT -RT +Gl +Gl +Gl +Gl +Gl +Gl +Gl +Gl +Gl Gl Gl Gl @@ -2378,22 +2536,22 @@ Gl Gl Gl RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT +Gl +Gl +Gl +Gl +Gl +Gl +Gl +Gl +Gl +Gl +Gl +Gl +Gl +Gl +Gl +Gl Gl Gl Gl @@ -2403,25 +2561,25 @@ Gl "} (3,1,1) = {" Gl +Gl RT RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT -RT +Vt +Vt +Vt +Gl +Gl +Gl +Vt +Vt +Gl +Vt +Vt +Gl +Gl +Gl +Gl +Gl Gl Gl Gl @@ -2433,24 +2591,24 @@ Gl RT RT RT -RT -cN -dW -Eb -LM -cN -Ky -cN -cN -Hq -Wg -cN -RT -RT -RT -RT -RT Vt +Vt +Vt +Vt +Vt +Vt +Vt +Vt +Vt +Vt +Vt +Vt +Vt +RT +Gl +Gl +Gl +Gl Gl Gl Gl @@ -2459,135 +2617,135 @@ Gl Gl RT RT -RT -RT -cN -qz -GF -cN -cN -SO -oo -cN +Vt +Vt +Vt +Vt +Vt +Vt +Vt +Vt +Vt +Vt Fc -Ml -cN -RT -RT -RT -RT -RT Vt Vt +Vt +RT +RT +Gl +Gl Gl Gl -"} -(6,1,1) = {" Gl Gl +"} +(6,1,1) = {" RT RT RT -cN +Vt +Vt +Vt QI -dm -cN -cN +AJ +AJ +bS mW -cN -Ji +Vt +sA PZ fO -cN -RT +SU +Vt RT RT RT -Vt -Vt -Vt Gl Gl -"} -(7,1,1) = {" Gl Gl +Gl +"} +(7,1,1) = {" RT RT RT -cN +RT +AJ +AJ SU HQ -cN -xA +sA +oS pu Et -jG +AJ yU oS Dx +AJ RT RT RT -RT -Vt -Vt -Vt Gl Gl -"} -(8,1,1) = {" Gl Gl +Gl +"} +(8,1,1) = {" RT RT RT -cN +RT +AJ +xX rW sV -cN -Pr +Bw +xX Qw -LU +xX Yu kP AH -Dx +xX +AJ RT RT RT RT Vt -Vt -Vt -Vt +Gl +Gl Gl "} (9,1,1) = {" Gl -Gl RT RT RT -cN -cN +RT +xX +Tg Qu -cN -Ha +xX +xX Hb ln -cN +xX DY PI -cN -RT +xX +AJ +AJ RT RT RT Vt Vt -Vt -Vt +Gl Gl "} (10,1,1) = {" @@ -2595,27 +2753,27 @@ Gl RT RT RT -Vj -GA +RT +xX YL iW -Xn -Zg +xX +xX pe -wV +xX so lB re -cN -Zj +xX +RT +AJ RT RT Vt Vt Vt -Vt -Vt -Vt +Gl +Gl "} (11,1,1) = {" RT @@ -2623,71 +2781,72 @@ RT RT RT AJ -cN +xX VK ho -Ho +xX Dg Cs zP KO xa Ew -cN +SO +RT AJ RT RT Vt Vt Vt -Vt -Vt -Vt +Gl +Gl "} (12,1,1) = {" RT RT RT -RT -sA -cN -LW -LW -cN -cN +AJ +AJ +xX +aR +yj +xX +xH gG -cN -cN -LW +dW +ET +Pu LW -cN -sA +SO +AJ +AJ RT RT Vt Vt Vt Vt -Vt -Vt +Gl "} (13,1,1) = {" +Gl RT RT RT -RT -RT -RT -aR +AJ +xX +xX Sy -ET +xX cp PA fR -AO +xX jt Mi -ek +xX +AJ RT RT RT @@ -2695,27 +2854,26 @@ Vt Vt Vt Vt -Vt -Vt +Gl "} (14,1,1) = {" +Gl RT RT RT -RT -RT -RT -RT +jG +Ha +QR Bz pT JI Lm BH -KS -up -RT -RT -RT +KS +up +qz +xX +Zg RT RT Vt @@ -2726,14 +2884,14 @@ Vt Vt "} (15,1,1) = {" -Gl -RT -RT RT RT RT +AJ +ch +xX gL -vc +Zx bW DQ gu @@ -2741,52 +2899,52 @@ Ct gy fX vc +xX +ch RT RT -RT -RT -bZ Vt Vt Vt Vt -Gl +Vt +Vt "} (16,1,1) = {" -Gl -Gl RT RT RT -pR -eq +AJ +Ai +xX vL -FP -KI +vL +xX +xX QD -vw -lK -RT -VG -WD -RT -RT -RT -bZ +xX +xX +vL +vL +xX +Ai +AJ +AJ +Vt +Vt Vt Vt Vt Vt -Gl "} (17,1,1) = {" -Gl -Gl RT RT +AJ +AJ sA -cN -cN +Zj +tB RC zX Uo @@ -2794,26 +2952,26 @@ nQ XK FY nP -cN -cN -sA +VG +dm +AJ +AJ RT RT -bZ Vt Vt Vt Vt -Gl +Vt "} (18,1,1) = {" -Gl -Gl RT RT RT -ck -Kt +AJ +AJ +RT +RT Bd fA IQ @@ -2823,49 +2981,49 @@ zi oq hh ck -ba -Cw +AJ +RT +RT +RT Vt Vt Vt Vt Vt -Gl -Gl "} (19,1,1) = {" -Gl -Gl RT RT RT -cN -cN -cN -cN -cN +RT +AJ +RT +vw +Ho +xz +ih yK -cN -cN -cN -cN -cN -cN -Vt -Cw +Kt +di +mp +Ho +hh +AJ +AJ +RT +AJ Vt Vt Vt Vt Gl -Gl "} (20,1,1) = {" -Gl -Gl RT RT RT +RT +AJ pG Di ff @@ -2874,35 +3032,143 @@ Uy co ly PK -jF -mH +hh +Wg +hh +RT +AJ +Vt +bZ Vt -IC Vt Vt -Cw -VP -gx Vt -Gl Gl "} (21,1,1) = {" Gl -Gl -RT RT RT RT -In +Xn +vX +vX Wo YC -cN +Gp RL -cN +Vj Fq If +vX +vX +Xn +RT +Vt +bZ +Vt +Vt +Vt +Vt +Gl +"} +(22,1,1) = {" +Gl +RT +RT +RT +AJ +KI +IU +AO +wn +lK +TB +Li +mH +PY +pR +KI +fr +Cw +Vt +Vt +Vt +Vt +Vt +Gl +Gl +"} +(23,1,1) = {" +Gl +RT +RT +RT +AJ +vX +vX +vX +vX +vX +xy +vX +vX +vX +vX +vX +vX +Vt +Cw +Vt +Vt +Vt +Vt +Gl +Gl +"} +(24,1,1) = {" +RT +RT +RT +RT +AJ +jA +kA +NI +Lj +Us +sC +rZ +Zk +WD +ul +AJ +IC +Vt +Vt +Cw +VP +gx Vt +Gl +Gl +"} +(25,1,1) = {" +RT +RT +RT +RT +RT +AJ +KT +ct +oo +vX +nG +vX +Ls +xA +AJ Vt kp Cw @@ -2914,224 +3180,223 @@ RT Gl Gl "} -(22,1,1) = {" +(26,1,1) = {" Gl RT RT RT -cN -cN -cN -cN -cN -cN -TB -cN -mH -IC +vX +vX +vX +vX +vX +vX +Ga +vX +ul +XA RT Vt Vt Vt -cN -cN -cN -cN +AA +AA +AA +AA RT Gl Gl "} -(23,1,1) = {" +(27,1,1) = {" Gl RT RT RT -iw +wV +Xi +Fn +IR vX -rZ -QR -cN -Ak -xy -Pu -Cw -Vt +Mr +Gi +In +ym +AJ RT VP gx xc -cN -Zk -Ls -cN +AA +sD +rT +AA RT RT Gl "} -(24,1,1) = {" -Gl +(28,1,1) = {" Gl RT RT -iw -jA -kA -NI -Lj -Us -sC -cN -Vt +RT +wV +Eb +Ak +kM +ss +Og +kU +vX +AJ RT RT IC lR nq -cN -Zp -bS -cN +AA +vO +Xm +AA RT RT Gl "} -(25,1,1) = {" -Gl +(29,1,1) = {" Gl RT RT -iw -PY -KT -ct -cN -Ig -nG -cN -Vt +RT +wV +Ji +Hq +KB +vX +hz +cx +vX +AJ RT Vt Vt -cN -cN -cN -Fn -wn -cN +AA +AA +AA +TF +uB +AA RT RT Gl "} -(26,1,1) = {" -Gl +(30,1,1) = {" Gl RT RT -cN -yj -Cg -fk -cN -BD -Ga -cN -ul -Cw +RT +vX +iw +Bi +Ik +vX +Dn +lA +vX +Qo +ym Cw sd -Eh -hA -yx -pE -XA -cN +as +Pr +ON +jF +eq +AA RT RT RT "} -(27,1,1) = {" -Gl +(31,1,1) = {" Gl RT RT -cN -cN -cN -cN -cN -cN -Gi -cN -Jz +RT +vX +vX +vX +vX +vX +vX +Cg +vX +LM kp Vt Vt -cN -gg -Tg -sD -rT -iw +AA +Yt +mU +Fo +no +VZ RT RT RT "} -(28,1,1) = {" -Gl +(32,1,1) = {" Gl RT RT RT RT -cN -kM -ss -Og -kU -If -yt +RT +vX +Zp +Zu +FP +AD +xA +ab Vt IC Vt +AA +Em +GK cN -as -Ik -vO -Xm -iw +lI +VZ RT RT RT "} -(29,1,1) = {" -Gl +(33,1,1) = {" Gl Gl RT RT RT -cN -KB -Qb -hz -cx +RT +vX +ba +gg +pE +ek uh -oO -mp +yx +Zj gx Vt -cN +AA +Oz +Ig +Ml DB -di -TF -uB -iw +VZ RT RT RT "} -(30,1,1) = {" -Gl +(34,1,1) = {" Gl Gl RT @@ -3139,27 +3404,26 @@ RT RT RT RT -Mr -Dn -lA -If -Qo -ym +RT +LU +GA +oO +xA +BD +Qb gs Cw -cN -cN -cN -cN -cN -cN +AA +AA +AA +AA +AA +AA RT RT RT "} -(31,1,1) = {" -Gl -Gl +(35,1,1) = {" Gl RT RT @@ -3169,23 +3433,24 @@ RT RT RT RT -cN -IC +RT +RT +vX +XA Vt Vt Vt -cN -Yt -mU -cN -cN -AJ +AA +GF +ge +AA +AA +Ky RT RT Gl "} -(32,1,1) = {" -Gl +(36,1,1) = {" Gl RT RT @@ -3197,21 +3462,22 @@ RT RT RT RT +RT Vt Cw VP nq EG -Em -GK -cN -AJ +Eh +fk +AA +Ky RT RT RT Gl "} -(33,1,1) = {" +(37,1,1) = {" Gl Gl RT @@ -3228,17 +3494,17 @@ kp IC Vt qN -cN -Oz -cN -AJ +AA +oj +AA +Ky RT RT RT RT Gl "} -(34,1,1) = {" +(38,1,1) = {" Gl Gl Gl @@ -3265,7 +3531,7 @@ Gl Gl Gl "} -(35,1,1) = {" +(39,1,1) = {" Gl Gl Gl @@ -3292,7 +3558,7 @@ Gl Gl Gl "} -(36,1,1) = {" +(40,1,1) = {" Gl Gl Gl diff --git a/_maps/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/RandomRuins/SpaceRuins/astraeus.dmm index bafc48460b64..adf957299b7a 100644 --- a/_maps/RandomRuins/SpaceRuins/astraeus.dmm +++ b/_maps/RandomRuins/SpaceRuins/astraeus.dmm @@ -937,7 +937,7 @@ name = "paper - Munitions Inventory"; pixel_x = 7 }, -/obj/item/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/hacking{ pixel_x = -6 }, /turf/open/floor/plasteel/airless, diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm index b70a3ada2857..e163b6f46cea 100644 --- a/_maps/RandomRuins/SpaceRuins/clericden.dmm +++ b/_maps/RandomRuins/SpaceRuins/clericden.dmm @@ -578,7 +578,7 @@ /turf/open/floor/plasteel/dark/airless, /area/ruin/unpowered/no_grav) "Cb" = ( -/obj/item/book/manual/wiki/barman_recipes, +/obj/item/book/manual/wiki/drinks, /obj/structure/fluff/paper/stack{ dir = 5 }, @@ -650,7 +650,7 @@ /turf/open/floor/carpet/airless, /area/ruin/unpowered/no_grav) "Fz" = ( -/obj/item/book/manual/wiki/engineering_construction, +/obj/item/book/manual/wiki/construction, /obj/structure/fluff/paper/stack{ dir = 9 }, diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm index f477717d9b81..28695ad57a80 100644 --- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -192,7 +192,7 @@ "gC" = ( /obj/structure/table, /obj/effect/turf_decal/corner/opaque/green/border, -/obj/item/book/manual/wiki/infections, +/obj/item/book/manual/wiki/chemistry, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav) "gH" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 1b9136861194..635321fa9d4b 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -1507,7 +1507,6 @@ "ex" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/book/manual/wiki/security_space_law, /obj/effect/turf_decal/corner/opaque/red{ dir = 1 }, diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm index 486cbbce85fd..3175796cd159 100644 --- a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm +++ b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm @@ -7011,7 +7011,7 @@ "Cb" = ( /obj/structure/table, /obj/structure/spacevine, -/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 6 }, @@ -11252,7 +11252,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/item/book/manual/wiki/engineering_singulo_tesla, +/obj/item/book/manual/wiki/engineering, /turf/open/space/basic, /area/space/nearstation) "Rp" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm index 276292022795..c2efbe90506d 100644 --- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm @@ -1085,7 +1085,7 @@ /area/ruin/space/has_grav/spacemall/dorms) "eb" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/engineering_hacking, +/obj/item/book/manual/wiki/hacking, /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/shop) "ed" = ( diff --git a/_maps/configs/minutemen_asclepius.json b/_maps/configs/minutemen_asclepius.json index 3877d1e24549..9498534f1700 100644 --- a/_maps/configs/minutemen_asclepius.json +++ b/_maps/configs/minutemen_asclepius.json @@ -46,5 +46,5 @@ "slots": 1 } }, - "enabled": true + "enabled": false } diff --git a/_maps/configs/minutemen_cepheus.json b/_maps/configs/minutemen_cepheus.json index e9b51f1b3a02..5de05fef0ceb 100644 --- a/_maps/configs/minutemen_cepheus.json +++ b/_maps/configs/minutemen_cepheus.json @@ -40,5 +40,5 @@ "slots": 3 } }, - "enabled": true + "enabled": false } diff --git a/_maps/configs/minutemen_corvus.json b/_maps/configs/minutemen_corvus.json deleted file mode 100644 index 0e424099b8cc..000000000000 --- a/_maps/configs/minutemen_corvus.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", - "map_name": "Corvus-class Response Vessel", - "prefix": "CMSV", - "description": "A lightly equipped patrol vessel used by the Minutemen for extended operations in the Frontier. In many systems, a lone Corvus is the only sign of Minutemen presence, an image that is not helped by their widespread usage. The Corvus was originally a light personal vessel retrofitted for combat usage by the Colonial Militia, which was later adopted as their official remote infantry patrol ship as a symbol of colonial ingenuity and grit. First designated the Wallaby-class, until the crew of a now-legendary Wallaby-class known as the CMSV Corvus single handedly destroyed a Frontiersmen capital ship in 392.", - "tags": [ - "Combat", - "Riot" - ], - "namelists": [ - "COLONIAL MINUTEMEN", - "MYTHOLOGICAL" - ], - "map_short_name": "Corvus-class", - "map_path": "_maps/shuttles/minutemen/minutemen_corvus.dmm", - "limit": 2, - "job_slots": { - "Captain": { - "outfit": "/datum/outfit/job/minutemen/captain", - "officer": true, - "slots": 1 - }, - "Mechanic": { - "outfit": "/datum/outfit/job/minutemen/engineer", - "slots": 1 - }, - "Minuteman": { - "outfit": "/datum/outfit/job/minutemen/security", - "slots": 2 - }, - "Cadet": { - "outfit": "/datum/outfit/job/minutemen/assistant", - "slots": 2 - } - }, - "enabled": true -} diff --git a/_maps/configs/minutemen_vela.json b/_maps/configs/minutemen_vela.json index e7ea8ba86df4..01a494fa6eb6 100644 --- a/_maps/configs/minutemen_vela.json +++ b/_maps/configs/minutemen_vela.json @@ -53,5 +53,5 @@ "slots": 1 } }, - "enabled": true + "enabled": false } diff --git a/_maps/configs/srm_glaive.json b/_maps/configs/srm_elder.json similarity index 60% rename from _maps/configs/srm_glaive.json rename to _maps/configs/srm_elder.json index 1c4cb6f91f86..82e104096b00 100644 --- a/_maps/configs/srm_glaive.json +++ b/_maps/configs/srm_elder.json @@ -1,20 +1,20 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", - "map_name": "SRM Glaive-class Hunter Vessel", + "map_name": "Elder-class Montagnes' Vessel", "prefix": "SRSV", "namelists": [ "SAINT-ROUMAIN", "BEASTS" ], - "map_short_name": "Glaive-class", - "map_path": "_maps/shuttles/roumain/srm_glaive.dmm", - "description": "A standard issue vessel to the highest ranks of the Saint-Roumain Militia. While “standard”, this class of vessel is unique to the Montagne that owns it. Each ship is designed around a central garden consisting of plants, soil, and a tree from the owning Montagnes’ home planet. As a highly religious ascetic order, the SRM supplies each Glaive with supplies to farm, raise animals, and perform medicine in more “natural” ways, using herbs and plants grown in house. Alongside this, the ship has a decent amount of mining equipment, and supplies required to begin the manufacturing of SRM-pattern firearms as is standard for Hunter’s Pride. The ship is captained by a Montagne, who oversees a team of Hunters, and Shadows apprenticing them.", + "map_short_name": "Elder-class", + "map_path": "_maps/shuttles/roumain/srm_elder.dmm", + "description": "A standard issue vessel to the highest ranks of the Saint-Roumain Militia. While “standard”, this class of vessel is unique to the Montagne that owns it. Each ship is designed around a central garden consisting of plants, soil, and a tree from the owning Montagnes’ home planet. As a highly religious ascetic order, the SRM supplies each Elder with supplies to farm, raise animals, and perform medicine in more “natural” ways, using herbs and plants grown in house. The ship is captained by a Montagne, who oversees a team of Hunters, and Shadows apprenticing them.", "tags": [ - "Mining", + "Botany", "Combat", "Specialist" ], - "map_id": "srm_glaive", + "map_id": "srm_elder", "limit": 1, "job_slots": { "Hunter Montagne": { diff --git a/_maps/configs/syndicate_luxembourg.json b/_maps/configs/syndicate_luxembourg.json deleted file mode 100644 index 1433f2da547a..000000000000 --- a/_maps/configs/syndicate_luxembourg.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", - "prefix": "SSV", - "namelists": [ - "DONK", - "MERCANTILE", - "SPACE" - ], - "map_name": "Luxembourg-class Delivery Vessel", - "description": "A dual-purpose delivery vessel and mobile storefront, Luxembourgs make up a substantial portion of Donk! Co.’s fleet on the Frontier, where the ever-opportunistic corporation has begun to fill the gaps left behind by the collapse of Nanotrasen’s logistics network. Donk! Co. managers have a great degree of autonomy, and so any given Luxembourg will often bear substantial modifications to the sales floor and on-board cafe, the better to entice new customers in an unstable yet lucrative region of space.", - "tags": [ - "Robotics", - "Cargo" - ], - "map_short_name": "Luxembourg-class", - "map_path": "_maps/shuttles/syndicate/syndicate_luxembourg.dmm", - "limit": 1, - "starting_funds": 6000, - "job_slots": { - "Manager": { - "outfit": "/datum/outfit/job/syndicate/quartermaster/donk", - "slots": 1 - }, - "Customer Service Representative": { - "outfit": "/datum/outfit/job/syndicate/cargo_tech/donk", - "slots": 5 - }, - "Food and Beverage Specialist": { - "outfit": "/datum/outfit/job/syndicate/bartender", - "slots": 1 - }, - "GEC Contracted Engineer": { - "outfit": "/datum/outfit/job/syndicate/engineer/gec", - "slots": 1 - } - }, - "enabled": true -} diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json index e5765b1691dd..ef84cca126f5 100644 --- a/_maps/configs/syndicate_twinkleshine.json +++ b/_maps/configs/syndicate_twinkleshine.json @@ -17,7 +17,7 @@ "map_short_name": "Twinkleshine-class", "map_path": "_maps/shuttles/syndicate/syndicate_twinkleshine.dmm", "job_slots": { - "Captain": { + "Flotilla Admiral": { "outfit": "/datum/outfit/job/syndicate/captain/twink", "officer": true, "slots": 1 @@ -27,6 +27,11 @@ "officer": true, "slots": 1 }, + "Redshield Officer": { + "outfit": "/datum/outfit/job/syndicate/hos/suns/twink", + "officer": true, + "slots": 1 + }, "Medic": { "outfit": "/datum/outfit/job/syndicate/paramedic/twink", "slots": 2 diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt index 3d86570f326c..284e944454f4 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -337,8 +337,8 @@ Find the key for using this catalogue in "map_catalogue_key.txt" Tags = "No Combat", "Minor Loot", "Inhospitable" File Name = "_maps\RandomRuins\Ruins\whitesands_surface_pubbyslopcrash.dmm" - Size = (x = 35)(y = 25)(z = 1) - Tags = "Minor Combat Challange", "Medium Loot", "Shelter" + Size = (x = 40)(y = 25)(z = 1) + Tags = "Minor Combat Challenge", "Medium Loot", "Shelter" diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 7e921680fad9..bd415e97bae8 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1516,7 +1516,6 @@ /area/centcom/ferry) "arZ" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) @@ -2209,7 +2208,6 @@ /turf/open/floor/wood, /area/wizard_station) "axw" = ( -/obj/machinery/vending/magivend, /turf/open/floor/engine/cult, /area/wizard_station) "axx" = ( @@ -4458,7 +4456,7 @@ "aOO" = ( /obj/item/reagent_containers/food/condiment/enzyme, /obj/item/reagent_containers/food/drinks/shaker, -/obj/item/book/manual/wiki/barman_recipes, +/obj/item/book/manual/wiki/drinks, /obj/structure/closet/crate, /turf/open/floor/plasteel, /area/centcom/holding) @@ -6238,7 +6236,6 @@ "bbL" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, /obj/effect/turf_decal/corner/transparent/neutral{ @@ -6600,7 +6597,6 @@ /area/centcom) "bRK" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -8375,7 +8371,6 @@ /turf/open/floor/plasteel/dark, /area/centcom/supply) "fsQ" = ( -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /obj/structure/table/wood, /obj/effect/turf_decal/corner/transparent/neutral{ @@ -9299,7 +9294,6 @@ "hzR" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, /obj/effect/turf_decal/corner/transparent/neutral{ @@ -10564,7 +10558,6 @@ /area/centcom/evac) "kel" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -11270,7 +11263,6 @@ "lDl" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, /obj/machinery/airalarm/directional/south, @@ -13392,7 +13384,7 @@ /area/centcom/holding) "pDx" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/barman_recipes, +/obj/item/book/manual/wiki/drinks, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/glass/rag, /obj/machinery/newscaster/directional/north{ @@ -13823,7 +13815,6 @@ /area/centcom/control) "qHN" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -14675,7 +14666,6 @@ /turf/open/floor/plasteel, /area/centcom/control) "sow" = ( -/obj/item/book/manual/wiki/security_space_law, /obj/structure/table/wood, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm index d5ccb5e0af68..99eee11d1b60 100644 --- a/_maps/outpost/nanotrasen_asteroid.dmm +++ b/_maps/outpost/nanotrasen_asteroid.dmm @@ -7054,10 +7054,6 @@ pixel_y = 4; pixel_x = 5 }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -6; - pixel_y = -10 - }, /turf/open/floor/plasteel/dark, /area/outpost/security) "yI" = ( @@ -14782,10 +14778,6 @@ /area/outpost/crew/dorm) "ZD" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 4; - pixel_y = 2 - }, /obj/machinery/door/window/brigdoor/southright{ req_access_txt = "101" }, diff --git a/_maps/outpost/nanotrasen_ice.dmm b/_maps/outpost/nanotrasen_ice.dmm index 04b8040a6275..19ac0333527e 100644 --- a/_maps/outpost/nanotrasen_ice.dmm +++ b/_maps/outpost/nanotrasen_ice.dmm @@ -1250,10 +1250,6 @@ pixel_x = -5; pixel_y = 3 }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 13; - pixel_y = 1 - }, /turf/open/floor/plasteel/telecomms_floor, /area/outpost/security) "jl" = ( @@ -7835,10 +7831,6 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/item/book/manual/wiki/security_space_law{ - pixel_y = 17; - pixel_x = 3 - }, /obj/machinery/light/directional/west, /turf/open/floor/plasteel/telecomms_floor, /area/outpost/security/checkpoint) diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json index 6d3fd5f67a0e..852e422343fb 100644 --- a/_maps/ship_config_schema.json +++ b/_maps/ship_config_schema.json @@ -34,6 +34,11 @@ "description": "The prefix of the ship class, appended to randomly generated names when they're first purchased.", "maxLength": 5 }, + "faction_name": { + "title": "Faction Name", + "type": [ "null", "string" ], + "description": "A custom faction name for the ship class. If exluded or left blank, the ship will use the default faction name for the faction that matches the ship's prefix." + }, "namelists": { "title": "Namelists", "type": "array", diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm index e3ff8985e3d1..5ac1bcdd0e65 100644 --- a/_maps/shuttles/independent/independent_mudskipper.dmm +++ b/_maps/shuttles/independent/independent_mudskipper.dmm @@ -154,9 +154,6 @@ /obj/structure/table/reinforced{ color = "#c1b6a5" }, -/obj/item/analyzer{ - pixel_y = 3 - }, /obj/machinery/button/door{ dir = 8; pixel_x = 22; @@ -164,6 +161,7 @@ id = "mudskipper_engine"; name = "Engine Shutters" }, +/obj/machinery/cell_charger, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) "dN" = ( @@ -348,19 +346,8 @@ /obj/item/reagent_containers/pill/patch/styptic, /obj/item/reagent_containers/pill/patch/silver_sulf, /obj/item/circular_saw, -/obj/item/gps/mining{ - gpstag = "SCAV1" - }, -/obj/item/gps/mining{ - gpstag = "SCAV2" - }, -/obj/item/gps/mining{ - gpstag = "SCAV3" - }, -/obj/item/gps/mining{ - gpstag = "SCAV4" - }, /obj/item/multitool, +/obj/item/stack/marker_beacon/thirty, /turf/open/floor/plasteel/tech, /area/ship/cargo) "gT" = ( @@ -641,8 +628,12 @@ /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/caphat, /obj/item/megaphone/command, -/obj/item/kitchen/knife/combat/survival, -/obj/item/flashlight/seclite, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser/e10, +/obj/item/gun/energy/laser/e10, +/obj/item/stock_parts/cell/gun, +/obj/item/stock_parts/cell/gun, /turf/open/floor/plasteel/dark, /area/ship/bridge) "ot" = ( @@ -1651,6 +1642,10 @@ color = "#c1b6a5" }, /obj/item/paper_bin, +/obj/item/analyzer{ + pixel_y = 3; + pixel_x = 13 + }, /obj/item/pen, /obj/structure/cable{ icon_state = "1-10" @@ -2354,16 +2349,22 @@ /obj/effect/turf_decal/box, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, -/obj/item/stock_parts/cell/gun, -/obj/item/gun/energy/laser{ - pixel_y = 5 +/obj/item/gps/mining{ + gpstag = "SCAV1" + }, +/obj/item/gps/mining{ + gpstag = "SCAV1" + }, +/obj/item/gps/mining{ + gpstag = "SCAV1" + }, +/obj/item/gps/mining{ + gpstag = "SCAV1" }, -/obj/item/stock_parts/cell/gun, -/obj/item/gun/energy/laser, -/obj/item/flashlight/seclite, /obj/item/kitchen/knife/combat/survival, -/obj/item/flashlight/seclite, /obj/item/kitchen/knife/combat/survival, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Yd" = ( diff --git a/_maps/shuttles/independent/independent_nemo.dmm b/_maps/shuttles/independent/independent_nemo.dmm index 0bb1bf8fe690..1ffde7c6d45b 100644 --- a/_maps/shuttles/independent/independent_nemo.dmm +++ b/_maps/shuttles/independent/independent_nemo.dmm @@ -2241,7 +2241,7 @@ /turf/open/floor/plating, /area/ship/crew/dorm) "GX" = ( -/obj/item/book/manual/wiki/tcomms, +/obj/item/book/manual/wiki/engineering, /obj/effect/turf_decal/number/five{ dir = 8 }, @@ -3248,7 +3248,7 @@ /turf/open/floor/carpet/black, /area/ship/crew/dorm) "VK" = ( -/obj/structure/bookcase/manuals/research_and_development, +/obj/structure/bookcase/manuals/chemistry, /obj/effect/turf_decal/siding/wood{ dir = 8 }, diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm index ed3087952f1d..fd1a368ebc50 100644 --- a/_maps/shuttles/independent/independent_tranquility.dmm +++ b/_maps/shuttles/independent/independent_tranquility.dmm @@ -4830,7 +4830,7 @@ pixel_x = -6; pixel_y = 26 }, -/obj/item/book/manual/wiki/tcomms{ +/obj/item/book/manual/wiki/engineering{ pixel_x = -8; pixel_y = -1 }, diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index eb7df62dd770..1c7d80802dce 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -2652,6 +2652,7 @@ }, /obj/item/storage/belt/security/webbing/inteq, /obj/item/storage/belt/military/assault, +/obj/item/clothing/head/inteq_peaked, /turf/open/floor/carpet/orange, /area/ship/bridge) "Dq" = ( diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 70ca7af36a85..c3792f7b78e9 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -4700,8 +4700,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /obj/item/book/manual/srmlore, -/obj/item/book/manual/wiki/detective, -/obj/item/book/manual/wiki/security_space_law, /obj/structure/bookcase, /obj/item/book/random, /obj/item/book/random, @@ -6289,7 +6287,7 @@ id = "talos_engine_shutter" }, /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/closed/wall/mineral/plastitanium/nodiagonal, +/turf/open/floor/plating, /area/ship/engineering/engine) "Pm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -7589,6 +7587,7 @@ }, /obj/item/storage/belt/security/webbing/inteq/alt, /obj/item/storage/belt/security/webbing/inteq, +/obj/item/clothing/head/inteq_peaked, /turf/open/floor/plasteel/dark, /area/ship/bridge) "YC" = ( diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index 1cb1000da1d2..106df74f3d27 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -2703,6 +2703,7 @@ }, /obj/item/storage/lockbox/medal/sec, /obj/item/clothing/glasses/hud/security/sunglasses/inteq, +/obj/item/clothing/head/inteq_peaked, /turf/open/floor/carpet/orange, /area/ship/bridge) "zh" = ( diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index 3afb3c456a9d..57ba90bd6352 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -936,6 +936,7 @@ /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 }, +/obj/item/clothing/head/inteq_peaked, /turf/open/floor/plasteel/dark, /area/ship/bridge) "mE" = ( diff --git a/_maps/shuttles/minutemen/minutemen_asclepius.dmm b/_maps/shuttles/minutemen/minutemen_asclepius.dmm index a3ac29a8791f..a4dcffa117dc 100644 --- a/_maps/shuttles/minutemen/minutemen_asclepius.dmm +++ b/_maps/shuttles/minutemen/minutemen_asclepius.dmm @@ -3752,7 +3752,7 @@ pixel_x = 1; pixel_y = 1 }, -/obj/item/book/manual/wiki/engineering_guide{ +/obj/item/book/manual/wiki/engineering{ pixel_x = 5; pixel_y = 2 }, diff --git a/_maps/shuttles/minutemen/minutemen_cepheus.dmm b/_maps/shuttles/minutemen/minutemen_cepheus.dmm index 90ba560d9b02..2faae373ecaf 100644 --- a/_maps/shuttles/minutemen/minutemen_cepheus.dmm +++ b/_maps/shuttles/minutemen/minutemen_cepheus.dmm @@ -189,7 +189,7 @@ pixel_x = -4; pixel_y = 1 }, -/obj/item/book/manual/wiki/engineering_singulo_tesla{ +/obj/item/book/manual/wiki/engineering{ pixel_x = 5; pixel_y = 14 }, @@ -3036,10 +3036,6 @@ /area/ship/engineering/atmospherics) "FC" = ( /obj/structure/table, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 9; - pixel_y = 4 - }, /obj/item/flashlight/lamp{ pixel_x = -7; pixel_y = 1 @@ -4332,7 +4328,7 @@ /obj/effect/turf_decal/steeldecal/steel_decals_central2{ pixel_y = 2 }, -/obj/item/book/manual/wiki/robotics_cyborgs{ +/obj/item/book/manual/wiki/robotics{ pixel_x = -3; pixel_y = 3 }, diff --git a/_maps/shuttles/minutemen/minutemen_corvus.dmm b/_maps/shuttles/minutemen/minutemen_corvus.dmm deleted file mode 100644 index a82b0630b66a..000000000000 --- a/_maps/shuttles/minutemen/minutemen_corvus.dmm +++ /dev/null @@ -1,3217 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"bf" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor/hole{ - dir = 4 - }, -/obj/structure/closet/wall{ - dir = 8; - icon_door = "yellow_wall"; - name = "engineering closet"; - pixel_x = 28 - }, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/item/clothing/accessory/armband/engine, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/head/hardhat/dblue, -/obj/item/radio/headset/headset_eng, -/obj/item/clothing/gloves/color/yellow, -/obj/item/storage/backpack/industrial, -/obj/item/clothing/shoes/workboots, -/obj/effect/turf_decal/techfloor/hole/right{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/item/clothing/head/beret/eng/hazard, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"bA" = ( -/turf/template_noop, -/area/template_noop) -"bQ" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/machinery/light/small/directional/south, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/security) -"cq" = ( -/obj/effect/turf_decal/techfloor{ - dir = 10 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/light/small/directional/south, -/obj/machinery/atmospherics/components/unary/tank/toxins{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"cx" = ( -/obj/structure/rack, -/obj/effect/turf_decal/corner/opaque/red/border{ - dir = 5 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/item/gun/ballistic/automatic/pistol/candor{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/gun/ballistic/automatic/pistol/candor, -/obj/item/flamethrower/full/tank, -/obj/item/gun/ballistic/automatic/smg/cm5, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"cC" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/turf/open/floor/wood, -/area/ship/bridge) -"cR" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) -"dq" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/security) -"dB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -10; - pixel_y = -22 - }, -/obj/machinery/vending/wallmed{ - pixel_y = -28 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"dI" = ( -/obj/effect/turf_decal/techfloor{ - dir = 9 - }, -/obj/machinery/button/door{ - dir = 4; - id = "minutecop_windows"; - name = "Window blastdoors"; - pixel_x = -22; - pixel_y = -10 - }, -/obj/machinery/button/door{ - dir = 4; - id = "minutecop_bridge"; - name = "Bridge shutters"; - pixel_x = -22; - pixel_y = 2 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"dJ" = ( -/obj/effect/turf_decal/number/six{ - dir = 1 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"dU" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/oil{ - pixel_y = 11 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"ej" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"em" = ( -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"eE" = ( -/obj/structure/table, -/obj/machinery/computer/secure_data/laptop{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/paper_bin{ - pixel_x = -9; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = -10; - pixel_y = 4 - }, -/obj/effect/turf_decal/techfloor{ - dir = 9 - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"eF" = ( -/obj/effect/turf_decal/number/zero{ - dir = 2 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"eS" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew) -"eZ" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/machinery/mineral/ore_redemption{ - dir = 1; - output_dir = 1 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"fr" = ( -/obj/effect/turf_decal/techfloor/corner, -/obj/effect/decal/cleanable/robot_debris, -/obj/effect/turf_decal/number/three, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"fy" = ( -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/structure/rack, -/obj/item/storage/toolbox/electrical, -/obj/item/storage/belt/utility/full/engi, -/obj/item/clothing/glasses/welding{ - pixel_y = 5 - }, -/obj/item/multitool{ - pixel_x = 9 - }, -/obj/effect/turf_decal/kfp_small/left, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"fR" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_x = -25 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/central) -"fX" = ( -/obj/effect/turf_decal/techfloor{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/light_switch{ - pixel_x = 19; - dir = 8; - pixel_y = 11 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"gj" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/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 = "2-8" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"gH" = ( -/obj/structure/bookcase/random, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/turf/open/floor/wood, -/area/ship/bridge) -"gP" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 10 - }, -/obj/structure/closet/crate/internals, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = 1; - pixel_y = -4 - }, -/obj/item/clothing/suit/space/eva, -/obj/item/clothing/suit/space/eva, -/obj/item/clothing/head/helmet/space/eva, -/obj/item/clothing/head/helmet/space/eva, -/obj/machinery/atmospherics/pipe/manifold/orange/visible, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"gS" = ( -/obj/structure/tank_dispenser, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/greenglow, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"hc" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium, -/area/ship/cargo) -"hk" = ( -/obj/machinery/door/poddoor{ - id = "minutecop_bridge"; - dir = 4 - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/bridge) -"hp" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/eastleft, -/obj/machinery/door/poddoor{ - dir = 4; - id = "minutemen_corvus_engines"; - name = "Thruster Blast Door" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"hK" = ( -/obj/structure/chair/greyscale{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"hY" = ( -/obj/structure/window/reinforced, -/obj/structure/rack, -/obj/effect/turf_decal/corner/opaque/red/border{ - dir = 6 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/melee/baton/loaded, -/obj/item/melee/baton/loaded{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/gun/energy/disabler{ - pixel_y = 2 - }, -/obj/item/reagent_containers/spray/pepper{ - pixel_x = 3; - pixel_y = -4 - }, -/obj/item/reagent_containers/spray/pepper{ - pixel_x = 8; - pixel_y = -4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"is" = ( -/obj/machinery/cryopod{ - dir = 8 - }, -/obj/machinery/computer/cryopod/directional/east, -/obj/effect/turf_decal/industrial/warning/cee{ - dir = 8 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew) -"iJ" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/turf_decal/steeldecal/steel_decals7, -/obj/effect/turf_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"iL" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/machinery/door/airlock/hatch{ - dir = 4; - name = "Security" - }, -/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" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/security) -"iV" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/stand_clear, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = -7; - pixel_y = -2 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_y = 4 - }, -/obj/structure/closet/cardboard, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 4; - pixel_y = -2 - }, -/obj/machinery/light/small/directional/west, -/obj/structure/cable{ - icon_state = "1-6" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"jk" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/green{ - dir = 10 - }, -/obj/machinery/door/airlock/wood{ - name = "Dormitories" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"jE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/stairs, -/area/ship/engineering) -"jF" = ( -/obj/machinery/door/window/northleft{ - dir = 2 - }, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/box, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/clothing/suit/space/hardsuit/swat, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"ka" = ( -/obj/effect/turf_decal/number/one{ - dir = 1 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"kE" = ( -/obj/effect/turf_decal/steeldecal/steel_decals3{ - dir = 10 - }, -/obj/effect/turf_decal/steeldecal/steel_decals3{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/oil/streak, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"kJ" = ( -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/machinery/computer/warrant{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"kR" = ( -/obj/machinery/vending/tool, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"lE" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-10" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"lM" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"lX" = ( -/obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/wood, -/area/ship/crew) -"mo" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"mz" = ( -/obj/structure/sign/warning/docking, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"mF" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"mV" = ( -/obj/structure/chair/sofa/left, -/obj/item/toy/plush/lizardplushie{ - pixel_x = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/carpet/nanoweave, -/area/ship/hallway/central) -"nI" = ( -/obj/structure/bed, -/obj/item/bedsheet/grey, -/obj/effect/turf_decal/corner/opaque/grey/diagonal, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"nW" = ( -/obj/effect/turf_decal/siding/white/corner, -/obj/effect/turf_decal/siding/white/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"of" = ( -/obj/machinery/door/poddoor{ - id = "minutecop_windows" - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/hallway/central) -"oj" = ( -/obj/effect/turf_decal/siding/thinplating/dark/corner, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"oN" = ( -/obj/machinery/door/airlock/grunge{ - dir = 4; - name = "Bathroom" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"oQ" = ( -/obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/industrial/warning, -/obj/structure/cable{ - icon_state = "0-6" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"oR" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/bookcase/random, -/obj/structure/sign/minutemen{ - pixel_y = 32 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/wood, -/area/ship/crew) -"py" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/light/directional/south, -/obj/structure/sign/poster/minutemen/gold{ - pixel_y = -32 - }, -/turf/open/floor/carpet/nanoweave, -/area/ship/hallway/central) -"pN" = ( -/obj/structure/chair/greyscale{ - dir = 4 - }, -/obj/machinery/newscaster/directional/west, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"pW" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/clipboard{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/radio/intercom/directional/east, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 22; - pixel_y = 8 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/wood, -/area/ship/crew) -"qb" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 6 - }, -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"qL" = ( -/obj/machinery/door/poddoor{ - id = "minutecop_bridge"; - dir = 8 - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/bridge) -"qN" = ( -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/structure/window/reinforced/tinted/frosted{ - dir = 8; - pixel_x = -4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/vomit/old{ - pixel_x = 5 - }, -/obj/effect/spawner/lootdrop/glowstick, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"qU" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor/hole{ - dir = 1 - }, -/obj/effect/decal/cleanable/wrapping, -/obj/machinery/light/directional/north, -/obj/machinery/jukebox, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"qW" = ( -/obj/effect/turf_decal/siding/white/corner, -/obj/effect/turf_decal/siding/white/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"rb" = ( -/obj/effect/turf_decal/techfloor{ - dir = 6 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 1; - piping_layer = 2 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"rh" = ( -/obj/structure/chair/sofa/right, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/landmark/observer_start, -/obj/machinery/light_switch{ - pixel_y = 23 - }, -/turf/open/floor/carpet/nanoweave, -/area/ship/hallway/central) -"rk" = ( -/obj/machinery/door/poddoor{ - id = "minutecop_windows" - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/bridge) -"rt" = ( -/obj/effect/turf_decal/techfloor, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"rx" = ( -/obj/effect/turf_decal/steeldecal/steel_decals1, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/number/zero, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"rL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/structure/sign/warning/vacuum/external{ - pixel_x = 30 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 10 - }, -/obj/item/clothing/suit/space/engineer, -/obj/item/clothing/head/helmet/space/light/engineer, -/obj/machinery/suit_storage_unit/inherit, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"rO" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"sc" = ( -/obj/effect/turf_decal/borderfloorblack, -/obj/machinery/door/airlock/hatch{ - name = "Captains Cabin" - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"sy" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/item/flashlight/lamp{ - pixel_x = -5; - pixel_y = 10 - }, -/obj/item/modular_computer/laptop/preset/civilian{ - pixel_x = 12; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/drinks/mug{ - pixel_x = -6 - }, -/obj/machinery/firealarm/directional/north, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/light_switch{ - pixel_x = -12; - pixel_y = 23 - }, -/turf/open/floor/wood, -/area/ship/crew) -"sL" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "minutemen_corvus_engines"; - name = "Thruster Blast Door" - }, -/obj/structure/window/plasma/reinforced/spawner/east, -/turf/open/floor/plating, -/area/ship/engineering) -"sN" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/item/detective_scanner, -/obj/item/holosign_creator/security{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/holosign_creator/security{ - pixel_x = 2 - }, -/obj/item/key/security, -/obj/structure/closet/secure_closet/wall{ - dir = 1; - icon_door = "red_wall"; - icon_state = "generic_wall"; - name = "Utility locker"; - pixel_y = -28; - req_access_txt = "1" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/security) -"sW" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/effect/turf_decal/techfloor{ - dir = 9 - }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"tc" = ( -/obj/structure/closet/crate/bin, -/obj/item/trash/candy, -/obj/item/trash/plate, -/obj/item/trash/sosjerky{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/trash/cheesie{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/effect/decal/cleanable/shreds{ - pixel_x = 10; - pixel_y = -7 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/noticeboard{ - pixel_y = 30 - }, -/turf/open/floor/carpet/nanoweave, -/area/ship/hallway/central) -"tp" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/holopad/emergency/engineering, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"tt" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/security) -"tD" = ( -/obj/machinery/airalarm/directional/west, -/obj/machinery/computer/cargo/express, -/obj/structure/sign/poster/minutemen/lanchester{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"tQ" = ( -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/machinery/computer/security/hos{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"uF" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security) -"uK" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave{ - pixel_y = 5 - }, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"vo" = ( -/obj/docking_port/stationary{ - dwidth = 4; - width = 15; - height = 15; - dir = 2 - }, -/turf/template_noop, -/area/template_noop) -"vN" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/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" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch{ - dir = 4; - name = "Cargo Bay" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/security) -"wa" = ( -/obj/structure/chair/greyscale{ - dir = 8 - }, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"wu" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/highsecurity{ - name = "Bridge" - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"wx" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/structure/railing/corner, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"xL" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/security) -"yu" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 - }, -/obj/structure/rack, -/obj/item/storage/bag/ore, -/obj/item/mining_scanner, -/obj/item/pickaxe/drill, -/obj/item/pickaxe/rusted, -/obj/item/radio/intercom/directional/south, -/obj/machinery/button/flasher{ - dir = 1; - id = "minuteman_cell1"; - pixel_x = -8; - pixel_y = -20 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"yE" = ( -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"yI" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security) -"zu" = ( -/obj/machinery/door/poddoor{ - id = "minutecop_bridge" - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/bridge) -"zv" = ( -/obj/item/clothing/under/rank/command/minutemen, -/obj/item/clothing/head/cowboy/sec/minutemen, -/obj/item/clothing/suit/toggle/lawyer/minutemen, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/glasses/sunglasses, -/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/secure_closet{ - icon_state = "cap"; - name = "\proper captain's locker"; - req_access_txt = "20" - }, -/obj/item/radio/headset/minutemen/alt/captain, -/obj/item/gun/ballistic/revolver/detective, -/obj/item/ammo_box/c38/match, -/obj/item/ammo_box/c38/match, -/turf/open/floor/wood, -/area/ship/bridge) -"zA" = ( -/obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/storage/pill_bottle/dice{ - pixel_x = -5; - pixel_y = 1 - }, -/obj/item/toy/cards/deck{ - pixel_x = -3 - }, -/obj/item/trash/chips{ - pixel_x = 7; - pixel_y = 6 - }, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"Ab" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"At" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Az" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/wood, -/area/ship/crew) -"Bg" = ( -/obj/effect/decal/cleanable/dirt, -/obj/docking_port/mobile{ - can_move_docking_ports = 1; - dir = 2; - launch_status = 0; - port_direction = 8; - preferred_direction = 4 - }, -/obj/machinery/door/poddoor{ - id = "minutecop_cargohatch"; - name = "Cargo Bay Blast Door" - }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) -"Bk" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/cargo) -"Bl" = ( -/obj/structure/chair/greyscale{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"Bu" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "5-8" - }, -/obj/structure/cable{ - icon_state = "1-5" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"BA" = ( -/obj/machinery/door/poddoor{ - id = "minutecop_windows" - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/crew) -"BE" = ( -/obj/effect/turf_decal/techfloor{ - dir = 5 - }, -/obj/machinery/firealarm/directional/north, -/obj/machinery/rnd/production/techfab/department/security, -/obj/structure/sign/poster/minutemen/enlist{ - pixel_x = 32 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"BN" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/wood, -/area/ship/crew) -"Ci" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/sign/warning/nosmoking{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Cm" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/closet/secure_closet{ - icon_state = "sec"; - name = "equipment locker"; - req_access_txt = "1" - }, -/obj/item/storage/belt/military/minutemen, -/obj/item/storage/belt/military/minutemen, -/obj/item/storage/belt/military/minutemen, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/mask/gas/sechailer/minutemen, -/obj/item/clothing/mask/gas/sechailer/minutemen, -/obj/item/clothing/mask/gas/sechailer/minutemen, -/obj/item/clothing/mask/gas/sechailer/minutemen, -/obj/effect/turf_decal/corner/opaque/red/border{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/glasses/hud/security/sunglasses, -/obj/item/clothing/glasses/hud/security/sunglasses, -/obj/item/clothing/glasses/hud/security/sunglasses, -/obj/item/clothing/suit/armor/riot/minutemen, -/obj/item/clothing/head/helmet/riot/minutemen, -/obj/item/clothing/head/helmet/bulletproof/minutemen, -/obj/item/clothing/head/helmet/bulletproof/minutemen, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"Co" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/rack_parts{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/rack_parts{ - pixel_y = -2 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/wrench/old, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/item/circuitboard/computer/rdconsole, -/obj/item/circuitboard/machine/rdserver{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/machinery/light_switch{ - pixel_x = -12; - pixel_y = 23 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Cr" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Cs" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/obj/structure/curtain/cloth/grey, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/carpet/royalblue, -/area/ship/crew) -"Ds" = ( -/obj/effect/turf_decal/techfloor, -/mob/living/simple_animal/bot/secbot/beepsky/jr, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"DJ" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"DS" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"DY" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_containers/food/snacks/icecreamsandwich{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/reagent_containers/food/snacks/icecreamsandwich{ - pixel_x = 7; - pixel_y = -5 - }, -/obj/item/reagent_containers/food/snacks/icecreamsandwich, -/obj/item/reagent_containers/food/snacks/hotdog{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/reagent_containers/food/snacks/hotdog, -/obj/item/storage/cans/sixbeer, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"Eo" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/techfloor/orange{ - dir = 5 - }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 22; - pixel_y = 8 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Es" = ( -/obj/effect/turf_decal/siding/white{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Ew" = ( -/obj/machinery/computer/crew/syndie{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor{ - dir = 10 - }, -/obj/item/radio/intercom/directional/south, -/obj/item/radio/intercom/wideband/directional/west, -/obj/machinery/firealarm/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"EO" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) -"ER" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - dir = 4; - id = "corvus_cargo"; - locked = 1 - }, -/obj/machinery/door/poddoor{ - id = "minutecop_cargohatch"; - name = "Cargo Bay Blast Door" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) -"EW" = ( -/obj/machinery/porta_turret/ship/ballistic{ - dir = 9 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/engineering) -"Fa" = ( -/obj/effect/turf_decal/techfloor{ - dir = 5 - }, -/obj/machinery/pipedispenser, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"Fu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/firealarm/directional/south, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/carpet/nanoweave, -/area/ship/hallway/central) -"Fy" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/item/flashlight/lamp/green{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/item/radio/intercom/directional/west, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/directional/south, -/obj/item/areaeditor/shuttle, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/paicard{ - pixel_x = -7; - pixel_y = 4 - }, -/turf/open/floor/wood, -/area/ship/bridge) -"Fz" = ( -/obj/structure/closet/secure_closet/wall{ - dir = 1; - icon_door = "red_wall"; - icon_state = "generic_wall"; - name = "equipment locker"; - pixel_y = -28; - req_access_txt = "1" - }, -/obj/item/radio/headset/headset_sec/alt, -/obj/item/radio/headset/headset_sec/alt, -/obj/item/radio/headset/headset_sec/alt, -/obj/item/kitchen/knife/combat/survival, -/obj/item/kitchen/knife/combat/survival, -/obj/item/kitchen/knife/combat/survival, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/security) -"FW" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ - dir = 1 - }, -/turf/open/floor/engine/hull, -/area/ship/external) -"Gd" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"Gf" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"Gh" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/engineering) -"Gm" = ( -/obj/machinery/door/poddoor{ - dir = 4; - id = "minutecop_bridge" - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/bridge) -"Gr" = ( -/obj/machinery/autolathe, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 6 - }, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/plasteel/twenty{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 1 - }, -/obj/effect/decal/cleanable/glass{ - pixel_x = -11; - pixel_y = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Gu" = ( -/obj/machinery/porta_turret/ship/ballistic{ - dir = 5 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) -"Gv" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/structure/closet/crate/engineering, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/toy/plush/beeplushie, -/obj/item/rcl, -/obj/item/reagent_containers/food/snacks/chips{ - pixel_x = 6; - pixel_y = -1 - }, -/obj/item/trash/sosjerky{ - pixel_y = 4 - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"GF" = ( -/obj/machinery/computer/helm{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor{ - dir = 6 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"GI" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"GK" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"Ha" = ( -/obj/effect/decal/cleanable/food/flour, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"Hw" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/central) -"HJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/closet/wall{ - dir = 1; - icon_door = null; - name = "radio locker"; - pixel_y = -28 - }, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"Ip" = ( -/obj/effect/turf_decal/steeldecal/steel_decals_central4{ - dir = 1 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"IF" = ( -/obj/structure/chair/office/light{ - dir = 1; - pixel_y = 3 - }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/ship/crew) -"IX" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering) -"Jh" = ( -/obj/machinery/door/poddoor{ - id = "minutecop_windows" - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"Jo" = ( -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/structure/closet/wall{ - dir = 1; - name = "uniform closet"; - pixel_y = -30 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/newscaster/directional/west, -/obj/item/storage/backpack/security/cmm, -/obj/item/storage/backpack/security/cmm, -/obj/item/storage/backpack/security/cmm, -/obj/item/storage/backpack/security/cmm, -/obj/item/storage/backpack/security/cmm, -/obj/item/storage/backpack/security/cmm, -/turf/open/floor/wood, -/area/ship/crew) -"Ju" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/stand_clear, -/obj/machinery/button/door{ - dir = 8; - id = "minutecop_cargohatch"; - name = "Cargo hatch"; - pixel_x = 23; - pixel_y = 10 - }, -/obj/machinery/button/shieldwallgen{ - dir = 8; - id = "corvus_cargo"; - pixel_x = 21 - }, -/obj/structure/cable{ - icon_state = "1-10" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"JE" = ( -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"Kz" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/bed, -/obj/item/bedsheet/grey, -/obj/effect/turf_decal/corner/opaque/grey/diagonal, -/obj/machinery/flasher{ - id = "minuteman_cell1"; - pixel_x = -25 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Lj" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/medical, -/obj/item/roller, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/item/storage/pill_bottle/iron, -/obj/item/storage/pill_bottle/charcoal, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/light_switch{ - pixel_x = 19; - dir = 8; - pixel_y = 11 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"Lq" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/east, -/obj/machinery/door/poddoor{ - dir = 4; - id = "minutemen_corvus_engines"; - name = "Thruster Blast Door" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"LE" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/secure_data/laptop{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/machinery/recharger{ - pixel_x = 12 - }, -/obj/effect/turf_decal/techfloor{ - dir = 9 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"Mh" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/obj/structure/curtain/cloth/grey, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/carpet/royalblue, -/area/ship/crew) -"Mt" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_x = 8; - pixel_y = 3 - }, -/obj/item/storage/box/handcuffs{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 31 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/item/gps{ - gpstag = null; - pixel_x = -9; - pixel_y = 7 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -22 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"Mu" = ( -/obj/machinery/door/poddoor{ - id = "minutecop_windows" - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/engineering) -"MA" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 13; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = 27 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/garbage, -/obj/effect/decal/cleanable/wrapping, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"MT" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 28 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/newspaper{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/drinks/britcup{ - pixel_x = -6 - }, -/obj/item/spacecash/bundle/c1000{ - pixel_x = 3; - pixel_y = -4 - }, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"Nr" = ( -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4; - name = "Helm" - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"NE" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/turf_decal/techfloor/hole/right, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"NL" = ( -/obj/effect/turf_decal/techfloor{ - dir = 10 - }, -/obj/structure/chair/office{ - dir = 4; - name = "tactical swivel chair" - }, -/obj/machinery/newscaster/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"NY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 2 - }, -/obj/machinery/light/directional/south, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"Ok" = ( -/obj/structure/bed, -/obj/item/bedsheet/blue, -/obj/structure/curtain/bounty, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/minutemen/bard{ - pixel_y = 32 - }, -/turf/open/floor/carpet/royalblue, -/area/ship/bridge) -"Ov" = ( -/obj/machinery/door/window/northright{ - dir = 2 - }, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/box, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/item/tank/jetpack/carbondioxide, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/hardsuit/security/independent/minutemen, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"PA" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"PE" = ( -/obj/machinery/power/port_gen/pacman, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 1 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/structure/cable/yellow, -/obj/item/stack/sheet/mineral/plasma/five{ - pixel_x = -4 - }, -/obj/item/stack/sheet/mineral/plasma/five{ - pixel_y = -7 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Qj" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/wood, -/area/ship/crew) -"QY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - dir = 8; - id = "corvus_cargo"; - locked = 1 - }, -/obj/machinery/door/poddoor{ - id = "minutecop_cargohatch"; - name = "Cargo Bay Blast Door" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) -"Ri" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/window/eastright{ - name = "Engine Access" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "minutemen_corvus_engines"; - name = "Thruster Blast Door" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"Rj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"RU" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Sd" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) -"Sn" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew) -"SH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/central) -"ST" = ( -/obj/effect/turf_decal/techfloor{ - dir = 6 - }, -/obj/structure/rack, -/obj/item/storage/toolbox/mechanical, -/obj/item/geiger_counter{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"Tk" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 10 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"To" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"TS" = ( -/obj/structure/closet/wall/red{ - name = "Ammo locker"; - pixel_y = 28 - }, -/obj/item/ammo_box/magazine/m45{ - pixel_x = 9 - }, -/obj/item/ammo_box/magazine/m45{ - pixel_x = 6 - }, -/obj/item/ammo_box/magazine/m45{ - pixel_x = 5 - }, -/obj/item/ammo_box/magazine/m45/rubber, -/obj/item/ammo_box/magazine/m45/rubber, -/obj/item/ammo_box/magazine/m45/rubber, -/obj/effect/turf_decal/corner/opaque/red/border{ - dir = 1 - }, -/obj/item/ammo_box/magazine/m45/rubber, -/obj/item/ammo_box/magazine/smgm9mm{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/item/ammo_box/magazine/smgm9mm/rubber{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/ammo_box/magazine/smgm9mm, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"Ua" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "2-5" - }, -/obj/structure/cable{ - icon_state = "2-9" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"Um" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/security) -"Uq" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) -"Uy" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"UP" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/door/airlock/external/glass, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/central) -"Vi" = ( -/obj/effect/turf_decal/techfloor/orange/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"VR" = ( -/obj/machinery/shower{ - pixel_y = 13 - }, -/obj/structure/curtain/bounty, -/obj/structure/spider/cocoon, -/obj/structure/spider/stickyweb, -/obj/structure/spider/stickyweb, -/turf/open/floor/plating, -/area/ship/hallway/central) -"Wl" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/structure/table/wood, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_x = 4; - pixel_y = 9 - }, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_x = 4; - pixel_y = 13 - }, -/obj/item/lighter{ - pixel_x = 10 - }, -/obj/item/newspaper{ - pixel_x = 7; - pixel_y = -8 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/computer/helm/viewscreen/directional/north{ - pixel_y = 28 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/wood, -/area/ship/crew) -"WT" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/orange{ - dir = 9 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4; - name = "Engineering" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"WW" = ( -/obj/machinery/door/window/brigdoor/southright, -/obj/effect/turf_decal/corner/opaque/red/border, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"WY" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 9 - }, -/obj/effect/turf_decal/steeldecal/steel_decals2, -/obj/item/wirecutters{ - pixel_x = 6; - pixel_y = -8 - }, -/obj/machinery/firealarm/directional/north{ - pixel_x = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 10 - }, -/obj/item/kirbyplants/random, -/obj/machinery/button/door{ - id = "minutemen_corvus_engines"; - name = "Engine Blast Doors"; - pixel_x = -10; - pixel_y = 24 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"Xr" = ( -/obj/effect/turf_decal/techfloor/corner{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor/corner, -/obj/effect/turf_decal/steeldecal/steel_decals1, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/comfy/shuttle{ - dir = 4; - name = "Helm" - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"XM" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable{ - icon_state = "0-1" - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -19; - pixel_y = 12 - }, -/turf/open/floor/plasteel/stairs{ - dir = 1; - icon = 'icons/obj/stairs.dmi' - }, -/area/ship/bridge) -"XO" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm/directional/north, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/plastic, -/area/ship/hallway/central) -"XR" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/door/airlock/external/glass{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/central) -"XU" = ( -/obj/structure/closet/firecloset/wall{ - dir = 8; - pixel_x = 28 - }, -/obj/effect/turf_decal/techfloor/orange{ - dir = 5 - }, -/obj/item/trash/raisins{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/cable{ - icon_state = "2-9" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"Yh" = ( -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"Yn" = ( -/obj/machinery/light/directional/north, -/obj/machinery/holopad/emergency/command, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"Yq" = ( -/obj/item/trash/popcorn{ - pixel_x = -4; - pixel_y = 11 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "engine fuel pump" - }, -/obj/effect/turf_decal/number/five, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"YE" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/closet/secure_closet{ - icon_door = "tac"; - icon_state = "tac"; - name = "boarding tools locker"; - req_access_txt = "3" - }, -/obj/item/storage/backpack/duffelbag/syndie/x4{ - icon_state = "duffel-sec"; - name = "breaching charges duffel bag" - }, -/obj/item/door_seal, -/obj/item/door_seal, -/obj/effect/turf_decal/corner/opaque/red/border{ - dir = 9 - }, -/obj/machinery/light/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"YG" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/caution, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"YL" = ( -/obj/machinery/door/window/brigdoor/southright{ - dir = 4; - req_access_txt = "1" - }, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 2 - }, -/obj/effect/turf_decal/corner/opaque/grey/diagonal, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 1 - }, -/obj/machinery/computer/helm/viewscreen/directional/west, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"YM" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/pen/fountain/captain{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/folder/blue{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/stamp/captain{ - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/stamp/head_of_personnel{ - pixel_x = -10; - pixel_y = 10 - }, -/obj/item/newspaper, -/obj/effect/turf_decal/techfloor{ - dir = 5 - }, -/obj/item/desk_flag{ - pixel_x = 10 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"YO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/carpet/nanoweave, -/area/ship/hallway/central) -"YT" = ( -/obj/machinery/porta_turret/ship/ballistic{ - dir = 10 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/engineering) -"Zh" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/techfloor{ - dir = 6 - }, -/obj/machinery/fax, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"Zt" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"Zx" = ( -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -8; - pixel_y = -4 - }, -/obj/item/reagent_containers/glass/bucket, -/obj/structure/closet/wall{ - dir = 1; - name = "Janitorial supplies"; - pixel_y = -28 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/holosign_creator/janibarrier{ - pixel_x = 5; - pixel_y = -7 - }, -/obj/item/soap/deluxe, -/obj/item/mop, -/obj/item/storage/bag/trash, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"ZG" = ( -/obj/effect/turf_decal/techfloor, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) - -(1,1,1) = {" -bA -bA -bA -bA -IX -Zt -To -To -Zt -IX -bA -bA -bA -bA -"} -(2,1,1) = {" -bA -bA -bA -bA -IX -sL -hp -Ri -Lq -IX -bA -bA -bA -bA -"} -(3,1,1) = {" -bA -bA -bA -EW -IX -WY -iJ -mo -gP -IX -YT -bA -bA -bA -"} -(4,1,1) = {" -bA -bA -bA -IX -oQ -YG -tp -kE -RU -PE -IX -bA -bA -bA -"} -(5,1,1) = {" -bA -bA -bA -IX -kR -XU -bf -Vi -NE -Gr -Jh -FW -bA -bA -"} -(6,1,1) = {" -bA -bA -Bk -Uy -Uy -Uy -IX -qU -wx -IX -IX -Gh -bA -bA -"} -(7,1,1) = {" -bA -hc -Uy -Kz -YL -nI -IX -Co -ej -sW -fy -IX -Gh -bA -"} -(8,1,1) = {" -bA -ER -iV -Gd -PA -yu -IX -Gv -Tk -gS -Yq -cq -IX -bA -"} -(9,1,1) = {" -bA -Bg -Ip -Ua -Uq -eZ -IX -Ci -dU -jE -rx -rb -Mu -bA -"} -(10,1,1) = {" -bA -QY -Ju -Lj -oj -Mt -IX -Eo -qb -Fa -fr -ST -Mu -bA -"} -(11,1,1) = {" -bA -uF -yI -yI -vN -yI -IX -IX -WT -IX -IX -IX -IX -bA -"} -(12,1,1) = {" -yI -yI -eE -NL -sN -yI -pN -Bl -HJ -Gf -Cs -Mh -Sn -Sn -"} -(13,1,1) = {" -yI -YE -Cm -Ds -bQ -yI -MT -zA -DS -jk -Qj -BN -Jo -Sn -"} -(14,1,1) = {" -yI -TS -WW -ZG -Um -dq -wa -hK -mF -Gf -oR -lX -Az -BA -"} -(15,1,1) = {" -yI -cx -hY -rt -xL -dq -DY -Ha -dB -Gf -sy -IF -is -Sn -"} -(16,1,1) = {" -tt -yI -BE -fX -Fz -yI -uK -Rj -NY -Gf -Wl -pW -Sn -eS -"} -(17,1,1) = {" -bA -tt -yI -yI -iL -yI -Gf -XO -GK -Gf -Sn -Sn -eS -bA -"} -(18,1,1) = {" -bA -bA -Gf -jF -gj -rO -At -DJ -Bu -Cr -Es -of -bA -bA -"} -(19,1,1) = {" -bA -bA -dJ -Ov -qW -Ab -lM -lE -GI -nW -yE -of -bA -bA -"} -(20,1,1) = {" -bA -bA -ka -Gf -oN -Gf -tc -YO -Gf -XR -Gf -Gf -bA -bA -"} -(21,1,1) = {" -bA -bA -eF -VR -Zx -Gf -rh -py -Gf -SH -fR -mz -bA -bA -"} -(22,1,1) = {" -bA -bA -ka -qN -MA -Gf -mV -Fu -Gf -rL -Hw -UP -vo -bA -"} -(23,1,1) = {" -bA -bA -cR -cR -cR -cR -cR -wu -cR -cR -cR -Sd -bA -bA -"} -(24,1,1) = {" -bA -bA -rk -gH -Fy -cR -tD -em -XM -dI -Ew -cR -bA -bA -"} -(25,1,1) = {" -bA -bA -rk -zv -cC -sc -JE -Yh -LE -Xr -Zh -zu -bA -bA -"} -(26,1,1) = {" -bA -bA -Gu -cR -Ok -cR -Yn -Nr -YM -GF -zu -hk -bA -bA -"} -(27,1,1) = {" -bA -bA -bA -EO -cR -cR -kJ -tQ -zu -Gm -hk -bA -bA -bA -"} -(28,1,1) = {" -bA -bA -bA -bA -bA -Gu -Gm -Gm -qL -bA -bA -bA -bA -bA -"} diff --git a/_maps/shuttles/minutemen/minutemen_vela.dmm b/_maps/shuttles/minutemen/minutemen_vela.dmm index ab113e52e2c5..2f39a367d761 100644 --- a/_maps/shuttles/minutemen/minutemen_vela.dmm +++ b/_maps/shuttles/minutemen/minutemen_vela.dmm @@ -5893,10 +5893,6 @@ }, /obj/structure/table, /obj/machinery/firealarm/directional/south, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 9; - pixel_y = 4 - }, /obj/item/flashlight/lamp{ pixel_x = -7; pixel_y = 4 @@ -9115,7 +9111,7 @@ /area/ship/hallway/fore) "XC" = ( /obj/structure/table, -/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering, /turf/open/floor/wood, /area/ship/hallway/central) "XJ" = ( diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index f230095f1023..935f0a2595d3 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -1365,7 +1365,7 @@ pixel_x = 6; pixel_y = -3 }, -/obj/item/book/manual/wiki/engineering_guide{ +/obj/item/book/manual/wiki/engineering{ pixel_x = -3; pixel_y = -8 }, @@ -6501,7 +6501,7 @@ /obj/item/survey_handheld{ pixel_x = -2 }, -/obj/item/book/manual/wiki/robotics_cyborgs{ +/obj/item/book/manual/wiki/robotics{ pixel_y = -1; pixel_x = 5 }, @@ -11794,10 +11794,6 @@ /area/ship/engineering/electrical) "Se" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 5; - pixel_y = 2 - }, /obj/item/cigbutt/cigarbutt{ pixel_x = 8; pixel_y = -1 @@ -12200,10 +12196,6 @@ /area/ship/engineering/engine) "TE" = ( /obj/structure/table, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -5; - pixel_y = 16 - }, /obj/machinery/light/directional/west{ light_color = "#e8eaff" }, @@ -13955,10 +13947,6 @@ /area/ship/crew/canteen) "ZX" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 4; - pixel_y = 2 - }, /obj/machinery/door/window/brigdoor/southright, /obj/machinery/door/window/brigdoor/southright{ dir = 1; diff --git a/_maps/shuttles/pirate/pirate_ember.dmm b/_maps/shuttles/pirate/pirate_ember.dmm index a44c02e8a814..cff10d5446b4 100644 --- a/_maps/shuttles/pirate/pirate_ember.dmm +++ b/_maps/shuttles/pirate/pirate_ember.dmm @@ -8676,7 +8676,7 @@ /obj/structure/closet/crate/trashcart, /obj/item/trash/candy, /obj/effect/decal/cleanable/vomit/old, -/obj/item/book/manual/wiki/chemistry{ +/obj/item/book/manual/wiki/ghetto_chemistry{ pixel_x = 6; pixel_y = -5 }, @@ -9360,7 +9360,7 @@ /obj/structure/table/reinforced{ color = "#c1b6a5" }, -/obj/item/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/hacking{ pixel_x = 5; pixel_y = 4 }, diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm new file mode 100644 index 000000000000..5d8cb37ffc6b --- /dev/null +++ b/_maps/shuttles/roumain/srm_elder.dmm @@ -0,0 +1,5504 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ac" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"af" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/wood/maple, +/area/ship/crew/cryo) +"ag" = ( +/obj/effect/turf_decal/trimline/opaque/orange/line{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "1-10" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"al" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"ap" = ( +/obj/effect/turf_decal/spline/fancy/wood/corner, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"aq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"au" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/spline/fancy/wood/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"aF" = ( +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"aM" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"aO" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"aP" = ( +/turf/closed/wall/r_wall, +/area/ship/bridge) +"aS" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"aY" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass/ship/jungle, +/area/ship/bridge) +"bi" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + id = "elderrearshuts"; + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"bj" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/brown{ + dir = 6 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"bm" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"bv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"bN" = ( +/obj/machinery/suit_storage_unit/inherit, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/clothing/suit/space/eva{ + pixel_x = -8 + }, +/obj/item/clothing/mask/breath{ + pixel_y = 9; + pixel_x = -6 + }, +/obj/item/clothing/head/helmet/space/eva{ + pixel_y = 8; + pixel_x = 8 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"bO" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters{ + id = "elderbayshutters" + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) +"bW" = ( +/turf/open/floor/engine/hull, +/area/ship/external/dark) +"bY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters{ + id = "elderemergencyairlockshuts" + }, +/turf/open/floor/plating, +/area/ship/hallway/port) +"ce" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"cg" = ( +/obj/structure/closet/emcloset/wall{ + pixel_y = 28 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"cj" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/stack/ore/glass/basalt{ + amount = 25; + pixel_y = -2; + pixel_x = -9 + }, +/obj/item/stack/ore/glass/basalt{ + amount = 25; + pixel_y = -2; + pixel_x = -9 + }, +/obj/item/stack/ore/glass/basalt{ + amount = 25; + pixel_y = -2; + pixel_x = -9 + }, +/obj/item/stack/ore/glass/basalt{ + amount = 25; + pixel_y = -2; + pixel_x = -9 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"co" = ( +/obj/structure/chair/pew/right{ + dir = 8 + }, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"cp" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"cw" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 2; + id = "elderatriumshuts" + }, +/turf/open/floor/plating, +/area/ship/roumain) +"cz" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"cJ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 8 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"cN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters{ + id = "elderemergencyairlockshuts" + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) +"cR" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/medical/glass{ + name = "Medical Bay"; + dir = 4 + }, +/obj/effect/turf_decal/siding/blue/end{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"cU" = ( +/obj/structure/destructible/tribal_torch, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"cY" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/ammo/a850r{ + pixel_y = 14; + pixel_x = 5 + }, +/obj/item/ammo_box/c38_box{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/ammo_box/c38_box{ + pixel_x = -6; + pixel_y = 1 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 8; + pixel_y = -2 + }, +/turf/open/floor/wood/ebony, +/area/ship/storage) +"de" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"dn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/spline/fancy/wood/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"dq" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 6 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"ds" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/structure/destructible/tribal_torch, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/maple, +/area/ship/storage) +"dt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/structure/destructible/tribal_torch{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) +"dL" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"dR" = ( +/obj/structure/destructible/tribal_torch, +/turf/open/floor/ship/dirt/dark, +/area/ship/roumain) +"dV" = ( +/obj/structure/chair/pew/left{ + dir = 4 + }, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"ef" = ( +/obj/effect/turf_decal/siding/brown, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"ei" = ( +/turf/open/floor/wood/ebony, +/area/ship/roumain) +"el" = ( +/obj/structure/rack, +/obj/item/stack/sheet/metal/twenty{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/stack/sheet/glass/twenty{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/stack/sheet/mineral/wood/twentyfive, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/head/welding{ + pixel_x = 5; + pixel_y = -4 + }, +/turf/open/floor/wood/ebony, +/area/ship/storage) +"eH" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "elderengineshuts"; + name = "Engine Shutters"; + dir = 2; + pixel_x = 7; + pixel_y = 21 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"eU" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/item/lighter{ + pixel_x = -2; + pixel_y = 2 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"eZ" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"fa" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"fe" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/spline/fancy/wood/cee, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/command{ + name = "Bridge" + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"ff" = ( +/obj/structure/destructible/tribal_torch{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"fi" = ( +/turf/closed/wall/r_wall, +/area/ship/medical) +"fm" = ( +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/structure/destructible/tribal_torch, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"fs" = ( +/obj/structure/fermenting_barrel, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"fz" = ( +/obj/structure/table/wood, +/obj/item/toy/cards/deck{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/toy/cards/deck/tarot{ + pixel_y = 7; + pixel_x = 8 + }, +/obj/item/toy/cards/deck/kotahi{ + pixel_y = 10; + pixel_x = -4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/wood/maple, +/area/ship/hallway/port) +"fC" = ( +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"fP" = ( +/obj/machinery/holopad/emergency/command, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"gb" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"gd" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"ge" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"gi" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown/corner, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"gE" = ( +/obj/structure/table/wood, +/obj/item/storage/pill_bottle/dice, +/turf/open/floor/wood/maple, +/area/ship/hallway/port) +"gG" = ( +/obj/machinery/power/port_gen/pacman, +/obj/item/stack/sheet/mineral/plasma/twenty, +/obj/effect/turf_decal/trimline/opaque/orange/filled, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"gK" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/wood/ebony, +/area/ship/storage) +"gO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) +"gR" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/breakawayflask{ + pixel_x = -6; + pixel_y = 13 + }, +/obj/item/reagent_containers/food/drinks/breakawayflask{ + pixel_x = 6; + pixel_y = 7 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"hc" = ( +/obj/effect/turf_decal/siding/brown{ + 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/wood/ebony, +/area/ship/hallway/starboard) +"hg" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"hh" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"hl" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"hp" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/structure/cable/pink{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "elderengineshuts" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"hT" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"hV" = ( +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "elderbayholos"; + locked = 1 + }, +/obj/structure/cable{ + icon_state = "0-5" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters{ + id = "elderbayshutters" + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) +"hZ" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/cable/pink{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"ie" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"ih" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/trimline/opaque/orange/filled, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"ir" = ( +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"iB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 10 + }, +/obj/structure/closet/emcloset/wall{ + dir = 8; + pixel_x = 28 + }, +/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) +"iP" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"iR" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"iT" = ( +/obj/structure/closet/firecloset/wall{ + pixel_y = 28 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"iY" = ( +/obj/structure/cable{ + icon_state = "1-6" + }, +/obj/structure/cable{ + icon_state = "1-10" + }, +/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/trimline/opaque/syndiered/end, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"ji" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 6 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"jk" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/breakawayflask{ + pixel_x = 6; + pixel_y = 15 + }, +/obj/item/reagent_containers/food/drinks/breakawayflask{ + pixel_x = -6; + pixel_y = 10 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"jl" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"jm" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"jr" = ( +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"jv" = ( +/obj/structure/closet/firecloset/wall{ + pixel_y = 28 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"jG" = ( +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 1; + name = "Air Supply Pump" + }, +/obj/effect/turf_decal/trimline/opaque/orange/line{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) +"jV" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "elderatriumshuts" + }, +/turf/open/floor/plating, +/area/ship/roumain) +"ko" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters{ + dir = 2; + id = "elderatriumshuts" + }, +/turf/open/floor/plating, +/area/ship/storage) +"kq" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"kD" = ( +/obj/structure/destructible/tribal_torch{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"kL" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + id = "elderemergencyairlockshuts" + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) +"kN" = ( +/obj/structure/kitchenspike, +/turf/open/floor/ship/dirt/dark, +/area/ship/roumain) +"lb" = ( +/obj/machinery/door/window{ + dir = 8 + }, +/obj/effect/turf_decal/stoneborder{ + dir = 1 + }, +/obj/effect/turf_decal/stoneborder, +/obj/item/towel, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/starboard) +"lf" = ( +/obj/structure/chair/pew/right{ + dir = 4 + }, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"lg" = ( +/obj/item/book/manual/srmlore{ + pixel_y = 13; + pixel_x = 2 + }, +/obj/item/candle/infinite{ + pixel_y = 19; + pixel_x = -8 + }, +/obj/item/candle/infinite{ + pixel_y = 10; + pixel_x = -8 + }, +/obj/item/candle/infinite{ + pixel_y = 1; + pixel_x = -8 + }, +/obj/item/candle/infinite{ + pixel_y = 1; + pixel_x = -3 + }, +/obj/item/candle/infinite{ + pixel_y = 1; + pixel_x = 3 + }, +/obj/item/candle/infinite{ + pixel_y = 1; + pixel_x = 9 + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/structure/table/wood/fancy, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"li" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"lk" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"lA" = ( +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/mining/independent, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"lM" = ( +/turf/closed/wall/r_wall, +/area/ship/engineering/atmospherics) +"md" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"mj" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"mr" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "elderatriumshuts" + }, +/turf/open/floor/plating, +/area/ship/roumain) +"mw" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/seeds/cotton, +/obj/item/seeds/cotton, +/obj/item/seeds/lavaland/ember, +/obj/item/seeds/lavaland/ember, +/obj/item/seeds/lavaland/inocybe, +/obj/item/seeds/lavaland/inocybe, +/obj/item/seeds/lavaland/polypore, +/obj/item/seeds/lavaland/polypore, +/obj/item/seeds/lavaland/porcini, +/obj/item/seeds/lavaland/porcini, +/obj/item/seeds/lavaland/cactus, +/obj/item/seeds/lavaland/cactus, +/obj/item/seeds/wheat, +/obj/item/seeds/wheat, +/obj/item/seeds/carrot, +/obj/item/seeds/carrot, +/obj/item/seeds/lavaland/puce, +/obj/item/seeds/lavaland/puce, +/obj/item/seeds/tobacco, +/obj/item/seeds/tobacco, +/obj/item/seeds/tea, +/obj/item/seeds/tea, +/obj/item/seeds/coffee, +/obj/item/seeds/coffee, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"mA" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"mD" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/orange/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) +"mE" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters{ + id = "elderrearshuts"; + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"mS" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown, +/obj/structure/destructible/tribal_torch, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"mW" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + dir = 2; + id = "elderatriumshuts" + }, +/turf/open/floor/plating, +/area/ship/roumain) +"na" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/closed/wall/r_wall, +/area/ship/engineering/atmospherics) +"nj" = ( +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"nk" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/wood/maple, +/area/ship/roumain) +"nt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/effect/turf_decal/siding/blue/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"nO" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/syringe/calomel{ + pixel_x = 3; + pixel_y = -5 + }, +/obj/item/reagent_containers/syringe/antiviral{ + pixel_y = -6; + pixel_x = 8 + }, +/obj/item/reagent_containers/hypospray/medipen/stimpack{ + pixel_x = -4 + }, +/obj/item/reagent_containers/hypospray/medipen/survival{ + pixel_x = -7; + pixel_y = -5 + }, +/obj/item/reagent_containers/glass/bottle/potass_iodide{ + pixel_y = 10; + pixel_x = -7 + }, +/obj/item/reagent_containers/glass/bottle/atropine{ + pixel_y = 9 + }, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"nZ" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 10 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"os" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + dir = 2; + id = "elderatriumshuts" + }, +/turf/open/floor/plating, +/area/ship/medical) +"ou" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"ox" = ( +/obj/structure/guncase, +/obj/machinery/door/window/eastright{ + dir = 8 + }, +/obj/item/gun/ballistic/shotgun/flamingarrow{ + pixel_y = -5 + }, +/obj/item/gun/ballistic/shotgun/flamingarrow{ + pixel_y = 0 + }, +/obj/item/gun/ballistic/shotgun/flamingarrow/bolt{ + pixel_y = 5 + }, +/turf/open/floor/wood/ebony, +/area/ship/storage) +"oC" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters{ + dir = 2; + id = "elderatriumshuts" + }, +/turf/open/floor/plating, +/area/ship/roumain) +"oE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"oY" = ( +/obj/machinery/power/shuttle/engine/fueled/plasma{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"pb" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/port) +"pd" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lantern{ + pixel_y = 2; + pixel_x = 7 + }, +/obj/item/flashlight/lantern{ + pixel_y = 2; + pixel_x = 7 + }, +/obj/item/flashlight/lantern{ + pixel_y = 2; + pixel_x = 7 + }, +/obj/item/flashlight/lantern{ + pixel_y = 2; + pixel_x = 7 + }, +/obj/item/flashlight/lantern{ + pixel_y = 2; + pixel_x = 7 + }, +/obj/item/flashlight/lantern{ + pixel_y = 2; + pixel_x = 7 + }, +/obj/item/flashlight/lantern{ + pixel_y = 2; + pixel_x = 7 + }, +/obj/item/radio{ + pixel_y = 3; + pixel_x = -5 + }, +/obj/item/radio{ + pixel_y = 3; + pixel_x = -5 + }, +/obj/item/radio{ + pixel_y = 3; + pixel_x = -5 + }, +/obj/item/radio{ + pixel_y = 3; + pixel_x = -5 + }, +/obj/item/radio{ + pixel_y = 3; + pixel_x = -5 + }, +/obj/item/radio{ + pixel_y = 3; + pixel_x = -5 + }, +/obj/item/radio{ + pixel_y = 3; + pixel_x = -5 + }, +/turf/open/floor/wood/ebony, +/area/ship/crew/cryo) +"pH" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"qv" = ( +/obj/structure/cable{ + icon_state = "2-9" + }, +/obj/structure/cable{ + icon_state = "9-10" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"qz" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"qB" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/wood/ebony, +/area/ship/crew/cryo) +"qD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/destructible/tribal_torch, +/obj/machinery/atmospherics/components/binary/valve/layer4{ + dir = 1; + name = "Disposals Outlet Valve" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"qJ" = ( +/obj/structure/destructible/tribal_torch, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"qN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/spline/fancy/wood/corner, +/obj/effect/turf_decal/spline/fancy/wood/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"qQ" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 24 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"qZ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"re" = ( +/obj/vehicle/ridden/wheelchair{ + dir = 4 + }, +/obj/item/melee/transforming/cleaving_saw/old, +/turf/open/floor/ship/dirt/dark, +/area/ship/bridge) +"rj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/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/airlock/maintenance{ + name = "Equipment"; + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"rv" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"rD" = ( +/obj/structure/window/reinforced/tinted/frosted, +/obj/structure/toilet{ + dir = 8; + pixel_y = 9; + pixel_x = 7 + }, +/obj/effect/turf_decal/stoneborder, +/obj/effect/turf_decal/stoneborder{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/starboard) +"rE" = ( +/obj/machinery/atmospherics/components/unary/shuttle/heater{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "elderengineshuts" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"rK" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"rW" = ( +/obj/machinery/smartfridge/drying_rack, +/turf/open/floor/ship/dirt/dark, +/area/ship/roumain) +"sb" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 10 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"sc" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/stack/marker_beacon/thirty{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/stack/marker_beacon/thirty{ + pixel_x = -6; + pixel_y = 1 + }, +/obj/item/stack/marker_beacon/thirty{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/stack/marker_beacon/thirty{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/mining_scanner{ + pixel_x = 5; + pixel_y = -4 + }, +/obj/item/mining_scanner{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/mining_scanner{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"sm" = ( +/obj/docking_port/stationary{ + width = 30; + height = 15; + dwidth = 15 + }, +/turf/template_noop, +/area/template_noop) +"sr" = ( +/obj/structure/table/wood, +/obj/item/paper_bin/bundlenatural{ + pixel_y = 4 + }, +/obj/item/pen/charcoal, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"ss" = ( +/obj/structure/railing, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"sA" = ( +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) +"sD" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-6" + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"sH" = ( +/turf/template_noop, +/area/template_noop) +"sT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/wood/maple, +/area/ship/storage) +"ts" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/siding/blue, +/obj/effect/turf_decal/siding/blue/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/blue/corner{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"tC" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 5 + }, +/obj/structure/destructible/tribal_torch{ + pixel_y = 13; + pixel_x = 1 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"tF" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/item/toy/plush/mora, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"uc" = ( +/obj/effect/turf_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"up" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/glass/bowl/mushroom_bowl{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/reagent_containers/glass/mortar{ + pixel_y = 9; + pixel_x = 6 + }, +/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit, +/obj/item/pestle{ + pixel_y = 6 + }, +/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf, +/obj/item/reagent_containers/food/snacks/meat/slab/bear{ + pixel_y = 1; + pixel_x = -7 + }, +/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"ut" = ( +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 1; + piping_layer = 2 + }, +/obj/effect/turf_decal/trimline/opaque/orange/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) +"uM" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_y = 16; + pixel_x = 5 + }, +/obj/item/clothing/mask/cigarette/cigar/havana{ + pixel_x = 7; + pixel_y = -1 + }, +/obj/item/storage/box/matches{ + pixel_y = 8; + pixel_x = -9 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_y = 16; + pixel_x = -6 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"uP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"uV" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"uW" = ( +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"uY" = ( +/obj/structure/ore_box, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"va" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/wood/maple, +/area/ship/storage) +"vd" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"vm" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + dir = 2; + id = "elderatriumshuts" + }, +/turf/open/floor/plating, +/area/ship/storage) +"vn" = ( +/obj/structure/destructible/tribal_torch{ + pixel_x = -8 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/arrow_cw{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"vz" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"vC" = ( +/turf/closed/wall/r_wall, +/area/ship/hallway/port) +"vG" = ( +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 1; + name = "Air Supply Pump" + }, +/obj/effect/turf_decal/trimline/opaque/orange/line{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) +"vH" = ( +/obj/structure/sink{ + dir = 4; + pixel_y = 8; + pixel_x = -14 + }, +/obj/effect/turf_decal/spline/fancy/wood/corner, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/turf/open/floor/wood/mahogany, +/area/ship/hallway/starboard) +"vX" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/port) +"wm" = ( +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) +"wp" = ( +/turf/closed/wall/r_wall, +/area/ship/roumain) +"wy" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/junglebush/c, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"wA" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"wC" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"wD" = ( +/obj/structure/destructible/tribal_torch, +/turf/open/floor/grass/ship/jungle, +/area/ship/bridge) +"wE" = ( +/obj/structure/closet/firecloset/wall{ + dir = 4; + pixel_x = -28 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"xe" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) +"xv" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"xC" = ( +/turf/open/floor/ship/dirt/dark, +/area/ship/bridge) +"xD" = ( +/mob/living/simple_animal/cow, +/turf/open/floor/ship/dirt/dark, +/area/ship/roumain) +"xN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/crew/cryo) +"yn" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) +"yp" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 8 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"yq" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/closet/crate/miningcar, +/obj/item/storage/box/emptysandbags, +/obj/item/storage/box/emptysandbags, +/obj/item/storage/box/emptysandbags, +/obj/item/storage/box/emptysandbags, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"yz" = ( +/turf/closed/wall/r_wall, +/area/ship/crew/cryo) +"yA" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 9 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/destructible/tribal_torch{ + pixel_y = 13; + pixel_x = -4 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"yN" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/ship/dirt/dark, +/area/ship/roumain) +"yV" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"yZ" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/junglebush/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"zc" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"zv" = ( +/obj/structure/closet/secure_closet/montagnes, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/under/suit/roumain, +/obj/item/clothing/suit/armor/hos/roumain/montagne, +/obj/item/clothing/head/HoS/cowboy/montagne, +/obj/item/flashlight/lantern, +/obj/item/storage/fancy/candle_box{ + pixel_y = 3; + pixel_x = 8 + }, +/obj/item/lighter{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/kitchen/knife/combat, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 5 + }, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/gun/ballistic/revolver/montagne, +/obj/item/ammo_box/c38/match, +/obj/item/ammo_box/c38/match, +/obj/item/storage/backpack/satchel/leather, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"zH" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"zT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"zX" = ( +/obj/structure/table/wood, +/obj/machinery/fax, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"zY" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/destructible/tribal_torch, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/maple, +/area/ship/storage) +"zZ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"Ac" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Ao" = ( +/obj/item/toy/plush/snakeplushie, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/bridge) +"Aq" = ( +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"Ar" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "elderbridgeforeshuts" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"At" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine{ + pixel_y = 13; + pixel_x = -6 + }, +/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine{ + pixel_y = 7; + pixel_x = 6 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"AL" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"AM" = ( +/obj/structure/chair/pew{ + dir = 8 + }, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"AN" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"AQ" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/sign/warning/nosmoking{ + pixel_y = 28 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"AS" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/mug/tea{ + pixel_y = 3; + pixel_x = -4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"AX" = ( +/obj/structure/flora/rock/jungle, +/turf/open/floor/grass/ship/jungle, +/area/ship/bridge) +"AY" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/port) +"AZ" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"Bi" = ( +/obj/structure/rack, +/obj/machinery/door/window{ + dir = 8 + }, +/obj/item/gun/ballistic/rifle/illestren{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/gun/ballistic/rifle/illestren{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/gun/ballistic/rifle/illestren{ + pixel_x = -4; + pixel_y = 3 + }, +/turf/open/floor/wood/ebony, +/area/ship/storage) +"Bq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/siding/blue/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"Bt" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"Bu" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/mob/living/simple_animal/pet/mothroach{ + name = "Rom"; + desc = "You've never seen a more vacuous mothroach." + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"Bx" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"BA" = ( +/turf/closed/wall/r_wall, +/area/ship/hallway/starboard) +"BB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"BJ" = ( +/obj/structure/crate_shelf, +/obj/structure/closet/crate, +/obj/item/reagent_containers/food/snacks/meat/steak{ + pixel_y = 7; + pixel_x = -3 + }, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ + pixel_y = 6; + pixel_x = 4 + }, +/obj/item/reagent_containers/food/snacks/meat/steak{ + pixel_y = 0; + pixel_x = -9 + }, +/obj/item/reagent_containers/food/snacks/meat/steak{ + pixel_y = -6; + pixel_x = 5 + }, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ + pixel_y = -4; + pixel_x = -6 + }, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ + pixel_y = 5; + pixel_x = -6 + }, +/turf/open/floor/wood/ebony, +/area/ship/storage) +"BK" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters{ + id = "elderrearshuts" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"BO" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) +"Cr" = ( +/obj/structure/closet/emcloset/wall{ + dir = 4; + pixel_x = -28 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"Cx" = ( +/obj/structure/table/wood, +/obj/item/lighter{ + pixel_y = 5; + pixel_x = -6 + }, +/obj/item/book/manual/srmlore{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/book/manual/srmlore{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/book/manual/srmlore{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/book/manual/srmlore{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/book/manual/srmlore{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/book/manual/srmlore{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/book/manual/srmlore{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/lighter{ + pixel_y = 5; + pixel_x = -6 + }, +/obj/item/lighter{ + pixel_y = 5; + pixel_x = -6 + }, +/obj/item/lighter{ + pixel_y = 5; + pixel_x = -6 + }, +/obj/item/lighter{ + pixel_y = 5; + pixel_x = -6 + }, +/obj/item/lighter{ + pixel_y = 5; + pixel_x = -6 + }, +/turf/open/floor/wood/ebony, +/area/ship/crew/cryo) +"CC" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + id = "elderemergencyairlockshuts" + }, +/turf/open/floor/plating, +/area/ship/hallway/port) +"CF" = ( +/obj/structure/closet/emcloset/wall{ + pixel_y = 28 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"CH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/airlock/grunge{ + dir = 4; + name = "Engine Room" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) +"Dg" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown, +/obj/structure/destructible/tribal_torch, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"Dz" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"DL" = ( +/obj/structure/destructible/tribal_torch{ + pixel_y = 18 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"DR" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/maple, +/area/ship/roumain) +"DS" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"DV" = ( +/obj/structure/flora/driftlog, +/turf/open/floor/plating/ship/water, +/area/ship/roumain) +"Eh" = ( +/obj/structure/table/wood, +/obj/item/spear/bonespear{ + pixel_y = -3; + pixel_x = 2 + }, +/obj/item/spear/bonespear{ + pixel_y = 1; + pixel_x = 2 + }, +/obj/item/spear/bonespear{ + pixel_y = 5; + pixel_x = 2 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"Eq" = ( +/obj/effect/turf_decal/siding/brown/corner, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"Et" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"EJ" = ( +/obj/structure/table/wood, +/obj/item/book/manual/trickwines_4_brewers, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"EN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Fa" = ( +/obj/structure/railing/corner, +/obj/structure/flora/grass/jungle, +/turf/open/floor/ship/dirt/dark, +/area/ship/roumain) +"Fn" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Fp" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"Fr" = ( +/obj/structure/crate_shelf, +/obj/structure/closet/crate{ + name = "Fishing Crate" + }, +/obj/item/storage/toolbox/fishing{ + pixel_x = -3; + pixel_y = -6 + }, +/obj/item/storage/toolbox/fishing{ + pixel_x = 3; + pixel_y = -6 + }, +/obj/item/storage/toolbox/fishing{ + pixel_y = 0 + }, +/turf/open/floor/wood/ebony, +/area/ship/storage) +"Fu" = ( +/obj/effect/turf_decal/trimline/opaque/orange/line, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"FF" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) +"FG" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-5" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"FW" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Ga" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 8 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) +"GM" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood/maple, +/area/ship/roumain) +"GP" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/brown{ + dir = 6 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Hw" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/wood/maple, +/area/ship/crew/cryo) +"Hx" = ( +/obj/structure/destructible/tribal_torch{ + pixel_y = 6; + pixel_x = 10 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"HA" = ( +/obj/item/clothing/under/suit/roumain, +/obj/item/clothing/suit/armor/roumain, +/obj/item/clothing/head/cowboy/sec/roumain, +/obj/item/clothing/suit/armor/riot/chaplain/witchhunter, +/obj/item/flashlight/lantern, +/obj/structure/closet/secure_closet/hunter, +/obj/item/lighter, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/combat, +/obj/item/kitchen/knife/combat/survival, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/storage/backpack/satchel/leather, +/turf/open/floor/wood/ebony, +/area/ship/storage) +"HB" = ( +/obj/structure/closet/wall/blue{ + dir = 8; + pixel_x = 28; + name = "Spare EVA Closet" + }, +/obj/item/clothing/suit/space/eva{ + pixel_x = -8 + }, +/obj/item/clothing/head/helmet/space/eva{ + pixel_y = 8; + pixel_x = 8 + }, +/obj/item/clothing/mask/breath{ + pixel_y = 9; + pixel_x = -6 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 7; + pixel_y = -7 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/arrow_ccw{ + dir = 8 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"HO" = ( +/obj/structure/chair/wood/wings, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"Ii" = ( +/obj/structure/closet/firecloset/wall{ + dir = 8; + pixel_x = 28 + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"Il" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"Im" = ( +/obj/structure/destructible/tribal_torch{ + pixel_x = -10 + }, +/obj/effect/turf_decal/spline/fancy/wood/cee, +/turf/open/floor/wood/mahogany, +/area/ship/hallway/starboard) +"In" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Ir" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/airlock/glass{ + dir = 4; + name = "Atrium" + }, +/turf/open/floor/wood/maple, +/area/ship/roumain) +"ID" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"IF" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"IM" = ( +/obj/item/candle/infinite{ + pixel_y = 11; + pixel_x = 9 + }, +/obj/item/candle/infinite{ + pixel_y = 11; + pixel_x = -8 + }, +/obj/item/candle/infinite{ + pixel_y = 11; + pixel_x = -3 + }, +/obj/item/candle/infinite{ + pixel_y = 11; + pixel_x = 3 + }, +/obj/item/candle/infinite{ + pixel_y = 2; + pixel_x = -8 + }, +/obj/item/candle/infinite{ + pixel_y = -6; + pixel_x = -8 + }, +/obj/item/disk/holodisk/roumain{ + pixel_x = 2; + pixel_y = -3 + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/structure/table/wood/fancy, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"IZ" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters{ + id = "elderrearshuts"; + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"Jc" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Jn" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"Jr" = ( +/obj/structure/cable{ + icon_state = "4-9" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Ju" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/end{ + dir = 1 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"Jx" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/siding/brown, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Jy" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 10 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"JD" = ( +/obj/structure/cable{ + icon_state = "0-5" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 10 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"JG" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/wood/maple, +/area/ship/crew/cryo) +"JO" = ( +/obj/structure/flora/junglebush, +/turf/open/floor/plating/ship/water, +/area/ship/roumain) +"Kd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Equipment"; + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"Kk" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/port) +"KO" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/ship/dirt/dark, +/area/ship/roumain) +"KP" = ( +/obj/item/flashlight/lamp/green{ + pixel_y = 12; + pixel_x = 4 + }, +/obj/structure/table/wood, +/turf/open/floor/wood/ebony, +/area/ship/crew/cryo) +"KQ" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_y = 6; + pixel_x = 2 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2 + }, +/obj/item/weldingtool{ + pixel_y = 0; + pixel_x = -5 + }, +/turf/open/floor/wood/ebony, +/area/ship/storage) +"KX" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/item/stack/sheet/mineral/plasma/twenty, +/obj/effect/turf_decal/trimline/opaque/orange/filled, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Lj" = ( +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) +"Lk" = ( +/mob/living/simple_animal/chicken, +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"LG" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/siding/brown, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"LL" = ( +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/structure/cable{ + icon_state = "2-5" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"LN" = ( +/turf/closed/wall/r_wall, +/area/ship/storage) +"LS" = ( +/obj/machinery/advanced_airlock_controller{ + pixel_x = -25; + pixel_y = 3 + }, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) +"LX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"Ma" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"Mh" = ( +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/medical/glass{ + name = "Medical Bay"; + dir = 2 + }, +/obj/effect/turf_decal/siding/blue/end{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"Mj" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/cable/pink{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"My" = ( +/turf/closed/wall/r_wall, +/area/ship/hallway/central) +"Mz" = ( +/obj/structure/loom, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"MG" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "elderatriumshuts"; + name = "Atrium Shutters"; + dir = 8; + pixel_y = 11; + pixel_x = 21 + }, +/obj/machinery/button/door{ + id = "elderrearshuts"; + name = "Bridge Rear Shutters"; + dir = 8; + pixel_y = 2; + pixel_x = 21 + }, +/obj/machinery/button/door{ + id = "elderbridgeforeshuts"; + name = "Bridge Fore Shutters"; + dir = 8; + pixel_x = 21; + pixel_y = -7 + }, +/obj/machinery/button/door{ + id = "elderengineshuts"; + name = "Engine Shutters"; + dir = 8; + pixel_y = -16; + pixel_x = 21 + }, +/obj/item/binoculars{ + pixel_y = 0; + pixel_x = -4 + }, +/obj/item/megaphone{ + pixel_y = 9; + pixel_x = 3 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"MH" = ( +/obj/machinery/cryopod, +/turf/open/floor/wood/ebony, +/area/ship/crew/cryo) +"MM" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "elderatriumshuts" + }, +/turf/open/floor/plating, +/area/ship/roumain) +"MR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/wood/maple, +/area/ship/crew/cryo) +"MU" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"MV" = ( +/obj/machinery/atmospherics/components/unary/shuttle/heater{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "elderengineshuts" + }, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"MW" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood/end, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass{ + name = "Cryopods" + }, +/turf/open/floor/wood/maple, +/area/ship/crew/cryo) +"MZ" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + id = "elderrearshuts" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"Nd" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"Ng" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"Nm" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/airlock/grunge{ + dir = 4; + name = "Engine Room" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"No" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/holopad/emergency/command, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"Nq" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"NC" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/plating/ship/water, +/area/ship/roumain) +"NF" = ( +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"NH" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"NL" = ( +/turf/open/floor/ship/dirt/dark, +/area/ship/roumain) +"NT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"NX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/spline/fancy/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"Od" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/destructible/tribal_torch, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Oo" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"OA" = ( +/obj/structure/fermenting_barrel/distiller, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"OF" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"OO" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"OV" = ( +/obj/machinery/button/shieldwallgen{ + dir = 8; + pixel_x = 20; + pixel_y = 2; + id = "elderbayholos" + }, +/obj/machinery/button/door{ + id = "elderbayshutters"; + name = "Bay Shutters"; + dir = 8; + pixel_x = 22; + pixel_y = -6 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/arrow_ccw{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"Ph" = ( +/obj/effect/turf_decal/siding/wood/end, +/obj/machinery/door/airlock/maintenance{ + name = "Equipment" + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"Px" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/brown{ + dir = 5 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Py" = ( +/obj/machinery/power/shuttle/engine/fueled/plasma{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"PE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"PI" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood/end, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass{ + name = "Breezeway" + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"PZ" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Qi" = ( +/obj/structure/chair/wood, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"Qm" = ( +/obj/machinery/computer/cryopod/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/wood/maple, +/area/ship/crew/cryo) +"QA" = ( +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/structure/table/wood, +/obj/item/scalpel{ + pixel_y = 7; + pixel_x = 8 + }, +/obj/item/circular_saw{ + pixel_x = 6 + }, +/obj/item/cautery{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/retractor{ + pixel_x = -5 + }, +/obj/item/hemostat, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"QD" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"QE" = ( +/obj/structure/flora/junglebush/c, +/turf/open/floor/plating/ship/water, +/area/ship/roumain) +"QJ" = ( +/obj/item/soap/deluxe, +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/curtain/bounty, +/obj/effect/turf_decal/stoneborder{ + dir = 1 + }, +/obj/effect/turf_decal/stoneborder, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/starboard) +"QR" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"QX" = ( +/obj/structure/bonfire/dense, +/turf/open/floor/ship/dirt/dark, +/area/ship/roumain) +"Ra" = ( +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"Ri" = ( +/mob/living/simple_animal/chicken, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"Rm" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants, +/obj/item/hatchet, +/obj/item/shovel{ + pixel_x = 5 + }, +/obj/item/cultivator/rake{ + pixel_x = -4; + pixel_y = 0 + }, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"Rz" = ( +/obj/structure/chair/pew{ + dir = 4 + }, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"RC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"RF" = ( +/obj/structure/closet/secure_closet/medicalsrm, +/obj/item/storage/firstaid/roumain, +/obj/item/disk/holodisk/roumain, +/obj/item/clothing/head/cowboy/sec/roumain/med, +/obj/item/clothing/suit/toggle/labcoat/roumain_med, +/obj/item/clothing/under/suit/roumain, +/obj/item/storage/belt/medical, +/obj/item/healthanalyzer, +/obj/item/storage/firstaid, +/obj/item/storage/box/beakers, +/obj/item/storage/box/syringes, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/gloves, +/obj/item/storage/box/masks, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"RJ" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/button/door{ + id = "elderemergencyairlockshuts"; + name = "Airlock Shutters"; + pixel_y = 6; + pixel_x = -21; + dir = 4 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"RT" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/structure/cable/pink{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "elderengineshuts" + }, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"RW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/maple, +/area/ship/crew/cryo) +"Sg" = ( +/obj/machinery/computer/cargo/express{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"Sz" = ( +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/structure/cable{ + icon_state = "5-10" + }, +/obj/structure/cable{ + icon_state = "2-5" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"SL" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/organ_storage, +/obj/item/organ_storage, +/obj/item/organ_storage, +/obj/item/stack/medical/gauze/twelve, +/obj/item/stack/medical/gauze/twelve, +/obj/item/stack/medical/splint, +/obj/item/stack/medical/splint, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"SR" = ( +/obj/item/clothing/under/suit/roumain, +/obj/item/clothing/suit/armor/roumain/shadow, +/obj/item/clothing/head/cowboy/sec/roumain/shadow, +/obj/item/flashlight/lantern, +/obj/structure/closet/secure_closet/shadow, +/obj/item/lighter, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/shoes/combat, +/obj/item/kitchen/knife/hunting, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/storage/backpack/satchel/leather, +/turf/open/floor/wood/ebony, +/area/ship/storage) +"Tc" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "elderengineshuts"; + name = "Engine Shutters"; + dir = 1; + pixel_x = 7; + pixel_y = -21 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Tx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/destructible/tribal_torch{ + pixel_x = -7 + }, +/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) +"TO" = ( +/obj/machinery/autolathe, +/turf/open/floor/wood/ebony, +/area/ship/storage) +"TX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Ui" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"Ul" = ( +/obj/machinery/computer/helm{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"Un" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/wood/maple, +/area/ship/storage) +"Uu" = ( +/obj/docking_port/mobile{ + dir = 2; + preferred_direction = 4; + port_direction = 8 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) +"UD" = ( +/obj/structure/flora/rock/jungle, +/turf/open/floor/plating/ship/water, +/area/ship/roumain) +"US" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"UZ" = ( +/obj/structure/chair/pew/left{ + dir = 8 + }, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass/ship/jungle, +/area/ship/hallway/central) +"Vc" = ( +/obj/structure/table/wood, +/obj/item/storage/box/matches{ + pixel_y = 3 + }, +/obj/item/storage/fancy/cigarettes/cigpack_midori{ + pixel_y = 6; + pixel_x = -3 + }, +/obj/item/reagent_containers/food/drinks/mug/tea{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/port) +"Vn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"Vu" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/pickaxe{ + pixel_x = 1; + pixel_y = -4 + }, +/obj/item/pickaxe{ + pixel_x = 1; + pixel_y = 0 + }, +/obj/item/pickaxe{ + pixel_x = 1; + pixel_y = 4 + }, +/obj/item/pickaxe{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/item/shovel{ + pixel_x = -2; + pixel_y = -8 + }, +/obj/item/shovel{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/shovel{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/shovel{ + pixel_x = -2; + pixel_y = 11 + }, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"VI" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "elderrearshuts" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"VL" = ( +/obj/structure/cable{ + icon_state = "6-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/port) +"VQ" = ( +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + locked = 1; + id = "elderbayholos" + }, +/obj/structure/cable{ + icon_state = "0-9" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters{ + id = "elderbayshutters" + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) +"Wd" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom/wideband/table{ + dir = 4; + pixel_y = 2; + pixel_x = 1 + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"Wr" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"Wy" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/port) +"WJ" = ( +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"WS" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/airlock/glass{ + dir = 4; + name = "Atrium" + }, +/turf/open/floor/wood/maple, +/area/ship/roumain) +"WU" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Xn" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"Xq" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/open/floor/wood/maple, +/area/ship/storage) +"Xt" = ( +/turf/open/floor/plating/ship/water, +/area/ship/roumain) +"XH" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"XI" = ( +/obj/structure/destructible/tribal_torch{ + pixel_y = 2; + pixel_x = 9 + }, +/turf/open/floor/ship/dirt/dark, +/area/ship/roumain) +"XK" = ( +/obj/structure/table/wood, +/obj/item/folder/blue{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/folder/red, +/obj/item/folder/yellow{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/effect/turf_decal/spline/fancy/wood, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"XW" = ( +/mob/living/simple_animal/cow, +/turf/open/floor/grass/ship/jungle, +/area/ship/roumain) +"XY" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe{ + pixel_y = 8; + pixel_x = -6 + }, +/obj/item/book/manual/wiki/surgery, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"Yu" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "elderatriumshuts" + }, +/turf/open/floor/plating, +/area/ship/roumain) +"Yx" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/spline/fancy/wood/cee{ + dir = 1 + }, +/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/airlock/command{ + name = "Bridge" + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"YD" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/arrow_cw{ + dir = 4 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"YM" = ( +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/glass{ + name = "Breezeway" + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/central) +"YP" = ( +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) +"YT" = ( +/obj/structure/cable{ + icon_state = "4-10" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) +"YX" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/ship/dirt/dark, +/area/ship/roumain) +"Zh" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/wood{ + name = "Restroom" + }, +/obj/effect/turf_decal/spline/fancy/wood/cee{ + dir = 1 + }, +/turf/open/floor/wood/mahogany, +/area/ship/hallway/starboard) +"Zi" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/cigarettes/cigpack_midori, +/obj/item/lighter{ + pixel_y = 3; + pixel_x = 7 + }, +/turf/open/floor/wood/maple, +/area/ship/hallway/starboard) +"Zl" = ( +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 6 + }, +/obj/structure/table/wood, +/obj/item/paper/natural{ + pixel_y = 3 + }, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/pen/charcoal{ + pixel_x = -5 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"Zr" = ( +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/wood/ebony, +/area/ship/hallway/starboard) +"Zs" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/obj/effect/turf_decal/siding/blue/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"Zx" = ( +/obj/structure/flora/junglebush/b, +/turf/open/floor/plating/ship/water, +/area/ship/roumain) +"ZE" = ( +/obj/structure/window/reinforced/tinted/frosted, +/obj/structure/urinal{ + pixel_y = 29 + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/open/floor/wood/mahogany, +/area/ship/hallway/starboard) +"ZI" = ( +/obj/structure/closet/emcloset/wall{ + dir = 8; + pixel_x = 28 + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"ZK" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/mahogany, +/area/ship/bridge) +"ZW" = ( +/obj/structure/flora/tree/srm, +/turf/open/floor/ship/dirt/dark, +/area/ship/hallway/central) + +(1,1,1) = {" +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +"} +(2,1,1) = {" +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +"} +(3,1,1) = {" +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +"} +(4,1,1) = {" +sH +sH +sH +sH +sH +sH +oY +Mj +Mj +wm +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +lM +hZ +hZ +Py +sH +sH +sH +sH +"} +(5,1,1) = {" +sH +sH +sH +sH +sH +wm +rE +hp +hp +wm +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +lM +RT +RT +MV +lM +sH +sH +sH +"} +(6,1,1) = {" +sH +sH +sH +sH +sH +wm +Fn +FW +FW +wm +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +lM +jl +FG +rK +lM +sH +sH +sH +"} +(7,1,1) = {" +sH +sH +sH +sH +sH +wm +zH +NT +bm +wm +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +lM +YT +Lj +yn +lM +sH +sH +sH +"} +(8,1,1) = {" +sH +sH +sH +sH +wm +wm +fC +pH +Tc +wm +wm +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +lM +lM +eH +uP +aF +lM +lM +sH +sH +"} +(9,1,1) = {" +sH +sH +sH +sH +wm +KX +gG +zT +LL +Od +wm +sH +sH +sH +sH +sH +bi +mE +mE +mE +IZ +sH +sH +sH +sH +gO +na +qD +fa +QD +vG +ut +lM +sH +sH +"} +(10,1,1) = {" +sH +sH +sH +sH +wm +AQ +Fu +Sz +DS +Et +wm +sH +sH +sH +sH +bi +VI +AX +aY +AX +VI +IZ +sH +sH +sH +Ga +lM +BB +ID +RC +jG +mD +lM +sH +sH +"} +(11,1,1) = {" +sH +sH +sH +wm +wm +ih +ag +jr +wm +Nm +vC +vC +aP +aP +aP +MZ +wD +xC +re +xC +wD +BK +aP +aP +aP +BA +BA +CH +lM +BO +YP +sA +lM +lM +sH +"} +(12,1,1) = {" +sH +sH +bW +vC +vC +vC +vC +vC +vC +VL +mj +JD +aP +IM +lg +fm +Ra +aY +Ao +aY +ir +fm +zX +sr +aP +yA +Jc +US +BA +BA +BA +BA +BA +BA +sH +"} +(13,1,1) = {" +sH +sH +bW +CC +dt +LS +Tx +bY +RJ +gi +qv +Vn +Yx +NX +ZK +Bu +dn +NF +fP +NF +au +hg +cz +qN +fe +MU +sD +Jx +mA +bN +bN +bN +uY +BA +sH +"} +(14,1,1) = {" +sH +sH +bW +kL +iB +FF +xe +cN +iR +Dz +AY +pb +aP +OF +ap +ZI +uM +Sg +Wd +Ul +MG +Ii +uc +XK +aP +li +hc +Jr +aS +NH +Bt +sb +uY +BA +sH +"} +(15,1,1) = {" +sm +sH +bW +vC +vC +vC +vC +vC +qQ +Dg +fz +Vc +aP +zv +lA +aP +Ar +Ar +Ar +Ar +aP +aP +HO +Zl +aP +AS +PZ +AL +yq +Hx +kq +WJ +uY +BA +sH +"} +(16,1,1) = {" +sH +sH +sH +yz +qB +Qm +MR +yz +CF +mS +Kk +gE +aP +aP +aP +aP +Wr +Nq +Nq +Nq +bv +aP +aP +aP +aP +Zi +In +iP +BA +Vu +vd +hT +sc +BA +bW +"} +(17,1,1) = {" +sH +sH +sH +yz +MH +RW +JG +MW +hh +LG +Wy +vX +My +qZ +Il +Il +ce +UZ +AM +co +qz +wC +QR +ge +My +OO +WU +yp +nZ +YD +YD +YD +vn +hV +bW +"} +(18,1,1) = {" +sH +sH +sH +yz +MH +RW +xN +yz +iT +cJ +xv +Jy +YM +Xn +Qi +Eh +DL +wy +ZW +yZ +cU +Eh +ou +dL +PI +TX +ac +PE +ie +Ju +gb +gb +iY +bO +bW +"} +(19,1,1) = {" +sH +sH +sH +yz +KP +Hw +af +yz +Fp +zZ +Eq +ji +My +de +Il +zc +wA +lf +Rz +dV +aM +Nd +Nd +rv +My +Px +Zr +EN +nj +HB +HB +HB +OV +VQ +bW +"} +(20,1,1) = {" +sH +sH +sH +yz +yz +Cx +pd +yz +AZ +oE +bj +wp +wp +MM +MM +wp +de +vz +No +Bx +rv +wp +MM +MM +wp +wp +tC +Ac +ef +BA +BA +BA +BA +BA +Uu +"} +(21,1,1) = {" +sH +sH +sH +sH +LN +LN +LN +LN +rj +Kd +LN +wp +rW +Mz +dR +wp +wp +Ir +wp +WS +wp +wp +Xt +qJ +uW +wp +wp +jv +nj +Zh +vH +Im +BA +sH +sH +"} +(22,1,1) = {" +sH +sH +sH +sH +LN +HA +Un +eZ +hl +Xq +Ph +uW +NL +aO +uW +yN +wE +nk +DR +GM +Cr +Xt +QE +KO +NL +uV +wp +cg +GP +BA +ZE +lb +BA +sH +sH +"} +(23,1,1) = {" +sH +sH +sH +sH +LN +HA +va +zY +gd +TO +LN +NL +uW +uW +NL +aO +Ri +uW +uV +NL +ei +ei +uW +NL +YX +uW +fi +cR +fi +BA +rD +QJ +BA +sH +sH +"} +(24,1,1) = {" +sH +sH +sH +sH +LN +HA +Ui +Fr +IF +el +vm +cj +uW +Aq +Aq +aO +aO +NL +YX +NL +NC +lk +lk +uW +YX +uW +Mh +ts +kD +BA +BA +BA +BA +sH +sH +"} +(25,1,1) = {" +sH +sH +sH +sH +LN +SR +Ui +BJ +IF +KQ +vm +Rm +uW +Aq +Aq +uW +dR +NL +NL +Xt +UD +gR +At +qJ +uW +uW +fi +Zs +jm +up +nO +XY +fi +sH +sH +"} +(26,1,1) = {" +sH +sH +sH +sH +LN +SR +sT +ds +LX +gK +ko +mw +aO +Aq +Aq +uW +uW +NL +Xt +Zx +Xt +jk +EJ +uW +aO +XI +os +Oo +Bq +nt +aq +tF +fi +sH +sH +"} +(27,1,1) = {" +sH +sH +sH +sH +LN +SR +AN +al +cY +LN +LN +wp +uW +Aq +Aq +uW +aO +Xt +Xt +DV +Xt +md +md +uV +OA +wp +fi +fi +RF +XH +dq +QA +fi +sH +sH +"} +(28,1,1) = {" +sH +sH +sH +sH +LN +LN +ox +Bi +LN +LN +sH +cw +aO +uW +aO +aO +XW +Xt +UD +Xt +NL +uW +Lk +KO +fs +oC +sH +fi +fi +SL +ff +fi +fi +sH +sH +"} +(29,1,1) = {" +sH +sH +sH +sH +sH +LN +LN +LN +LN +sH +sH +cw +NL +YX +dR +YX +uW +JO +Xt +Fa +eU +Ng +uW +uW +fs +oC +sH +sH +fi +fi +fi +fi +sH +sH +sH +"} +(30,1,1) = {" +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +Yu +mW +kN +YX +uW +uV +ei +ei +ss +QX +cp +YX +fs +mW +mr +sH +sH +sH +sH +sH +sH +sH +sH +sH +"} +(31,1,1) = {" +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +cw +kN +NL +NL +Xt +Xt +xD +yV +Jn +Ma +aO +fs +oC +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +"} +(32,1,1) = {" +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +Yu +mW +kN +kN +Xt +uW +aO +YX +NL +uV +qJ +mW +mr +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +"} +(33,1,1) = {" +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +Yu +jV +jV +jV +jV +jV +jV +jV +jV +jV +mr +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +"} +(34,1,1) = {" +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +"} +(35,1,1) = {" +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +"} +(36,1,1) = {" +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +sH +"} diff --git a/_maps/shuttles/roumain/srm_glaive.dmm b/_maps/shuttles/roumain/srm_glaive.dmm deleted file mode 100644 index b5828d4bef71..000000000000 --- a/_maps/shuttles/roumain/srm_glaive.dmm +++ /dev/null @@ -1,4889 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ac" = ( -/obj/structure/cable/orange{ - icon_state = "1-10" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"af" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/cryopod{ - dir = 8 - }, -/obj/machinery/computer/cryopod/directional/east, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"al" = ( -/obj/structure/chair/pew/left{ - dir = 1 - }, -/mob/living/simple_animal/chicken, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"ap" = ( -/obj/machinery/airalarm/directional/east, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/storage) -"au" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/structure/cable/orange{ - icon_state = "4-6" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"aF" = ( -/obj/machinery/atmospherics/components/binary/pump, -/obj/item/flashlight/lantern, -/turf/open/floor/plating, -/area/ship/engineering) -"aH" = ( -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/item/clothing/under/suit/roumain, -/obj/item/clothing/suit/armor/roumain/shadow, -/obj/item/clothing/head/cowboy/sec/roumain/shadow, -/obj/item/storage/backpack/cultpack, -/obj/item/flashlight/lantern, -/obj/item/kitchen/knife/hunting, -/obj/item/gun/ballistic/derringer, -/obj/structure/closet/secure_closet/shadow, -/obj/item/lighter, -/obj/item/ammo_box/c38_box, -/obj/item/disk/holodisk/roumain, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/clothing/shoes/jackboots, -/obj/item/book/manual/srmlore, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"aM" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"aS" = ( -/obj/item/storage/box/masks, -/obj/item/storage/box/gloves, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/syringes, -/obj/item/storage/box/beakers, -/obj/item/storage/firstaid, -/obj/item/healthanalyzer, -/obj/item/storage/belt/medical, -/obj/item/lazarus_injector, -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/obj/item/clothing/under/suit/roumain, -/obj/item/clothing/suit/toggle/labcoat/roumain_med, -/obj/item/clothing/head/cowboy/sec/roumain/med, -/obj/item/gun/ballistic/derringer, -/obj/structure/closet/secure_closet/medicalsrm, -/obj/item/disk/holodisk/roumain, -/obj/item/ammo_box/c38_box, -/obj/item/storage/firstaid/roumain, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"aY" = ( -/obj/structure/destructible/tribal_torch, -/turf/open/floor/grass/ship/jungle, -/area/ship/crew/toilet) -"bi" = ( -/obj/machinery/mineral/ore_redemption, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/storage) -"bm" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/orange{ - icon_state = "5-8" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"bv" = ( -/obj/structure/cable/orange{ - 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/machinery/door/airlock/maintenance_hatch{ - name = "Engine Room" - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/engine) -"bN" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/closet/mob_capture, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"bW" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/hydroponics/soil, -/obj/item/seeds/tower, -/obj/item/seeds/tower, -/obj/item/hatchet, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"bY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood/maple, -/area/ship/construction) -"ce" = ( -/obj/item/clothing/under/suit/roumain, -/obj/item/clothing/suit/armor/roumain/shadow, -/obj/item/clothing/head/cowboy/sec/roumain/shadow, -/obj/item/storage/backpack/cultpack, -/obj/item/flashlight/lantern, -/obj/item/kitchen/knife/hunting, -/obj/item/gun/ballistic/derringer, -/obj/structure/closet/secure_closet/shadow, -/obj/item/lighter, -/obj/item/ammo_box/c38_box, -/obj/item/disk/holodisk/roumain, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/clothing/shoes/jackboots, -/obj/item/book/manual/srmlore, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"cg" = ( -/mob/living/simple_animal/crab{ - name = "Jannet" - }, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"cj" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"co" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/orange{ - icon_state = "0-9" - }, -/obj/structure/cable/orange{ - icon_state = "8-9" - }, -/obj/structure/cable/orange{ - icon_state = "4-9" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"cp" = ( -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/obj/machinery/door/poddoor{ - id = "port_blasts"; - name = "Port Blast Door" - }, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 4; - id = "glaive_shields"; - locked = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"cz" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/item/book/manual/trickwines_4_brewers, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"cJ" = ( -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/roumain) -"cR" = ( -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"cU" = ( -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"cW" = ( -/turf/closed/wall, -/area/ship/engineering/engine) -"dq" = ( -/turf/closed/wall/r_wall, -/area/ship/crew/toilet) -"ds" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/item/reagent_containers/food/drinks/breakawayflask, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"dt" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/crew/dorm) -"dV" = ( -/obj/structure/chair/pew/right{ - dir = 1 - }, -/obj/structure/flora/ausbushes/brflowers, -/mob/living/simple_animal/hostile/retaliate/goat, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"eU" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/effect/turf_decal/industrial/caution, -/obj/structure/ore_box, -/obj/structure/cable/orange{ - icon_state = "8-9" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"fa" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/effect/turf_decal/industrial/caution, -/obj/structure/cable/orange{ - icon_state = "4-9" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"fe" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/closet/crate, -/obj/item/stack/sheet/bone{ - amount = 10 - }, -/obj/item/stack/sheet/sinew/wolf{ - amount = 10 - }, -/obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide{ - amount = 5 - }, -/obj/item/reagent_containers/food/snacks/meat/slab, -/obj/item/reagent_containers/food/snacks/meat/slab, -/obj/item/reagent_containers/food/snacks/meat/slab, -/obj/item/reagent_containers/food/snacks/meat/slab/bear, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"ff" = ( -/obj/docking_port/mobile{ - callTime = 250; - name = "Glaive-class"; - port_direction = 4; - dir = 8 - }, -/turf/closed/wall/r_wall, -/area/ship/engineering) -"fi" = ( -/turf/closed/wall/r_wall, -/area/ship/medical) -"fm" = ( -/turf/closed/wall/r_wall, -/area/ship/crew/dorm) -"fs" = ( -/turf/closed/wall, -/area/ship/engineering) -"fv" = ( -/obj/machinery/computer/cargo/express, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"fz" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"fC" = ( -/obj/effect/turf_decal/siding/wood/end, -/obj/item/clothing/under/suit/roumain, -/obj/item/clothing/suit/armor/vest/capcarapace/roumain/montagne, -/obj/item/clothing/head/HoS/cowboy/montagne, -/obj/item/clothing/suit/armor/riot/chaplain/ancient, -/obj/item/clothing/head/helmet/chaplain/ancient, -/obj/item/storage/backpack/cultpack, -/obj/item/flashlight/lantern, -/obj/item/storage/fancy/candle_box{ - pixel_y = 3; - pixel_x = 8 - }, -/obj/item/lighter{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/kitchen/knife/combat, -/obj/item/gun/ballistic/revolver/montagne, -/obj/item/ammo_box/c38, -/obj/structure/closet/secure_closet/montagnes, -/obj/item/disk/holodisk/roumain, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/jackboots, -/obj/item/book/manual/srmlore, -/turf/open/floor/wood/mahogany, -/area/ship/roumain) -"fP" = ( -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"gb" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/effect/turf_decal/industrial/caution, -/obj/structure/cable/orange{ - icon_state = "1-6" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"gd" = ( -/obj/structure/cable/orange{ - icon_state = "5-9" - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"ge" = ( -/turf/closed/wall/r_wall, -/area/ship/construction) -"gi" = ( -/obj/structure/chair/pew/left{ - dir = 1 - }, -/obj/structure/flora/ausbushes/brflowers, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"go" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/orange{ - icon_state = "0-6" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/storage) -"gE" = ( -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"gK" = ( -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"gO" = ( -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/obj/structure/cable/orange{ - icon_state = "8-9" - }, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"gR" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/roumain) -"hc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters"; - dir = 8 - }, -/turf/open/floor/plating, -/area/ship/roumain) -"hh" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters" - }, -/turf/open/floor/plating, -/area/ship/crew/dorm) -"hp" = ( -/obj/structure/destructible/tribal_torch, -/obj/effect/turf_decal/industrial/warning/full, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"hu" = ( -/obj/machinery/button/door{ - id = "port_blasts"; - name = "port blasts control"; - pixel_y = 27 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"hz" = ( -/obj/machinery/hydroponics/soil, -/obj/item/seeds/wheat, -/obj/item/seeds/wheat, -/obj/item/shovel, -/obj/item/seeds/carrot, -/obj/item/seeds/carrot, -/obj/item/reagent_containers/food/snacks/egg, -/obj/item/reagent_containers/food/snacks/egg, -/obj/item/reagent_containers/food/snacks/egg, -/obj/item/reagent_containers/food/snacks/egg, -/obj/item/seeds/lavaland/puce, -/obj/item/seeds/lavaland/puce, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"hT" = ( -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"ie" = ( -/obj/structure/window/plasma/reinforced/spawner{ - dir = 1 - }, -/obj/structure/window/plasma/reinforced/spawner{ - dir = 8 - }, -/obj/structure/window/plasma/reinforced/spawner{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ - dir = 4 - }, -/turf/open/floor/engine/airless, -/area/ship/engineering/engine) -"iq" = ( -/obj/structure/table/wood, -/obj/item/spear/bonespear{ - pixel_y = 8; - pixel_x = -4 - }, -/obj/item/spear/bonespear{ - pixel_y = 7 - }, -/obj/item/spear/bonespear{ - pixel_x = 6; - pixel_y = 7 - }, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"ir" = ( -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"iu" = ( -/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{ - name = "Dormitories"; - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"iB" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/structure/fence/door, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/wood/yew, -/area/ship/roumain) -"iP" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/flora/ausbushes/reedbush, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"iR" = ( -/obj/structure/cable/orange{ - icon_state = "8-10" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"iT" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/fence{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"iY" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters" - }, -/turf/open/floor/plating, -/area/ship/roumain) -"jk" = ( -/obj/structure/cable/orange{ - icon_state = "8-9" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"jl" = ( -/obj/structure/cable/orange{ - icon_state = "2-10" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"jm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"jq" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/destructible/tribal_torch, -/turf/open/floor/wood/maple, -/area/ship/construction) -"jr" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 1; - piping_layer = 2 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"jv" = ( -/obj/structure/window/reinforced/spawner{ - dir = 8 - }, -/obj/structure/window/reinforced/spawner, -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters{ - id = "port_shutters"; - name = "Engine Shutters" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"jy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/ship/engineering/engine) -"jG" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/tree/srm, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"ko" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/destructible/tribal_torch, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"kD" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/wood/maple, -/area/ship/construction) -"lb" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/fermenting_barrel, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"lf" = ( -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable/orange{ - icon_state = "1-6" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"lg" = ( -/obj/effect/turf_decal/spline/fancy{ - dir = 1 - }, -/obj/item/storage/box/emptysandbags, -/obj/item/storage/belt/mining, -/obj/item/reagent_containers/hypospray/medipen/survival, -/obj/item/flashlight/seclite, -/obj/item/borg/upgrade/modkit/indoors, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/storage/bag/ore, -/obj/structure/cable/orange{ - icon_state = "4-10" - }, -/obj/item/shovel, -/obj/item/gps/mining, -/obj/structure/closet/secure_closet/miningcloset, -/obj/item/stack/marker_beacon/thirty, -/obj/item/pickaxe, -/obj/item/t_scanner/adv_mining_scanner/lesser, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"li" = ( -/obj/machinery/door/airlock/engineering{ - name = "Starboard Wing"; - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/roumain) -"lk" = ( -/obj/effect/turf_decal/siding/wood/corner, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/wood/yew, -/area/ship/roumain) -"ln" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/spline/fancy{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "8-10" - }, -/obj/machinery/button/door{ - id = "port_blasts"; - name = "port blasts control"; - pixel_x = -6; - pixel_y = 2 - }, -/obj/structure/table/wood, -/obj/machinery/button/shieldwallgen{ - pixel_x = 4; - id = "glaive_shields" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"lA" = ( -/obj/structure/sink/puddle, -/obj/item/reagent_containers/glass/bucket/wooden{ - pixel_y = -3; - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bucket/wooden{ - pixel_y = 9; - pixel_x = -4 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"lM" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/hydroponics/soil, -/obj/item/seeds/cotton, -/obj/item/seeds/cotton, -/obj/item/storage/bag/plants/portaseeder, -/obj/item/storage/bag/plants, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"lO" = ( -/obj/structure/cable/orange{ - icon_state = "4-5" - }, -/obj/structure/cable/orange{ - icon_state = "8-10" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"md" = ( -/obj/docking_port{ - dwidth = 15; - dir = 2; - width = 30; - height = 15 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"mj" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/item/kirbyplants/random, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"mr" = ( -/obj/structure/cable/orange{ - icon_state = "4-5" - }, -/obj/structure/cable/orange{ - icon_state = "2-6" - }, -/obj/item/clothing/under/suit/roumain, -/obj/item/clothing/suit/armor/roumain, -/obj/item/clothing/head/cowboy/sec/roumain, -/obj/item/clothing/suit/armor/riot/chaplain/witchhunter, -/obj/item/clothing/head/helmet/chaplain/witchunter_hat, -/obj/item/storage/backpack/cultpack, -/obj/item/flashlight/lantern, -/obj/item/kitchen/knife/combat/survival, -/obj/item/gun/ballistic/shotgun/flamingarrow, -/obj/structure/closet/secure_closet/hunter, -/obj/item/lighter, -/obj/item/ammo_box/c38_box, -/obj/item/disk/holodisk/roumain, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/jackboots, -/obj/item/book/manual/srmlore, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"mw" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters"; - dir = 8 - }, -/turf/open/floor/plating, -/area/ship/roumain) -"mD" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters" - }, -/turf/open/floor/plating, -/area/ship/medical) -"mE" = ( -/obj/structure/window/reinforced/spawner{ - dir = 1 - }, -/obj/machinery/power/shuttle/engine/electric{ - dir = 1 - }, -/obj/structure/cable/pink, -/turf/open/floor/engine/hull, -/area/ship/engineering/engine) -"mJ" = ( -/obj/structure/mirror{ - pixel_y = -32 - }, -/obj/structure/closet/wall/white{ - dir = 8; - pixel_x = 32 - }, -/turf/open/floor/grass/ship/jungle, -/area/ship/crew/toilet) -"mS" = ( -/obj/structure/cable/orange{ - icon_state = "5-10" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/wood/maple, -/area/ship/construction) -"na" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/dark, -/area/ship/crew/toilet) -"nj" = ( -/obj/structure/chair/pew/right{ - dir = 1 - }, -/mob/living/simple_animal/cow, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"nk" = ( -/obj/item/storage/box/emptysandbags, -/obj/item/storage/belt/mining, -/obj/item/reagent_containers/hypospray/medipen/survival, -/obj/item/flashlight/seclite, -/obj/item/borg/upgrade/modkit/indoors, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/storage/bag/ore, -/obj/item/gun/ballistic/shotgun/flamingarrow/bolt, -/obj/item/shovel, -/obj/item/gps/mining, -/obj/structure/closet/secure_closet/miningcloset, -/obj/item/stack/marker_beacon/thirty, -/obj/item/pickaxe, -/obj/item/t_scanner/adv_mining_scanner/lesser, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"nt" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood/end{ - dir = 4 - }, -/turf/open/floor/wood/yew, -/area/ship/roumain) -"nO" = ( -/obj/structure/table/wood, -/obj/item/storage/toolbox/electrical{ - pixel_x = -1; - pixel_y = 4 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = -3; - pixel_x = 3 - }, -/obj/item/weldingtool/largetank, -/obj/item/clothing/head/welding, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"nY" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/landmark/observer_start, -/turf/open/floor/plating{ - icon_state = "greenerdirt" - }, -/area/ship/roumain) -"nZ" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/obj/structure/railing, -/turf/open/floor/wood/maple, -/area/ship/construction) -"oC" = ( -/obj/structure/cable/orange{ - icon_state = "8-10" - }, -/obj/structure/cable/orange{ - icon_state = "4-6" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"pb" = ( -/obj/structure/cable/orange{ - icon_state = "4-10" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/button/door{ - id = "starboard_shutters"; - name = "starboard shutters control"; - pixel_y = 23 - }, -/obj/item/flashlight/lantern, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"pd" = ( -/obj/structure/flora/rock/jungle, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"pH" = ( -/obj/structure/cable/orange{ - icon_state = "4-5" - }, -/obj/structure/cable/orange{ - icon_state = "2-5" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"qv" = ( -/obj/structure/table/rolling, -/obj/item/melee/baton/cattleprod{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/lighter{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/screwdriver{ - pixel_y = 4 - }, -/obj/item/wirecutters{ - pixel_y = 4; - pixel_x = 10 - }, -/obj/item/kitchen/knife{ - pixel_x = 8; - pixel_y = 5 - }, -/obj/item/crowbar{ - pixel_y = 8 - }, -/obj/structure/cable/orange{ - icon_state = "2-9" - }, -/obj/item/wrench{ - pixel_y = 5 - }, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"qz" = ( -/obj/machinery/door/poddoor{ - id = "port_blasts"; - name = "Port Blast Door" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"qJ" = ( -/obj/structure/destructible/tribal_torch, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"qN" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"qQ" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/effect/turf_decal/siding/wood/end, -/obj/item/clothing/suit/space/hardsuit/mining/independent, -/obj/item/clothing/mask/breath, -/obj/item/tank/internals/oxygen, -/turf/open/floor/wood/mahogany, -/area/ship/roumain) -"qZ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters" - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/ship/roumain) -"re" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"rj" = ( -/obj/structure/table/wood, -/obj/item/slimepotion/slime/sentience, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"rD" = ( -/obj/effect/turf_decal/siding/wood/end, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/wood/yew, -/area/ship/roumain) -"rE" = ( -/turf/open/floor/grass/ship/jungle, -/area/ship/crew/toilet) -"rK" = ( -/obj/machinery/airalarm/directional/east, -/turf/open/floor/grass/ship/jungle, -/area/ship/crew/toilet) -"sb" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/storage) -"sm" = ( -/obj/structure/flora/rock/jungle, -/obj/structure/railing{ - dir = 10 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"sr" = ( -/obj/machinery/door/airlock/mining{ - name = "Manufacturing and Expedition" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/wood/maple, -/area/ship/construction) -"ss" = ( -/obj/structure/window/reinforced/spawner, -/obj/machinery/power/smes/shuttle/precharged{ - dir = 1 - }, -/obj/structure/cable/pink{ - icon_state = "0-2" - }, -/obj/machinery/door/poddoor/shutters{ - id = "port_shutters"; - name = "Engine Shutters" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"sv" = ( -/obj/structure/curtain/bounty, -/obj/machinery/shower{ - pixel_y = 8 - }, -/obj/effect/turf_decal/stoneborder, -/obj/effect/turf_decal/stoneborder{ - dir = 1 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/crew/toilet) -"sA" = ( -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"sD" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters" - }, -/turf/open/floor/plating, -/area/ship/roumain) -"sH" = ( -/turf/template_noop, -/area/template_noop) -"sT" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/roumain) -"ts" = ( -/obj/machinery/door/airlock/glass{ - name = "Port Wing"; - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/roumain) -"tu" = ( -/obj/structure/window/reinforced/spawner{ - dir = 8 - }, -/obj/machinery/power/smes/shuttle/precharged{ - dir = 1 - }, -/obj/structure/cable/pink{ - icon_state = "0-2" - }, -/obj/machinery/door/poddoor/shutters{ - id = "starboard_shutters"; - name = "Starboard Engine Shutters" - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"tC" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/orange{ - icon_state = "0-2" - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/toilet) -"tF" = ( -/obj/structure/cable/orange{ - icon_state = "1-6" - }, -/obj/structure/cable/orange{ - icon_state = "2-10" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"tM" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/effect/turf_decal/industrial/caution, -/obj/structure/ore_box, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"uI" = ( -/obj/structure/railing, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"uM" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/item/lighter, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"uP" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/effect/turf_decal/industrial/caution, -/obj/structure/ore_box, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"uY" = ( -/turf/open/floor/plasteel/dark, -/area/ship/roumain) -"vd" = ( -/obj/structure/window/reinforced/spawner{ - dir = 1 - }, -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 1 - }, -/turf/open/floor/engine/hull, -/area/ship/engineering/engine) -"vn" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/toilet) -"vz" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"vW" = ( -/obj/machinery/computer/helm, -/obj/effect/turf_decal/siding/wood/end{ - dir = 1 - }, -/turf/open/floor/wood/mahogany, -/area/ship/roumain) -"vX" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/turf_decal/siding/wood/end{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/wood/yew, -/area/ship/roumain) -"wm" = ( -/turf/closed/wall/r_wall, -/area/ship/engineering/engine) -"wp" = ( -/turf/closed/wall/r_wall, -/area/ship/roumain) -"ww" = ( -/obj/structure/sink/puddle, -/turf/open/floor/ship/dirt/dark, -/area/ship/crew/toilet) -"wA" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/railing, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"wC" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/roumain) -"wD" = ( -/obj/vehicle/ridden/wheelchair, -/obj/item/melee/transforming/cleaving_saw/old, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"wE" = ( -/obj/machinery/door/airlock/glass{ - name = "Port Wing"; - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/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 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/toilet) -"xe" = ( -/obj/structure/table/wood, -/obj/item/storage/toolbox/mechanical{ - pixel_y = -3; - pixel_x = 3 - }, -/obj/item/storage/toolbox/electrical{ - pixel_x = -1; - pixel_y = 4 - }, -/obj/item/multitool{ - pixel_y = 6; - pixel_x = -8 - }, -/obj/item/weldingtool/largetank, -/obj/item/clothing/head/welding, -/obj/item/clothing/gloves/color/yellow, -/turf/open/floor/wood/maple, -/area/ship/construction) -"xf" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"xB" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"xC" = ( -/obj/structure/chair/pew/right{ - dir = 1 - }, -/obj/structure/flora/ausbushes/brflowers, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"xD" = ( -/obj/structure/sink/puddle, -/turf/open/floor/ship/dirt/dark, -/area/ship/medical) -"yn" = ( -/obj/structure/cable/orange{ - icon_state = "8-10" - }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"yp" = ( -/obj/structure/cable/orange{ - icon_state = "4-6" - }, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/storage) -"yq" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/structure/destructible/tribal_torch, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"yz" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable/orange{ - icon_state = "2-6" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"yA" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"yN" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/grassybush, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"yV" = ( -/obj/item/soap/deluxe, -/obj/item/bikehorn/rubberducky, -/obj/structure/window/reinforced/tinted/frosted{ - dir = 1 - }, -/obj/machinery/door/window{ - dir = 4 - }, -/obj/effect/turf_decal/stoneborder, -/obj/effect/turf_decal/stoneborder{ - dir = 1 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/crew/toilet) -"yZ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters" - }, -/turf/open/floor/plating, -/area/ship/roumain) -"zc" = ( -/obj/structure/destructible/tribal_torch, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/orange, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"zv" = ( -/obj/effect/turf_decal/siding/wood/end{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/wood/yew, -/area/ship/roumain) -"zO" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/roumain) -"zT" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"zX" = ( -/obj/structure/bedsheetbin, -/obj/structure/table/wood, -/obj/item/flashlight/lantern, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/toilet) -"zZ" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/spline/fancy{ - dir = 1 - }, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/mining/independent, -/obj/item/clothing/mask/breath, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"Ac" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/kitchenspike, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"Ao" = ( -/obj/structure/railing/corner, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"Ar" = ( -/obj/structure/closet/crate/freezer, -/obj/item/stack/medical/mesh/advanced, -/obj/item/stack/medical/gauze/twelve, -/obj/item/stack/medical/splint, -/obj/item/stack/medical/suture/medicated, -/obj/item/organ_storage, -/obj/item/organ_storage, -/obj/item/organ_storage, -/obj/structure/cable/orange{ - icon_state = "2-5" - }, -/obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/random, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"At" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, -/turf/open/floor/plating{ - icon_state = "greenerdirt" - }, -/area/ship/roumain) -"AL" = ( -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/toilet) -"AM" = ( -/obj/structure/window/reinforced/spawner{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner, -/obj/machinery/power/smes/shuttle/precharged{ - dir = 1 - }, -/obj/structure/cable/pink{ - icon_state = "0-2" - }, -/obj/machinery/door/poddoor/shutters{ - id = "port_shutters"; - name = "Engine Shutters" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"AN" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters" - }, -/turf/open/floor/plating, -/area/ship/roumain) -"AQ" = ( -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/obj/machinery/door/poddoor{ - id = "port_blasts"; - name = "Port Blast Door" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"AY" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/obj/item/candle/tribal_torch, -/obj/item/candle/tribal_torch, -/turf/open/floor/plating, -/area/ship/engineering) -"AZ" = ( -/obj/structure/chair/pew/right{ - dir = 1 - }, -/mob/living/simple_animal/chicken, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"Bu" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters" - }, -/turf/open/floor/plating, -/area/ship/medical) -"Bx" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/smartfridge/drying_rack, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"Bz" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"BB" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ - pixel_x = 7; - pixel_y = 6 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/obj/item/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/reagent_containers/food/drinks/bottle/absinthe{ - pixel_y = 8; - pixel_x = -6 - }, -/obj/item/book/manual/wiki/surgery, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"BK" = ( -/obj/structure/window/plasma/reinforced/spawner{ - dir = 8 - }, -/obj/structure/window/plasma/reinforced/spawner, -/obj/structure/window/plasma/reinforced/spawner{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/layer4{ - dir = 8 - }, -/turf/open/floor/engine/airless, -/area/ship/engineering/engine) -"BO" = ( -/obj/structure/chair/pew/left{ - dir = 1 - }, -/mob/living/simple_animal/cow, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"Cr" = ( -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"Cx" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"CC" = ( -/obj/structure/chair/pew{ - dir = 1 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"CF" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood/yew, -/area/ship/roumain) -"CH" = ( -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, -/area/ship/roumain) -"Dg" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/fence{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"Du" = ( -/obj/structure/cable/orange{ - icon_state = "1-9" - }, -/obj/structure/cable/orange{ - icon_state = "6-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"Dz" = ( -/obj/machinery/door/poddoor{ - id = "glaive_body_blasts"; - name = "Body Blast Door"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/roumain) -"DG" = ( -/turf/closed/wall/r_wall, -/area/ship/engineering/electrical) -"DL" = ( -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"DR" = ( -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/turf/open/floor/plating, -/area/ship/engineering) -"DS" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/brflowers, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"DX" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sunnybush, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"Et" = ( -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"Ex" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf{ - pixel_y = -2; - pixel_x = -3 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem{ - pixel_x = -3; - pixel_y = -6 - }, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap{ - pixel_y = -1; - pixel_x = -6 - }, -/obj/item/reagent_containers/food/snacks/meat/slab/bear{ - pixel_y = 1; - pixel_x = -7 - }, -/obj/item/reagent_containers/food/snacks/meat/slab/bear{ - pixel_y = 1; - pixel_x = -7 - }, -/obj/item/reagent_containers/food/snacks/meat/slab/bear{ - pixel_y = 1; - pixel_x = -7 - }, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit{ - pixel_x = -9; - pixel_y = -3 - }, -/obj/item/reagent_containers/glass/bowl/mushroom_bowl{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/mortar{ - pixel_y = 9; - pixel_x = 6 - }, -/obj/item/pestle{ - pixel_y = 6 - }, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/fireblossom, -/obj/structure/flora/ash/fern, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"EJ" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"EN" = ( -/obj/item/reagent_containers/glass/bottle/diethylamine, -/obj/item/reagent_containers/glass/bottle/diethylamine, -/turf/open/floor/grass/ship/jungle, -/area/ship/construction) -"EO" = ( -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Fa" = ( -/obj/structure/railing/corner, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"Fd" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/structure/destructible/tribal_torch, -/turf/open/floor/wood/mahogany, -/area/ship/roumain) -"Fn" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/syringe/calomel{ - pixel_x = 3; - pixel_y = -5 - }, -/obj/item/reagent_containers/syringe/antiviral{ - pixel_y = -6; - pixel_x = 8 - }, -/obj/item/reagent_containers/hypospray/medipen/stimpack{ - pixel_x = -4 - }, -/obj/item/reagent_containers/hypospray/medipen/survival{ - pixel_x = -7; - pixel_y = -5 - }, -/obj/item/reagent_containers/glass/bottle/potass_iodide{ - pixel_y = 10; - pixel_x = -7 - }, -/obj/item/reagent_containers/glass/bottle/atropine{ - pixel_y = 9 - }, -/obj/structure/cable/orange{ - icon_state = "2-10" - }, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Fp" = ( -/obj/structure/railing{ - dir = 5 - }, -/obj/structure/kitchenspike, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"Fr" = ( -/obj/structure/table/wood, -/obj/item/storage/box/stockparts/basic, -/obj/item/storage/box/stockparts/basic, -/turf/open/floor/wood/maple, -/area/ship/construction) -"Fu" = ( -/obj/structure/railing/corner, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/button/door{ - dir = 1; - pixel_x = -5; - pixel_y = -26; - name = "Body Blast Door Control"; - id = "glaive_body_blasts" - }, -/obj/machinery/button/shieldwallgen{ - dir = 1; - pixel_y = -25; - pixel_x = 6; - name = "Body Holofield Switch"; - id = "glaive_body_holo" - }, -/obj/structure/fermenting_barrel, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"FA" = ( -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"FE" = ( -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"FG" = ( -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"FR" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/structure/destructible/tribal_torch, -/turf/open/floor/wood/maple, -/area/ship/construction) -"FW" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/orange{ - icon_state = "0-5" - }, -/obj/item/candle/tribal_torch, -/obj/item/candle/tribal_torch, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"Gi" = ( -/obj/structure/cable/orange{ - icon_state = "2-9" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"GM" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/orange, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"GP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/toy/plush/snakeplushie, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"Ho" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"Hw" = ( -/obj/effect/turf_decal/spline/fancy{ - dir = 1 - }, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/mining/independent, -/obj/structure/cable/orange{ - icon_state = "6-9" - }, -/obj/item/clothing/mask/breath, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"HA" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only, -/obj/structure/railing, -/turf/open/floor/wood/maple, -/area/ship/construction) -"HB" = ( -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 1; - id = "glaive_body_holo" - }, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/obj/machinery/door/poddoor{ - id = "glaive_body_blasts"; - name = "Body Blast Door"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/roumain) -"HS" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/obj/structure/cable/orange{ - icon_state = "0-6" - }, -/obj/machinery/portable_atmospherics/pump, -/turf/open/floor/plating, -/area/ship/engineering) -"Ii" = ( -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - id = "glaive_body_holo" - }, -/obj/machinery/door/poddoor{ - id = "glaive_body_blasts"; - name = "Body Blast Door"; - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/turf/open/floor/plasteel/dark, -/area/ship/roumain) -"Il" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating, -/area/ship/engineering) -"Io" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ - dir = 4 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"Ir" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable/orange{ - icon_state = "4-9" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"ID" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Engine Room" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/ship/engineering) -"IF" = ( -/turf/closed/wall, -/area/ship/crew/dorm) -"IZ" = ( -/turf/closed/wall, -/area/ship/construction) -"Jc" = ( -/obj/structure/cable/orange{ - icon_state = "1-5" - }, -/obj/structure/cable/orange{ - icon_state = "8-10" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"Jn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/stairs, -/area/ship/storage) -"Jx" = ( -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"Jy" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"JD" = ( -/obj/structure/cable/orange{ - icon_state = "1-5" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"JG" = ( -/obj/structure/cable/orange{ - icon_state = "5-6" - }, -/obj/structure/cable/orange{ - icon_state = "8-9" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"Kk" = ( -/obj/structure/cable/orange{ - icon_state = "5-9" - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"KP" = ( -/obj/structure/railing{ - dir = 5 - }, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"KX" = ( -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/railing/corner{ - dir = 4 - }, -/mob/living/simple_animal/crab{ - name = "Tracie" - }, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"Lj" = ( -/obj/structure/destructible/tribal_torch, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"Lk" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/fullgrass, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"LG" = ( -/obj/structure/flora/rock/jungle, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"LL" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/roumain) -"LN" = ( -/turf/closed/wall/r_wall, -/area/ship/storage) -"LS" = ( -/obj/machinery/door/airlock{ - name = "Restroom"; - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/grass/ship/jungle, -/area/ship/crew/toilet) -"Ma" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 1 - }, -/turf/open/floor/engine/hull, -/area/ship/engineering) -"Mh" = ( -/obj/structure/table/wood, -/obj/item/radio{ - pixel_y = 6; - pixel_x = 5 - }, -/obj/item/radio{ - pixel_y = 6; - pixel_x = 5 - }, -/obj/item/radio{ - pixel_y = 6; - pixel_x = 5 - }, -/obj/item/radio{ - pixel_y = 6; - pixel_x = 5 - }, -/obj/item/radio{ - pixel_y = 6; - pixel_x = 5 - }, -/obj/item/radio{ - pixel_y = 6; - pixel_x = 5 - }, -/obj/item/radio{ - pixel_y = 6; - pixel_x = 5 - }, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/item/gps{ - pixel_x = -7 - }, -/obj/item/gps{ - pixel_x = -7 - }, -/obj/item/gps{ - pixel_x = -7 - }, -/obj/item/gps{ - pixel_x = -7 - }, -/obj/item/gps{ - pixel_x = -7 - }, -/obj/item/gps{ - pixel_x = -7 - }, -/obj/item/gps{ - pixel_x = -7 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"Mi" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/wood/yew, -/area/ship/roumain) -"Mj" = ( -/obj/machinery/airalarm/directional/east, -/obj/structure/chair/wood/wings{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/wood/mahogany, -/area/ship/roumain) -"MG" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only, -/obj/structure/railing, -/turf/open/floor/wood/maple, -/area/ship/construction) -"MR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/medical/glass{ - name = "Medical Bay"; - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"MU" = ( -/obj/item/kinetic_crusher, -/obj/item/storage/box/emptysandbags, -/obj/item/storage/belt/mining, -/obj/item/reagent_containers/hypospray/medipen/survival, -/obj/item/flashlight/seclite, -/obj/item/borg/upgrade/modkit/indoors, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/storage/bag/ore, -/obj/item/shovel, -/obj/item/gps/mining, -/obj/structure/closet/secure_closet/miningcloset, -/obj/item/stack/marker_beacon/thirty, -/obj/item/pickaxe, -/obj/item/t_scanner/adv_mining_scanner/lesser, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"MV" = ( -/obj/structure/table/wood, -/obj/machinery/button/door{ - id = "body_shutters"; - name = "body shutters control"; - pixel_y = 3 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/item/flashlight/lantern{ - pixel_x = -10 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/wood/mahogany, -/area/ship/roumain) -"MW" = ( -/obj/machinery/power/port_gen/pacman, -/obj/item/stack/sheet/mineral/plasma/twenty, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"MZ" = ( -/obj/structure/railing{ - dir = 9 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"Nd" = ( -/obj/machinery/door/airlock/glass{ - name = "Dormitories"; - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/wood/ebony, -/area/ship/construction) -"Ng" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/obj/structure/cable/orange{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"Nm" = ( -/obj/machinery/holopad/emergency/command, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/siding/wood, -/obj/item/disk/holodisk/roumain, -/turf/open/floor/wood/mahogany, -/area/ship/roumain) -"Nq" = ( -/obj/machinery/hydroponics/soil, -/obj/item/seeds/lavaland/ember, -/obj/item/seeds/lavaland/inocybe, -/obj/item/seeds/lavaland/polypore, -/obj/item/seeds/lavaland/porcini, -/obj/item/seeds/lavaland/cactus, -/obj/item/cultivator/rake, -/obj/item/stack/ore/glass/basalt{ - amount = 25; - pixel_y = -2; - pixel_x = -9 - }, -/obj/item/seeds/sunflower/moonflower, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"NE" = ( -/obj/structure/toilet{ - dir = 4; - pixel_y = 7 - }, -/obj/effect/turf_decal/spline/fancy/wood/cee{ - dir = 4 - }, -/turf/open/floor/wood/ebony, -/area/ship/crew/toilet) -"NL" = ( -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"NT" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"NV" = ( -/obj/item/reagent_containers/glass/bottle/mutagen, -/obj/item/reagent_containers/glass/bottle/mutagen, -/turf/open/floor/grass/ship/jungle, -/area/ship/construction) -"NX" = ( -/obj/machinery/atmospherics/components/binary/pump, -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"Od" = ( -/turf/closed/wall, -/area/ship/roumain) -"Oo" = ( -/turf/closed/wall, -/area/ship/crew/toilet) -"OF" = ( -/obj/machinery/vending/mining_equipment, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/storage) -"OR" = ( -/obj/structure/cable/orange{ - icon_state = "0-9" - }, -/obj/machinery/door/poddoor{ - id = "port_blasts"; - name = "Port Blast Door" - }, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 8; - locked = 1; - id = "glaive_shields" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"Py" = ( -/obj/structure/cable/orange{ - icon_state = "6-9" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/wood/maple, -/area/ship/construction) -"PE" = ( -/obj/structure/cable/orange{ - icon_state = "1-6" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"PU" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/structure/cable/orange{ - icon_state = "6-8" - }, -/obj/structure/closet/emcloset/wall{ - pixel_y = 32 - }, -/turf/open/floor/wood/maple, -/area/ship/construction) -"Qi" = ( -/obj/structure/railing{ - dir = 9 - }, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"Qm" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"QA" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/airlock/medical/glass{ - name = "Medical Bay"; - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ship/construction) -"QD" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 1 - }, -/obj/structure/cable/pink{ - icon_state = "0-2" - }, -/obj/machinery/door/poddoor/shutters{ - id = "starboard_shutters"; - name = "Starboard Engine Shutters" - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"QJ" = ( -/obj/structure/cable/orange{ - icon_state = "4-6" - }, -/obj/structure/cable/orange{ - icon_state = "8-10" - }, -/obj/structure/destructible/tribal_torch, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"QQ" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/wood/maple, -/area/ship/construction) -"QX" = ( -/obj/structure/bonfire/dense, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"Ra" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/structure/cable/orange{ - icon_state = "1-9" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"Rm" = ( -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"Rn" = ( -/obj/structure/table/wood, -/obj/item/survey_handheld, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/item/circuitboard/machine/rdserver, -/obj/item/circuitboard/machine/autolathe, -/obj/item/ammo_box/c38_box, -/obj/item/disk/design_disk/ammo_1911, -/obj/item/circuitboard/machine/protolathe/department/ballistics, -/obj/item/circuitboard/computer/rdconsole, -/turf/open/floor/wood/maple, -/area/ship/construction) -"RF" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood/end{ - dir = 8 - }, -/turf/open/floor/wood/yew, -/area/ship/roumain) -"RJ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"RT" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/dark, -/area/ship/crew/toilet) -"RU" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"Sg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/button/door{ - id = "port_shutters"; - name = "port shutter control"; - pixel_y = 25 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"Sl" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/fermenting_barrel/distiller, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"Sx" = ( -/obj/structure/window/reinforced/spawner{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters{ - id = "starboard_shutters"; - name = "Starboard Engine Shutters" - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"Sz" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/loom, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"SK" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"SL" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 1 - }, -/obj/structure/cable/pink, -/turf/open/floor/engine/hull, -/area/ship/engineering) -"Tc" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood/yew, -/area/ship/roumain) -"Tj" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/airlock/engineering{ - name = "Starboard Wing"; - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"Tx" = ( -/obj/structure/table/wood, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/plasteel/fifty, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/item/stack/rods/fifty, -/obj/item/stack/sheet/glass/fifty, -/turf/open/floor/wood/maple, -/area/ship/construction) -"TO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"TS" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/medical) -"Ue" = ( -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"Ul" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/structure/cable/orange{ - icon_state = "4-10" - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/closet/firecloset/wall{ - pixel_y = 32 - }, -/turf/open/floor/wood/maple, -/area/ship/construction) -"Un" = ( -/obj/structure/flora/rock/jungle, -/obj/structure/railing{ - dir = 6 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"US" = ( -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/obj/structure/cable/orange{ - icon_state = "2-6" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"UZ" = ( -/mob/living/simple_animal/pet/gondola{ - name = "Grand Hunter Montagnes" - }, -/turf/open/floor/grass/ship/jungle, -/area/ship/construction) -"Vn" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/orange, -/obj/structure/cable/orange{ - icon_state = "1-9" - }, -/obj/structure/cable/orange{ - icon_state = "1-5" - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"Vu" = ( -/turf/closed/wall/r_wall, -/area/ship/engineering) -"VB" = ( -/obj/structure/destructible/tribal_torch, -/turf/open/floor/plasteel/dark, -/area/ship/crew/toilet) -"VI" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/flora/junglebush/large, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"VL" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - name = "Body Shutters"; - id = "body_shutters" - }, -/turf/open/floor/plating, -/area/ship/roumain) -"VQ" = ( -/obj/structure/flora/junglebush/c, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"VX" = ( -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"Wd" = ( -/obj/structure/cable/orange{ - icon_state = "4-5" - }, -/obj/structure/destructible/tribal_torch, -/obj/effect/turf_decal/industrial/warning/full, -/obj/structure/cable/orange{ - icon_state = "8-9" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"Wr" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/mining/independent, -/obj/item/clothing/mask/breath, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"Wy" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"WS" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/wood/maple, -/area/ship/construction) -"Xg" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/railing, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"Xp" = ( -/obj/structure/table/optable, -/obj/structure/cable/orange{ - icon_state = "1-9" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue/diagonal, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Xq" = ( -/obj/item/seeds/cotton/durathread, -/turf/open/floor/grass/ship/jungle, -/area/ship/construction) -"Xt" = ( -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"XB" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/flora/junglebush/b, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"XK" = ( -/obj/structure/cable/green, -/obj/structure/cable/orange{ - icon_state = "2-6" - }, -/obj/structure/cable/orange{ - icon_state = "2-10" - }, -/obj/machinery/power/port_gen/pacman/super, -/obj/item/stack/sheet/mineral/uranium/twenty, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"XY" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood/end{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/item/radio/intercom/wideband/table{ - dir = 1 - }, -/turf/open/floor/wood/mahogany, -/area/ship/roumain) -"XZ" = ( -/turf/closed/wall, -/area/ship/medical) -"Yb" = ( -/obj/structure/cable/orange{ - icon_state = "5-6" - }, -/obj/structure/cable/orange{ - icon_state = "5-9" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood/maple, -/area/ship/construction) -"Yi" = ( -/obj/structure/cable/orange{ - icon_state = "4-5" - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"Yx" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/ship/dirt/dark, -/area/ship/roumain) -"YE" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/chair/wood/wings{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/siding/wood/corner, -/turf/open/floor/wood/mahogany, -/area/ship/roumain) -"YM" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/structure/cable/orange{ - icon_state = "6-9" - }, -/obj/machinery/door/firedoor/border_only, -/obj/structure/railing, -/turf/open/floor/wood/maple, -/area/ship/construction) -"YP" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/destructible/tribal_torch, -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -6; - pixel_x = -31 - }, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"YT" = ( -/obj/item/kirbyplants/random, -/obj/structure/flora/ausbushes/fullgrass, -/turf/open/floor/grass/ship/jungle, -/area/ship/roumain) -"Zh" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/wood/maple, -/area/ship/construction) -"Zs" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/turf/open/floor/wood/yew, -/area/ship/roumain) -"ZE" = ( -/obj/structure/flora/rock/jungle, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"ZK" = ( -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/obj/item/clothing/under/suit/roumain, -/obj/item/clothing/suit/armor/roumain, -/obj/item/clothing/head/cowboy/sec/roumain, -/obj/item/clothing/suit/armor/riot/chaplain/witchhunter, -/obj/item/clothing/head/helmet/chaplain/witchunter_hat, -/obj/item/storage/backpack/cultpack, -/obj/item/flashlight/lantern, -/obj/item/kitchen/knife/combat/survival, -/obj/item/gun/ballistic/shotgun/flamingarrow, -/obj/structure/closet/secure_closet/hunter, -/obj/item/lighter, -/obj/item/ammo_box/c38_box, -/obj/item/disk/holodisk/roumain, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/jackboots, -/obj/item/book/manual/srmlore, -/turf/open/floor/wood/ebony, -/area/ship/crew/dorm) -"ZV" = ( -/obj/structure/flora/ausbushes/reedbush, -/turf/open/floor/plating/ship/water, -/area/ship/roumain) -"ZW" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "4-6" - }, -/obj/structure/cable/orange{ - icon_state = "8-10" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) - -(1,1,1) = {" -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(2,1,1) = {" -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(3,1,1) = {" -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(4,1,1) = {" -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(5,1,1) = {" -sH -sH -sH -sH -sH -sH -sH -sH -dq -dq -Vu -Vu -Vu -Vu -ff -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(6,1,1) = {" -sH -sH -sH -sH -sH -sH -dq -dq -dq -sv -fs -DR -aF -jv -Ma -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(7,1,1) = {" -sH -sH -sH -sH -sH -dq -dq -NE -ww -yV -fs -HS -AY -ss -SL -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(8,1,1) = {" -sH -sH -sH -sH -sH -dq -aY -rE -rK -mJ -fs -Il -co -ss -SL -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(9,1,1) = {" -sH -sH -sH -sH -sH -dq -Oo -LS -Oo -Oo -fs -Sg -Jy -AM -SL -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(10,1,1) = {" -sH -sH -sH -sH -sH -dq -VB -na -AL -RT -ID -jm -jr -Vu -Vu -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(11,1,1) = {" -sH -sH -sH -sH -sH -dq -dq -tC -vn -zX -Vu -Vu -Vu -Vu -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(12,1,1) = {" -sH -sH -sH -sH -sH -sH -dq -dq -wE -dq -Vu -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(13,1,1) = {" -sH -sH -sH -sH -sH -sH -cR -yZ -CH -qZ -sA -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(14,1,1) = {" -sH -sH -sH -sH -sH -cR -Cr -AN -uY -AN -gK -sA -sH -sH -sH -sH -sH -sH -sH -sH -sH -fm -dt -dt -dt -dt -fm -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(15,1,1) = {" -sH -sH -sH -sH -cR -Cr -wp -wp -ts -wp -wp -Jx -Ho -Ho -sA -FA -FA -sH -sH -sH -fm -fm -aH -ZK -mr -ZK -fm -ge -ge -ge -sH -sH -sH -sH -sH -sH -"} -(16,1,1) = {" -sH -sH -sH -sH -Cx -wp -wp -lM -aM -Nq -wp -Ii -Dz -Dz -HB -wp -FA -FA -FA -sH -hh -ce -fP -Jc -FG -Du -cU -IZ -UZ -ge -LN -LN -LN -LN -LN -FA -"} -(17,1,1) = {" -sH -sH -cR -Wy -Cr -AN -ZV -ko -Lk -cz -YP -ds -lb -Sl -Fu -wp -wp -wp -FA -FA -hh -ce -jl -af -yq -Mh -gO -IZ -Xq -IZ -MU -go -yp -OF -cp -FA -"} -(18,1,1) = {" -sH -FA -Cx -wp -wC -wp -cg -Ac -NL -LG -NL -NL -VQ -aM -Xg -ZV -Xt -wp -wp -wC -fm -IF -iu -IF -IF -IZ -Nd -IZ -IZ -IZ -nk -Yi -JG -fa -AQ -FA -"} -(19,1,1) = {" -FA -gR -zO -wp -Ue -Qm -KX -Fp -re -Fa -TO -re -NL -RJ -NT -sm -ZV -Xt -Od -DX -rj -YT -vX -gi -bN -IZ -PU -jq -Tx -HA -lg -lO -Yi -Wd -qz -FA -"} -(20,1,1) = {" -FA -VL -vW -YE -Fd -fC -KP -Qm -VI -uI -QX -Bz -BO -NL -al -NT -cj -RF -Dg -yN -Lk -qJ -Mi -dV -bN -IZ -kD -Py -xe -MG -ln -ZW -oC -tM -qz -FA -"} -(21,1,1) = {" -FA -VL -jG -Nm -wD -GP -NL -NL -NL -nY -Lj -uM -CC -NL -CC -RJ -NL -Zs -iB -Tc -Tc -Tc -lk -CF -rD -sr -WS -bY -Yb -Zh -Jn -yz -Ra -eU -qz -md -"} -(22,1,1) = {" -FA -iY -XY -Mj -MV -qQ -Qi -iP -VI -RJ -lA -At -nj -NL -AZ -Fa -Yx -nt -iT -aM -aM -qJ -Mi -gi -bN -IZ -QQ -mS -Fr -YM -zZ -SK -jk -uP -qz -FA -"} -(23,1,1) = {" -FA -hc -sT -wp -xB -Rm -ZE -MZ -qN -NL -NL -NL -NL -NL -Ao -Un -pd -ZV -Od -DX -iq -YT -zv -xC -bN -IZ -Ul -FR -Rn -nZ -Hw -au -VX -hp -qz -FA -"} -(24,1,1) = {" -sH -FA -Cx -wp -wC -wp -Xt -XB -RJ -LG -NL -NL -VQ -Lk -wA -Xt -ZV -wp -wp -mw -fi -XZ -MR -XZ -XZ -IZ -QA -IZ -IZ -IZ -Wr -jk -Gi -gb -qz -FA -"} -(25,1,1) = {" -sH -sH -DL -xf -gE -AN -ZV -ko -DS -Lk -mj -qJ -fe -Sz -Bx -wp -wp -wp -cR -xf -Bu -Ex -JD -Ar -aS -pH -hT -IZ -NV -IZ -fv -ap -bi -sb -OR -FA -"} -(26,1,1) = {" -sH -sH -sH -sH -Cx -wp -wp -bW -Lk -hz -wp -wC -wC -wC -wC -wp -cR -xf -Cr -sH -mD -Fn -tF -PE -iR -EO -zc -IZ -EN -ge -LN -LN -LN -LN -LN -hu -"} -(27,1,1) = {" -sH -sH -sH -sH -DL -gE -wp -wp -li -wp -wp -cR -Wy -Wy -Wy -Wy -Cr -sH -sH -sH -fi -fi -xD -qv -Xp -BB -fi -ge -ge -ge -sH -sH -sH -sH -sH -sH -"} -(28,1,1) = {" -sH -sH -sH -sH -sH -DL -xf -sD -cJ -sD -xf -Cr -sH -sH -sH -sH -sH -sH -sH -sH -sH -fi -TS -TS -TS -TS -fi -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(29,1,1) = {" -sH -sH -sH -sH -sH -sH -FA -AN -LL -AN -FA -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(30,1,1) = {" -sH -sH -sH -sH -sH -sH -DG -DG -Tj -DG -wm -FA -Io -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(31,1,1) = {" -sH -sH -sH -sH -sH -DG -DG -FE -lf -ir -wm -wm -jy -wm -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(32,1,1) = {" -sH -sH -sH -sH -sH -DG -zT -bm -fz -Kk -cW -ie -BK -wm -wm -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(33,1,1) = {" -sH -sH -sH -sH -sH -DG -QJ -RU -XK -yA -bv -US -GM -tu -mE -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(34,1,1) = {" -sH -sH -sH -sH -sH -DG -EJ -Ir -MW -gd -cW -Ng -Vn -QD -mE -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(35,1,1) = {" -sH -sH -sH -sH -sH -DG -DG -Et -ac -vz -cW -pb -FW -QD -mE -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(36,1,1) = {" -sH -sH -sH -sH -sH -sH -DG -DG -DG -nO -cW -yn -NX -Sx -vd -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(37,1,1) = {" -sH -sH -sH -sH -sH -sH -sH -sH -DG -DG -wm -wm -wm -wm -wm -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(38,1,1) = {" -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(39,1,1) = {" -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(40,1,1) = {" -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} -(41,1,1) = {" -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -sH -"} diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm index 656a6e1645bf..70bfabe5d26b 100644 --- a/_maps/shuttles/solgov/solgov_paracelsus.dmm +++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm @@ -38,11 +38,18 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/starboard) "aF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "aG" = ( @@ -62,6 +69,7 @@ /obj/effect/turf_decal/borderfloorblack{ dir = 4 }, +/obj/machinery/computer/helm/viewscreen/directional/east, /turf/open/floor/plasteel/patterned, /area/ship/cargo/office) "be" = ( @@ -157,6 +165,7 @@ /obj/structure/chair/wood{ dir = 1 }, +/obj/machinery/computer/helm/viewscreen/directional/south, /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) "bD" = ( @@ -194,6 +203,8 @@ /obj/structure/chair/sofa/right{ dir = 1 }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "co" = ( @@ -295,8 +306,18 @@ "cN" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "cO" = ( @@ -743,7 +764,6 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "hM" = ( -/obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt/dust, /obj/item/clothing/neck/stripedsolgovscarf, /obj/item/clothing/neck/stripedsolgovscarf, @@ -764,6 +784,8 @@ /obj/item/clothing/suit/solgov/suit, /obj/item/clothing/suit/hooded/wintercoat/solgov, /obj/item/clothing/suit/hooded/wintercoat/solgov, +/obj/item/toy/plush/blahaj, +/obj/structure/closet/cabinet, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "if" = ( @@ -1278,16 +1300,10 @@ /turf/open/floor/plating, /area/ship/medical/surgery) "ns" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/wood, +/turf/open/floor/wood/ebony, /area/ship/crew/canteen) "nt" = ( /obj/effect/turf_decal/borderfloorblack{ @@ -1766,9 +1782,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/medical{ name = "Chemistry"; - req_one_access = list(5,45); + req_one_access = list(5,10,45); id_tag = "sg_par_chem_bolt" }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "rz" = ( @@ -1823,19 +1842,21 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/wood, /area/ship/crew/dorm) "rT" = ( /obj/structure/chair/sofa{ dir = 1 }, +/obj/machinery/computer/helm/viewscreen/directional/south, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "rY" = ( @@ -1871,7 +1892,9 @@ dir = 8 }, /obj/structure/closet/secure_closet/wall{ - pixel_y = 28 + pixel_y = 28; + name = "navigational supplies"; + req_access_txt = "19" }, /obj/item/gps, /obj/item/binoculars, @@ -2393,7 +2416,6 @@ /area/ship/crew/canteen) "xp" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing/wood, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "xw" = ( @@ -2560,19 +2582,12 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/starboard) "yY" = ( -/obj/machinery/door/airlock/solgov/glass{ - dir = 4; - name = "Cafeteria" - }, /obj/effect/turf_decal/industrial/warning{ dir = 4 }, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -2585,6 +2600,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/airlock/solgov/glass{ + dir = 4; + name = "Cafeteria" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "zc" = ( @@ -2740,6 +2762,10 @@ "AX" = ( /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) +"AZ" = ( +/obj/structure/bookcase/random, +/turf/open/floor/wood/ebony, +/area/ship/crew/dorm) "Ba" = ( /obj/effect/turf_decal/techfloor/corner{ dir = 8 @@ -2834,16 +2860,19 @@ /obj/structure/railing/wood{ dir = 8 }, -/obj/structure/closet/wall/red{ - dir = 1; - pixel_y = -28 - }, /obj/item/gun/ballistic/automatic/pistol/solgov, /obj/item/gun/ballistic/automatic/pistol/solgov, /obj/item/ammo_box/magazine/pistol556mm, /obj/item/ammo_box/magazine/pistol556mm, /obj/item/ammo_box/magazine/pistol556mm, /obj/item/ammo_box/magazine/pistol556mm, +/obj/structure/closet/secure_closet/wall{ + dir = 1; + icon_state = "sec_wall"; + name = "firearms locker"; + pixel_y = -28; + req_access_txt = "19" + }, /turf/open/floor/carpet/royalblue, /area/ship/bridge) "BU" = ( @@ -3022,10 +3051,10 @@ /turf/open/floor/wood/ebony, /area/ship/crew/crewtwo) "DD" = ( -/obj/structure/table/wood, -/obj/item/cutting_board, -/obj/item/kitchen/knife, /obj/machinery/light/directional/north, +/obj/structure/sink/kitchen{ + pixel_y = 16 + }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "DL" = ( @@ -3049,22 +3078,24 @@ /turf/open/floor/wood/yew, /area/ship/crew) "Ea" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/railing/wood, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -19; + pixel_y = -5 }, -/turf/open/floor/wood, +/obj/machinery/button/door{ + dir = 4; + id = "sg_par_cafeteria"; + name = "shutter control"; + pixel_x = -20; + pixel_y = 7 + }, +/obj/structure/table/wood, +/turf/open/floor/wood/ebony, /area/ship/crew/canteen) "Eh" = ( /obj/item/bedsheet/double/solgov{ @@ -3206,6 +3237,9 @@ pixel_x = -6; pixel_y = 2 }, +/obj/item/toy/cards/deck{ + pixel_x = 3 + }, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "EV" = ( @@ -3269,13 +3303,8 @@ "FG" = ( /obj/structure/table/wood, /obj/machinery/airalarm/directional/north, -/obj/machinery/reagentgrinder, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -17 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = -10; - pixel_y = 6 +/obj/machinery/microwave{ + pixel_y = 5 }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) @@ -3353,15 +3382,15 @@ /turf/open/floor/plasteel/mono/white, /area/ship/medical/surgery) "Hl" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = -12 +/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" }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) @@ -3515,11 +3544,17 @@ /area/ship/maintenance/starboard) "IO" = ( /obj/structure/table/wood, -/obj/machinery/microwave{ - pixel_y = 5 +/obj/machinery/reagentgrinder{ + pixel_y = 8; + pixel_x = -7 }, -/obj/structure/sign/poster/solgov/random{ - pixel_y = 30 +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = 4; + pixel_y = 10 + }, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = 10; + pixel_y = 10 }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) @@ -3796,6 +3831,15 @@ /area/ship/hallway/port) "Lw" = ( /obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "Lx" = ( @@ -3850,7 +3894,6 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo/office) "LK" = ( -/obj/structure/closet/crate/bin, /obj/effect/turf_decal/trimline/opaque/solgovblue/filled/line, /obj/machinery/button/door{ dir = 4; @@ -3868,6 +3911,7 @@ specialfunctions = 4; normaldoorcontrol = 1 }, +/obj/machinery/autolathe, /turf/open/floor/plasteel/white, /area/ship/medical) "LS" = ( @@ -3898,13 +3942,20 @@ /turf/open/floor/wood/ebony, /area/ship/hallway/starboard) "Mk" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/turf/open/floor/wood, +/obj/structure/railing/wood, +/obj/structure/closet/secure_closet/freezer{ + anchored = 1; + name = "refrigerator" + }, +/obj/item/storage/box/ingredients/vegetarian, +/obj/item/storage/box/ingredients/wildcard, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/turf/open/floor/wood/ebony, /area/ship/crew/canteen) "Mo" = ( /obj/structure/chair/office{ @@ -3966,8 +4017,7 @@ /turf/open/floor/carpet/royalblue, /area/ship/crew/office) "ML" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/structure/railing/wood, +/obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -3977,8 +4027,14 @@ /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/soymilk, /obj/item/reagent_containers/food/condiment/soymilk, -/obj/item/storage/fancy/egg_box, /obj/item/reagent_containers/food/condiment/enzyme, +/obj/structure/closet/secure_closet/freezer{ + anchored = 1; + name = "refrigerator" + }, +/obj/structure/sign/poster/solgov/random{ + pixel_y = 30 + }, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "MO" = ( @@ -4082,7 +4138,15 @@ /area/ship/medical/surgery) "NY" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_y = 12; + pixel_x = -20 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "Ol" = ( @@ -4122,16 +4186,10 @@ /turf/open/floor/wood, /area/ship/bridge) "OO" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/wood, +/turf/open/floor/wood/ebony, /area/ship/crew/canteen) "OS" = ( /obj/structure/sink/kitchen{ @@ -4233,6 +4291,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "Pk" = ( @@ -4379,15 +4440,6 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/item/radio/intercom/directional/north, /turf/open/floor/wood, /area/ship/crew/dorm) @@ -4434,6 +4486,7 @@ /obj/item/clothing/suit/solgov/suit, /obj/item/clothing/suit/hooded/wintercoat/solgov, /obj/item/clothing/suit/hooded/wintercoat/solgov, +/obj/item/toy/plush/blahaj, /turf/open/floor/wood/ebony, /area/ship/crew/dorm) "QQ" = ( @@ -4643,11 +4696,20 @@ /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/wood, /area/ship/crew/canteen) "SG" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "SK" = ( @@ -4670,19 +4732,10 @@ /area/ship/hallway/starboard) "SP" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing/wood, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -19; - pixel_y = -5 - }, -/obj/machinery/button/door{ - dir = 4; - id = "sg_par_cafeteria"; - name = "shutter control"; - pixel_x = -20; - pixel_y = 7 - }, +/obj/structure/table/wood, +/obj/item/cutting_board, +/obj/item/kitchen/knife, +/obj/item/kitchen/rollingpin, /turf/open/floor/wood/ebony, /area/ship/crew/canteen) "Tc" = ( @@ -5013,6 +5066,9 @@ /obj/item/desk_flag/solgov{ pixel_y = 3 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/carpet/royalblue, /area/ship/crew/canteen) "Wt" = ( @@ -5117,7 +5173,21 @@ /obj/effect/turf_decal/techfloor{ dir = 10 }, -/obj/machinery/autolathe, +/obj/structure/table, +/obj/item/cigbutt{ + pixel_y = 5 + }, +/obj/item/cigbutt{ + pixel_y = 15 + }, +/obj/item/cigbutt{ + pixel_y = 9; + pixel_x = -11 + }, +/obj/item/clothing/mask/cigarette/robust{ + pixel_y = 10; + pixel_x = 8 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) "Xe" = ( @@ -6281,7 +6351,7 @@ pK NY dh Wt -eH +AZ bf wI "} @@ -6313,7 +6383,7 @@ rO aF Bg Pk -eH +AZ bf wI "} @@ -6373,8 +6443,8 @@ qL qL qL Ev -yY vL +yY Ky Ky Ky diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt index aa2ede4dca64..a95d150418a6 100644 --- a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt +++ b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt @@ -30,7 +30,7 @@ File Path = "_maps\shuttles\subshuttles\independant_pill.dmm" Name = "blackpill" Size = "1x3" -Purpose = "Supposedly an manned torpedo. What is this. Subtest?" +Purpose = "Supposedly a manned torpedo. What is this. Subtest?" File Path = "_maps\shuttles\subshuttles\independant_pill.dmm" Name = "Superpill" @@ -43,4 +43,23 @@ Size = "13x7" Purpose = "A Nanotrasen dropship, primarily used by Heron-Class carriers." File Path = "_maps\shuttles\subshuttles\nanotrasen_falcon.dmm" +Name = "Crux Dropship" +Size = "12x7" +Purpose = "A very common general-purpose transport Minutemen vessel." +File Path = "_maps\shuttles\subshuttles\minutemen_crux.dmm" + +Name = "Ancon Intern Ship" +Size = "15x11" +Purpose = "A CentCom internship ship, which is essentially a small office with thrusters." +File Path = "_maps\shuttles\subshuttles\nanotrasen_ancon.dmm" + +Name = "Anvil Dropship" +Size = "15x11" +Purpose = "A general-purpose, Inteq-made dropship." +File Path = "_maps\shuttles\subshuttles\inteq_anvil.dmm" + +Name = "Runner Ambulance" +Size = "15x11" +Purpose = "An ambulance procured by Cybersun for use with smaller Trauma Teams." +File Path = "_maps\shuttles\subshuttles\syndicate_runner.dmm" diff --git a/_maps/shuttles/subshuttles/inteq_anvil.dmm b/_maps/shuttles/subshuttles/inteq_anvil.dmm new file mode 100644 index 000000000000..b210a8874ded --- /dev/null +++ b/_maps/shuttles/subshuttles/inteq_anvil.dmm @@ -0,0 +1,543 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"b" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/machinery/fax, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"c" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) +"d" = ( +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/machinery/light/directional/east, +/obj/structure/closet/emcloset/wall{ + dir = 1; + pixel_y = -28 + }, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"e" = ( +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ + dir = 8 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "1-6" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"g" = ( +/obj/machinery/power/smes/shuttle/precharged, +/obj/structure/cable, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"h" = ( +/obj/structure/cable{ + icon_state = "2-9" + }, +/obj/structure/cable{ + icon_state = "1-9" + }, +/obj/structure/cable{ + icon_state = "4-9" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"i" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"m" = ( +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/landmark/ert_shuttle_brief_spawn, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"n" = ( +/obj/structure/chair, +/obj/machinery/door/window/brigdoor/southright, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"o" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable/yellow, +/obj/machinery/light/directional/south, +/obj/item/stack/sheet/mineral/plasma/twenty, +/turf/open/floor/plating, +/area/ship/bridge) +"q" = ( +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"r" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/button/door{ + dir = 8; + pixel_x = 20; + pixel_y = 12; + id = "anvil_door" + }, +/obj/machinery/button/shieldwallgen{ + dir = 8; + pixel_x = 20; + pixel_y = 2; + id = "anvil_holo" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"t" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/light_switch{ + pixel_y = 22; + pixel_x = 11 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"u" = ( +/obj/machinery/door/poddoor{ + dir = 4; + id = "anvil_door" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + id = "anvil_holo" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"v" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) +"w" = ( +/turf/template_noop, +/area/template_noop) +"x" = ( +/obj/machinery/porta_turret/ship/weak{ + faction = list("playerInteq","turret"); + dir = 1 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"y" = ( +/obj/machinery/power/terminal, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"z" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/window/reinforced, +/turf/open/floor/plating, +/area/ship/bridge) +"A" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/structure/chair/comfy/shuttle, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/machinery/turretid{ + pixel_y = 25 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"B" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/item/radio/intercom/wideband/table{ + dir = 4; + pixel_x = -1 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"D" = ( +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"E" = ( +/obj/structure/grille, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/external) +"F" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plating, +/area/ship/bridge) +"G" = ( +/obj/machinery/door/airlock/security{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"H" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/structure/chair/comfy/shuttle, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"I" = ( +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 1; + id = "anvil_holo" + }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "anvil_door" + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"K" = ( +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"L" = ( +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/bridge) +"M" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"O" = ( +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"P" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/grille, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) +"Q" = ( +/obj/docking_port/mobile{ + dir = 8; + name = "anvil dock"; + preferred_direction = 4 + }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "anvil_door" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"R" = ( +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"S" = ( +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"T" = ( +/obj/machinery/porta_turret/ship/weak{ + faction = list("playerInteq","turret") + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"U" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"W" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/grille, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) +"X" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/bridge) +"Y" = ( +/obj/machinery/computer/helm{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"Z" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) + +(1,1,1) = {" +w +x +X +u +Q +I +X +T +w +"} +(2,1,1) = {" +c +i +F +e +O +K +o +i +v +"} +(3,1,1) = {" +P +E +g +r +h +y +z +E +W +"} +(4,1,1) = {" +w +i +i +i +G +i +i +i +w +"} +(5,1,1) = {" +w +i +n +D +m +D +b +i +w +"} +(6,1,1) = {" +w +i +X +t +Z +R +U +X +w +"} +(7,1,1) = {" +w +X +H +R +R +R +q +X +w +"} +(8,1,1) = {" +w +X +A +S +M +S +d +X +w +"} +(9,1,1) = {" +w +i +i +Y +B +a +i +i +w +"} +(10,1,1) = {" +w +w +i +L +L +L +i +w +w +"} diff --git a/_maps/shuttles/subshuttles/minutemen_crux.dmm b/_maps/shuttles/subshuttles/minutemen_crux.dmm new file mode 100644 index 000000000000..3e32e2694bc6 --- /dev/null +++ b/_maps/shuttles/subshuttles/minutemen_crux.dmm @@ -0,0 +1,489 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/turf_decal/techfloor{ + dir = 10 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4; + name = "tactical chair" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"b" = ( +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + id = "crux_holofan" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor{ + id = "crux_blastdoors"; + dir = 4 + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/bridge) +"d" = ( +/obj/structure/cable{ + icon_state = "1-10" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/machinery/holopad/emergency/command, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/landmark/ert_shuttle_brief_spawn, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"f" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"g" = ( +/obj/docking_port/mobile{ + dir = 8; + name = "crux dock"; + preferred_direction = 8 + }, +/obj/machinery/door/poddoor{ + id = "crux_blastdoors"; + dir = 4 + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/bridge) +"h" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/directional/north, +/obj/structure/chair/comfy/shuttle, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"i" = ( +/obj/effect/turf_decal/steeldecal/steel_decals10, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"k" = ( +/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + id = "crux_windows" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"m" = ( +/turf/template_noop, +/area/template_noop) +"o" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + id = "crux_holofan"; + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor{ + id = "crux_blastdoors"; + dir = 4 + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/bridge) +"q" = ( +/obj/effect/turf_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/structure/sign/poster/official/obey{ + pixel_x = -32 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/bridge) +"r" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "crux_blastdoors"; + name = "Cargo Bay Doors"; + pixel_y = -22; + pixel_x = -4; + dir = 1 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"u" = ( +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/steeldecal/steel_decals10, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"v" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"w" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ship/bridge) +"x" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/shuttle/engine/electric/premium{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"y" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/caution{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/ship/bridge) +"z" = ( +/turf/closed/wall/r_wall/syndicate, +/area/ship/bridge) +"A" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-10" + }, +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/steeldecal/steel_decals6, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"B" = ( +/obj/machinery/door/window/brigdoor/southright{ + req_one_access = list(1) + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"E" = ( +/obj/effect/turf_decal/corner/opaque/black/diagonal, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/industrial/warning{ + color = "#808080" + }, +/turf/open/floor/plasteel, +/area/ship/bridge) +"G" = ( +/obj/effect/turf_decal/techfloor/orange{ + dir = 4 + }, +/obj/effect/turf_decal/techfloor/hole{ + dir = 4 + }, +/obj/machinery/power/port_gen/pacman, +/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/structure/cable{ + icon_state = "0-5" + }, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/bridge) +"I" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 + }, +/obj/structure/sign/minutemen{ + pixel_y = 28 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/ship/bridge) +"J" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/computer/crew{ + dir = 8 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"L" = ( +/obj/structure/bed, +/obj/item/bedsheet, +/obj/effect/turf_decal/corner/opaque/black/diagonal, +/turf/open/floor/plasteel, +/area/ship/bridge) +"M" = ( +/obj/effect/turf_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/button/door{ + id = "crux_windows"; + name = "Window Shutters"; + pixel_y = -22; + pixel_x = -22; + dir = 4 + }, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/bridge) +"N" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/machinery/button/door{ + id = "crux_windows"; + name = "Window Blast Doors"; + pixel_y = 10; + pixel_x = -22; + dir = 4 + }, +/obj/machinery/recharger{ + pixel_x = 6 + }, +/obj/machinery/button/shieldwallgen{ + id = "crux_holofan"; + pixel_x = -21; + pixel_y = -3; + dir = 4 + }, +/obj/item/paper_bin{ + pixel_x = -6 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"P" = ( +/obj/effect/turf_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"Q" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/stairs{ + icon = 'icons/obj/stairs.dmi'; + dir = 8 + }, +/area/ship/bridge) +"S" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/eastleft, +/obj/machinery/door/poddoor{ + id = "crux_windows"; + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"T" = ( +/obj/effect/turf_decal/techfloor{ + dir = 6 + }, +/obj/machinery/computer/helm{ + dir = 8 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"U" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/obj/structure/sign/minutemen{ + pixel_y = -32 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel, +/area/ship/bridge) +"X" = ( +/obj/structure/guncase, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/techfloor{ + dir = 9 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"Y" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/steeldecal/steel_decals10, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/item/radio/intercom/directional/south{ + pixel_x = -12 + }, +/obj/machinery/firealarm/directional/south{ + pixel_x = 7 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) + +(1,1,1) = {" +m +m +w +x +w +m +m +"} +(2,1,1) = {" +m +w +w +S +w +w +m +"} +(3,1,1) = {" +w +w +q +M +G +w +w +"} +(4,1,1) = {" +k +N +a +d +B +E +w +"} +(5,1,1) = {" +k +J +T +Q +X +L +w +"} +(6,1,1) = {" +k +w +h +v +f +w +w +"} +(7,1,1) = {" +m +w +A +P +r +w +m +"} +(8,1,1) = {" +m +w +u +i +Y +w +m +"} +(9,1,1) = {" +m +w +I +y +U +w +m +"} +(10,1,1) = {" +m +z +b +g +o +z +m +"} diff --git a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm new file mode 100644 index 000000000000..4565f12416f6 --- /dev/null +++ b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm @@ -0,0 +1,555 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aD" = ( +/obj/effect/turf_decal/corner/opaque/green/diagonal, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"aW" = ( +/obj/machinery/computer/card/centcom{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"br" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"dw" = ( +/obj/machinery/door/airlock/external/glass{ + dir = 4 + }, +/obj/docking_port/mobile{ + dir = 8; + name = "ancon dock"; + preferred_direction = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"hj" = ( +/obj/effect/turf_decal/corner/opaque/green/diagonal{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/light, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"jj" = ( +/obj/effect/turf_decal/trimline/opaque/green/warning{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"kE" = ( +/obj/effect/turf_decal/corner/opaque/green/half{ + dir = 1 + }, +/obj/machinery/power/port_gen/pacman, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/item/stack/sheet/mineral/plasma/fifty, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"lu" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/corner/opaque/green/half{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"nV" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/green/diagonal{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 4 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"pk" = ( +/obj/effect/turf_decal/trimline/opaque/green/corner{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-5" + }, +/obj/structure/cable{ + icon_state = "1-5" + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"te" = ( +/obj/effect/turf_decal/corner/opaque/green/diagonal, +/obj/effect/turf_decal/siding/thinplating/light, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"tk" = ( +/turf/template_noop, +/area/template_noop) +"ty" = ( +/obj/effect/turf_decal/corner/opaque/green/diagonal{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 6 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/light/directional/east, +/obj/machinery/light_switch{ + pixel_x = 12; + pixel_y = -19; + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"up" = ( +/obj/machinery/photocopier, +/obj/effect/turf_decal/corner/opaque/green/half, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"vV" = ( +/obj/structure/closet/emcloset/wall{ + pixel_y = 28 + }, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/turf/open/floor/plating, +/area/ship/bridge) +"xH" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/structure/table, +/obj/item/taperecorder{ + pixel_x = -12; + pixel_y = 9 + }, +/obj/item/taperecorder{ + pixel_y = 8; + pixel_x = -2 + }, +/obj/item/tape{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/tape{ + pixel_x = 4; + pixel_y = 1 + }, +/turf/open/floor/wood, +/area/ship/bridge) +"xZ" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/machinery/door/window/eastleft, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "ancon_engine"; + name = "Engine Shutters"; + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"yi" = ( +/obj/effect/turf_decal/corner/opaque/green/border{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ship/bridge) +"yp" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/shuttle, +/turf/open/floor/plating, +/area/ship/bridge) +"zI" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/table, +/obj/item/camera{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/camera{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/camera_film{ + pixel_x = -11; + pixel_y = -6 + }, +/obj/item/camera_film{ + pixel_x = -5; + pixel_y = -9 + }, +/turf/open/floor/wood, +/area/ship/bridge) +"zJ" = ( +/obj/machinery/power/shuttle/engine/electric/premium{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"Ct" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/green/diagonal{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 8 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"DF" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/effect/turf_decal/corner/opaque/green/half, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"Fz" = ( +/obj/effect/turf_decal/corner/opaque/green/diagonal{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 9 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"FS" = ( +/obj/effect/turf_decal/corner/opaque/green/diagonal, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 5 + }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"IJ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_y = 3 + }, +/obj/item/pen{ + pixel_y = 3 + }, +/turf/open/floor/wood, +/area/ship/bridge) +"KF" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/structure/table, +/obj/item/clipboard{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/clipboard{ + pixel_x = 5 + }, +/turf/open/floor/wood, +/area/ship/bridge) +"LE" = ( +/turf/closed/wall/mineral/titanium, +/area/template_noop) +"LV" = ( +/turf/closed/wall/mineral/titanium, +/area/ship/bridge) +"MW" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/green/diagonal{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 8 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"Nk" = ( +/obj/effect/turf_decal/trimline/opaque/green/corner{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"Om" = ( +/obj/machinery/door/airlock/external/glass{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"Rg" = ( +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 4 + }, +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/green/diagonal{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 4 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"Rz" = ( +/obj/effect/turf_decal/corner/opaque/green/half{ + dir = 1 + }, +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-10" + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"SI" = ( +/obj/effect/turf_decal/corner/opaque/green/border{ + dir = 4 + }, +/obj/structure/chair/comfy{ + dir = 4 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel, +/area/ship/bridge) +"Th" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/machinery/door/window/eastright, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "ancon_engine"; + name = "Engine Shutters"; + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"TQ" = ( +/obj/effect/turf_decal/corner/opaque/green/diagonal{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"Vu" = ( +/obj/machinery/computer/helm{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"XH" = ( +/obj/effect/turf_decal/corner/opaque/green/diagonal{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 1 + }, +/obj/effect/landmark/ert_shuttle_brief_spawn, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"Zr" = ( +/turf/open/floor/plating, +/area/ship/bridge) +"ZG" = ( +/obj/structure/table, +/obj/machinery/fax{ + pixel_y = 5 + }, +/obj/effect/turf_decal/corner/opaque/green/half, +/turf/open/floor/plasteel/white, +/area/ship/bridge) + +(1,1,1) = {" +tk +tk +LV +dw +br +LV +tk +tk +"} +(2,1,1) = {" +tk +zJ +LV +vV +Zr +LV +zJ +tk +"} +(3,1,1) = {" +LV +xZ +LV +Om +Om +LV +Th +LV +"} +(4,1,1) = {" +yp +lu +pk +jj +jj +Nk +DF +yp +"} +(5,1,1) = {" +yp +Rz +Fz +Ct +MW +TQ +ZG +yp +"} +(6,1,1) = {" +yp +kE +XH +KF +IJ +hj +up +yp +"} +(7,1,1) = {" +LV +LV +aD +zI +xH +te +LV +LV +"} +(8,1,1) = {" +tk +LV +FS +nV +Rg +ty +LV +tk +"} +(9,1,1) = {" +tk +LV +LV +SI +yi +LV +LV +tk +"} +(10,1,1) = {" +tk +tk +LV +Vu +aW +LV +tk +tk +"} +(11,1,1) = {" +tk +tk +LV +yp +yp +LE +tk +tk +"} diff --git a/_maps/shuttles/subshuttles/syndicate_runner.dmm b/_maps/shuttles/subshuttles/syndicate_runner.dmm new file mode 100644 index 000000000000..21e4f84a10e5 --- /dev/null +++ b/_maps/shuttles/subshuttles/syndicate_runner.dmm @@ -0,0 +1,638 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/machinery/power/smes/shuttle/precharged, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ship/bridge) +"ac" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"ae" = ( +/obj/structure/table/chem, +/obj/structure/sink/chem{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"af" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/engine/hull, +/area/ship/external) +"ah" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 4 + }, +/obj/machinery/holopad/emergency/medical, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"aj" = ( +/obj/machinery/power/shuttle/engine/electric/premium{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/engine/hull, +/area/ship/external) +"ak" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_ccw{ + dir = 1; + pixel_y = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/corner, +/obj/machinery/power/terminal, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"al" = ( +/obj/structure/table/chem, +/obj/item/reagent_containers/glass/bottle/bicaridine{ + pixel_x = 7; + pixel_y = 14 + }, +/obj/item/reagent_containers/glass/bottle/antitoxin{ + pixel_x = -4; + pixel_y = 10 + }, +/obj/item/reagent_containers/glass/bottle/kelotane{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/reagent_containers/glass/bottle/dexalin{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 8 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"bz" = ( +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "runner_top_holo" + }, +/obj/machinery/door/poddoor{ + id = "runner_top_door" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"bG" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_cw{ + dir = 1 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{ + dir = 8 + }, +/obj/machinery/button/shieldwallgen{ + dir = 1; + pixel_y = -20; + pixel_x = -12; + id = "runner_sub_holo" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/button/door{ + pixel_y = -21; + pixel_x = -1; + id = "runner_sub_door"; + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"bY" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"co" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, +/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"cF" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_ccw, +/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{ + dir = 1 + }, +/obj/structure/closet/emcloset/wall{ + dir = 8; + pixel_x = 28 + }, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/machinery/button/shieldwallgen{ + pixel_y = 20; + pixel_x = -12; + id = "runner_top_holo" + }, +/obj/machinery/button/door{ + pixel_y = 21; + pixel_x = -1; + id = "runner_top_door" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"dB" = ( +/obj/machinery/door/poddoor{ + id = "runner_sub_door" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "runner_sub_holo" + }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"fa" = ( +/obj/machinery/computer/crew/syndie{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"gi" = ( +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/structure/table/chem, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"gs" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"gA" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"hB" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"hJ" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"iR" = ( +/obj/machinery/stasis, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"ku" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"kM" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"lp" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/wideband/table{ + dir = 4; + pixel_x = 4; + pixel_y = 9 + }, +/obj/item/radio/intercom/table{ + dir = 4; + pixel_x = 4; + pixel_y = -6 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/button/door{ + pixel_x = -9; + dir = 8; + pixel_y = 8; + id = "runner_bridge" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"nP" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, +/obj/effect/turf_decal/trimline/opaque/bar/filled/warning{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"rR" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "runner_bridge" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"sl" = ( +/obj/machinery/door/poddoor{ + id = "runner_top_door" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "runner_top_holo" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"te" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/engine/hull, +/area/ship/external) +"wg" = ( +/obj/machinery/computer/helm{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"zS" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/warning, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"DP" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 6 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/landmark/ert_shuttle_spawn, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"DW" = ( +/obj/machinery/power/shuttle/engine/electric/premium{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/open/floor/engine/hull, +/area/ship/external) +"Or" = ( +/obj/docking_port/mobile{ + dir = 2; + name = "trauma team shuttle"; + port_direction = 8; + preferred_direction = 4 + }, +/obj/machinery/door/poddoor{ + id = "runner_sub_door" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "runner_sub_holo" + }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"Pq" = ( +/turf/template_noop, +/area/template_noop) +"PD" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"Rz" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/machinery/light_switch{ + pixel_y = 22; + pixel_x = 13 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"RO" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"SE" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/bar/warning{ + dir = 4 + }, +/obj/effect/landmark/ert_shuttle_brief_spawn, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"Wx" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"ZN" = ( +/obj/machinery/stasis, +/obj/item/tank/internals/anesthetic{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/tank/internals/anesthetic{ + pixel_x = -8; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath/medical{ + pixel_y = -4; + pixel_x = 7 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"ZV" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/filled/shrink_cw, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/corner{ + dir = 4 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/landmark/ert_shuttle_spawn, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) + +(1,1,1) = {" +Pq +Pq +PD +PD +PD +PD +PD +Pq +Pq +"} +(2,1,1) = {" +DW +PD +PD +gi +ae +al +PD +PD +aj +"} +(3,1,1) = {" +af +aa +ZV +Wx +bY +RO +ak +gs +te +"} +(4,1,1) = {" +Pq +bz +co +gA +SE +ku +zS +dB +Pq +"} +(5,1,1) = {" +Pq +sl +nP +ZN +kM +iR +zS +Or +Pq +"} +(6,1,1) = {" +Pq +PD +cF +hJ +ac +hB +bG +PD +Pq +"} +(7,1,1) = {" +Pq +PD +PD +Rz +ah +DP +PD +PD +Pq +"} +(8,1,1) = {" +Pq +Pq +PD +wg +lp +fa +PD +Pq +Pq +"} +(9,1,1) = {" +Pq +Pq +PD +rR +rR +rR +PD +Pq +Pq +"} diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm index 12dbcaea4daa..e3534485955f 100644 --- a/_maps/shuttles/syndicate/syndicate_aegis.dmm +++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm @@ -30,29 +30,27 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/item/clothing/head/HoS/beret/syndicate, -/obj/item/clothing/head/HoS/syndicate, -/obj/item/clothing/suit/armor/vest/capcarapace/syndicate, -/obj/item/clothing/under/syndicate/officer, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/neck/stripedredscarf, /obj/item/clothing/neck/tie/red, -/obj/item/clothing/shoes/combat, /obj/structure/closet/wall/red{ dir = 8; name = "Captain's Locker"; - pixel_x = 30 + pixel_x = 30; + req_access_txt = "20" }, /obj/item/storage/belt/sabre, /obj/item/reagent_containers/glass/beaker/unholywater, -/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/breath/suns, +/obj/item/clothing/gloves/suns/captain, +/obj/item/clothing/neck/cloak/suns/cap, +/obj/item/clothing/head/suns/captain, +/obj/item/clothing/shoes/combat/suns, +/obj/item/clothing/suit/armor/vest/bulletproof/suns/captain, +/obj/item/clothing/under/syndicate/suns/captain, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/mask/gas/suns, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) -"az" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew/dorm) "aB" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -119,10 +117,6 @@ /obj/effect/decal/cleanable/food/plant_smudge, /turf/open/floor/plasteel/tech, /area/ship/crew/hydroponics) -"aR" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/janitor) "aW" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -150,6 +144,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/item/clothing/shoes/jackboots/suns, +/obj/item/clothing/mask/gas/suns, /turf/open/floor/plasteel/tech, /area/ship/cargo) "bf" = ( @@ -228,11 +224,9 @@ dir = 5 }, /obj/structure/table/wood, -/obj/item/paper_bin/carbon, /obj/item/clothing/under/rank/medical/psychiatrist, /obj/item/stack/sheet/mineral/wood/fifty, /obj/item/lighter, -/obj/item/clothing/suit/toggle/labcoat, /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/white, /obj/item/clothing/gloves/color/latex/nitrile/evil, @@ -246,7 +240,16 @@ name = "Psychologists Locker"; pixel_y = 28 }, -/obj/item/gun/syringe/syndicate, +/obj/item/clothing/head/suns, +/obj/item/clothing/gloves/suns/xo, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/gloves/color/latex/nitrile/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/sneakers/suns, +/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat, +/obj/item/clothing/mask/surgical/suns, +/obj/item/clothing/gloves/suns/xo, +/obj/item/flashlight/pen, /turf/open/floor/carpet/red, /area/ship/crew/office) "bx" = ( @@ -507,9 +510,6 @@ pixel_y = 29 }, /obj/structure/catwalk/over, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 1 }, @@ -569,26 +569,38 @@ /obj/item/surgicaldrill/advanced, /obj/item/healthanalyzer/advanced, /obj/item/clothing/glasses/hud/health/sunglasses, -/obj/item/clothing/shoes/combat, /obj/item/clothing/neck/stripedredscarf, /obj/item/clothing/neck/stripedbluescarf, /obj/structure/closet/wall/red{ name = "Lead Doctor's Locker"; pixel_y = 28 }, -/obj/item/clothing/neck/tie/blue, -/obj/item/clothing/head/beret/black, -/obj/item/clothing/under/syndicate/sniper, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/clothing/suit/armor/vest/security/brig_phys{ name = "lead doctor's jacket" }, -/obj/item/clothing/gloves/color/latex/nitrile, /obj/item/clothing/glasses/hud/health/night, -/obj/item/clothing/suit/armor/vest/marine/medium{ - name = "medium medical armor vest" - }, /obj/item/hypospray/mkii/CMO, +/obj/item/clothing/under/syndicate/suns/xo, +/obj/item/clothing/head/suns, +/obj/item/clothing/mask/breath/suns, +/obj/item/clothing/gloves/suns/xo, +/obj/item/clothing/head/suns/surgery, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/neck/cloak/suns/xo, +/obj/item/clothing/gloves/color/latex/nitrile/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/sneakers/suns, +/obj/item/clothing/suit/armor/vest/bulletproof/suns/xo, +/obj/item/clothing/suit/hooded/suns, +/obj/item/clothing/suit/toggle/labcoat/suns/cmo, +/obj/item/clothing/under/syndicate/suns/sciencejumpsuit, +/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat, +/obj/item/clothing/shoes/combat/suns, +/obj/item/clothing/mask/surgical/suns, +/obj/item/clothing/glasses/science/suns, +/obj/item/flashlight/pen, +/obj/item/autosurgeon/cmo, /turf/open/floor/carpet/blue, /area/ship/medical) "dZ" = ( @@ -672,6 +684,7 @@ /obj/item/clothing/shoes/laceup, /obj/item/clothing/gloves/color/black, /obj/item/reagent_containers/food/drinks/shaker, +/obj/item/clothing/mask/breath/suns, /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) "ff" = ( @@ -829,9 +842,6 @@ /obj/effect/turf_decal/corner_techfloor_grid{ dir = 5 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/components/binary/pump{ dir = 1; layer = 2.35; @@ -843,9 +853,10 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "gz" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/office) +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/solgov/suns, +/turf/open/floor/plasteel/tech, +/area/ship/crew/dorm) "gA" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -991,6 +1002,12 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/wall/white{ + pixel_y = 26; + name = "bureaucratic supplies" + }, +/obj/item/paper_bin, +/obj/item/pen/fountain, /turf/open/floor/wood/walnut, /area/ship/crew/office) "hl" = ( @@ -1337,23 +1354,32 @@ /turf/open/floor/carpet/red, /area/ship/bridge) "kz" = ( -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/structure/closet/syndicate{ desc = "It's a basic storage unit."; name = "uniform closet" }, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/shoes/combat, /obj/effect/turf_decal/siding/wood{ dir = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/syndicate{ - pixel_x = 32 - }, -/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/suit/toggle/suns/alt, +/obj/item/clothing/suit/toggle/suns/alt, +/obj/item/clothing/suit/toggle/suns, +/obj/item/clothing/suit/toggle/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/neck/cloak/suns, +/obj/item/clothing/mask/gas/suns, +/obj/item/clothing/mask/gas/suns, +/obj/item/clothing/gloves/suns, +/obj/item/clothing/gloves/suns, +/obj/item/clothing/gloves/suns, +/obj/item/clothing/gloves/suns, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) "kI" = ( @@ -1414,13 +1440,13 @@ dir = 4 }, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/head/helmet/space/syndicate/black/med, -/obj/item/clothing/suit/space/syndicate/black/med, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/warning/vacuum{ pixel_x = -30 }, -/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/suit/space/syndicate/suns, +/obj/item/clothing/head/helmet/space/syndicate/suns, +/obj/item/clothing/mask/gas/suns, /turf/open/floor/plasteel/tech, /area/ship/cargo) "lx" = ( @@ -1444,10 +1470,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/medical) -"lQ" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/hydroponics) "lY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/decal/cleanable/dirt, @@ -1618,9 +1640,6 @@ /area/ship/engineering) "mS" = ( /obj/machinery/light/small/directional/south, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1; layer = 2.35 @@ -1746,6 +1765,7 @@ }, /obj/item/paper_bin/bundlenatural, /obj/effect/turf_decal/siding/wood, +/obj/item/pen/fountain/captain, /turf/open/floor/carpet/red, /area/ship/bridge) "oJ" = ( @@ -1848,47 +1868,6 @@ "pu" = ( /turf/open/floor/wood/walnut, /area/ship/bridge) -"pI" = ( -/obj/structure/closet/wall/orange{ - name = "Engineering locker"; - pixel_y = 30 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/obj/item/clothing/suit/space/syndicate/black/engie, -/obj/item/clothing/head/helmet/space/syndicate/black/engie, -/obj/item/tank/internals/oxygen, -/obj/item/extinguisher/advanced, -/obj/item/storage/toolbox/syndicate{ - name = "syndicate toolbox"; - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/storage/belt/utility{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/holosign_creator/atmos, -/obj/item/clothing/gloves/color/orange, -/obj/item/clothing/neck/scarf/orange, -/obj/item/clothing/neck/tie/orange, -/obj/item/clothing/glasses/hud/diagnostic/night, -/obj/item/clothing/glasses/meson/engine/tray, -/obj/item/clothing/head/beret/eng/hazard, -/obj/structure/catwalk/over, -/obj/item/clothing/gloves/color/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/item/tank/internals/emergency_oxygen/engi, -/turf/open/floor/plating, -/area/ship/engineering) "pS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2212,10 +2191,6 @@ /obj/item/seeds/corn, /turf/open/floor/plasteel/tech, /area/ship/crew/hydroponics) -"sI" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering) "sN" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor/shutters{ @@ -2240,9 +2215,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/hallway/central) "tn" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/components/unary/tank/toxins{ dir = 1; layer = 2.35 @@ -2367,7 +2339,7 @@ name = "Cooks Clothing"; pixel_x = -30 }, -/obj/item/book/manual/wiki/cooking_to_serve_man, +/obj/item/book/manual/wiki/cooking, /obj/item/clothing/under/rank/civilian/chef, /obj/item/clothing/under/rank/civilian/chef/skirt, /obj/item/clothing/suit/toggle/chef, @@ -2379,6 +2351,7 @@ /obj/item/circuitboard/machine/processor, /obj/item/circuitboard/machine/gibber, /obj/item/circuitboard/machine/deep_fryer, +/obj/item/clothing/mask/breath/suns, /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) "vj" = ( @@ -2404,28 +2377,13 @@ dir = 8 }, /obj/item/tank/internals/oxygen, -/obj/item/extinguisher/advanced, /obj/item/storage/toolbox/syndicate{ name = "syndicate toolbox"; pixel_x = -3; pixel_y = 5 }, -/obj/item/storage/belt/utility{ - pixel_x = 3; - pixel_y = 5 - }, /obj/item/storage/belt/utility/syndicate, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/holosign_creator/atmos, -/obj/item/clothing/gloves/color/orange, -/obj/item/clothing/neck/scarf/orange, -/obj/item/clothing/neck/tie/orange, -/obj/item/clothing/glasses/hud/diagnostic/night, -/obj/item/clothing/glasses/meson/engine/tray, -/obj/item/clothing/head/beret/eng/hazard, /obj/structure/catwalk/over, -/obj/item/clothing/gloves/color/yellow, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -2434,6 +2392,13 @@ icon_state = "4-8" }, /obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/gloves/suns/yellow, +/obj/item/clothing/shoes/jackboots/suns, +/obj/item/clothing/suit/toggle/suns/workervest, +/obj/item/clothing/under/syndicate/suns/workerjumpsuit, +/obj/item/clothing/mask/gas/suns, +/obj/item/clothing/head/safety_helmet/suns, +/obj/item/clothing/glasses/meson/engine, /turf/open/floor/plating, /area/ship/engineering) "vw" = ( @@ -2479,9 +2444,6 @@ dir = 5 }, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, /obj/structure/railing{ dir = 1 }, @@ -2492,20 +2454,34 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "wh" = ( -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/structure/closet/syndicate{ desc = "It's a basic storage unit."; name = "uniform closet" }, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/shoes/combat, /obj/effect/turf_decal/siding/wood{ dir = 6 }, /obj/machinery/airalarm/directional/east, -/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/under/syndicate/suns/uniform3, +/obj/item/clothing/under/syndicate/suns/uniform3, +/obj/item/clothing/under/syndicate/suns/uniform2, +/obj/item/clothing/under/syndicate/suns/uniform2, +/obj/item/clothing/under/syndicate/suns, +/obj/item/clothing/under/syndicate/suns, +/obj/item/clothing/under/syndicate/suns/alt, +/obj/item/clothing/under/syndicate/suns/alt, +/obj/item/clothing/under/syndicate/suns/uniform2/alt, +/obj/item/clothing/under/syndicate/suns/uniform2/alt, +/obj/item/clothing/under/syndicate/suns/uniform3/alt, +/obj/item/clothing/under/syndicate/suns/uniform3/alt, +/obj/item/clothing/accessory/waistcoat/suns/poof, +/obj/item/clothing/accessory/waistcoat/suns/poof, +/obj/item/clothing/accessory/waistcoat/suns/ribbon, +/obj/item/clothing/accessory/waistcoat/suns/ribbon, +/obj/item/clothing/accessory/waistcoat/suns/gembow, +/obj/item/clothing/accessory/waistcoat/suns/gembow, +/obj/item/clothing/accessory/waistcoat/suns, +/obj/item/clothing/accessory/waistcoat/suns, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) "wk" = ( @@ -2542,8 +2518,12 @@ /turf/open/floor/plating, /area/ship/engineering) "wM" = ( -/obj/structure/frame/machine, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/item/clothing/mask/gas/suns, +/obj/item/clothing/mask/gas/suns, +/obj/item/clothing/mask/gas/suns, +/obj/item/holosign_creator/atmos, +/obj/structure/rack, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "wQ" = ( @@ -3133,42 +3113,6 @@ /obj/structure/table/wood/reinforced, /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) -"DX" = ( -/obj/structure/closet/wall/white/med{ - name = "medical locker"; - pixel_y = 29 - }, -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/storage/belt/medical/surgery, -/obj/item/clothing/suit/longcoat/brig_phys{ - name = "syndicate medic's longcoat" - }, -/obj/item/clothing/suit/longcoat/roboblack{ - name = "syndicate medic's black longcoat" - }, -/obj/item/clothing/under/rank/medical/doctor/red, -/obj/item/clothing/suit/longcoat, -/obj/item/clothing/neck/stripedbluescarf, -/obj/item/clothing/neck/stripedredscarf, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/suit/hooded/wintercoat/medical, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/item/wallframe/defib_mount, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/item/hypospray/mkii, -/obj/item/clothing/mask/surgical, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/clothing/glasses/hud/health, -/obj/item/storage/firstaid/regular, -/turf/open/floor/plasteel/dark, -/area/ship/medical) "Ee" = ( /obj/structure/chair/sofa{ dir = 1 @@ -3337,9 +3281,6 @@ /turf/open/floor/plating, /area/ship/bridge) "FS" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/decal/cleanable/oil/slippery, /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/tech/techmaint, @@ -3477,6 +3418,8 @@ /obj/item/mining_scanner, /obj/item/radio, /obj/effect/turf_decal/corner_techfloor_grid/diagonal, +/obj/item/clothing/shoes/jackboots/suns, +/obj/item/clothing/mask/gas/suns, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Hp" = ( @@ -3496,7 +3439,8 @@ /obj/effect/turf_decal/techfloor{ dir = 5 }, -/obj/structure/frame/machine, +/obj/item/clothing/suit/space/hardsuit/mining/suns, +/obj/machinery/suit_storage_unit/inherit, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "Im" = ( @@ -3645,33 +3589,37 @@ }, /obj/item/clothing/gloves/color/latex/nitrile/evil, /obj/item/storage/belt/medical/surgery, -/obj/item/clothing/suit/longcoat/brig_phys{ - name = "syndicate medic's longcoat" - }, -/obj/item/clothing/suit/longcoat/roboblack{ - name = "syndicate medic's black longcoat" - }, -/obj/item/clothing/under/rank/medical/doctor/red, -/obj/item/clothing/suit/longcoat, /obj/item/clothing/neck/stripedbluescarf, /obj/item/clothing/neck/stripedredscarf, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/suit/hooded/wintercoat/medical, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 + dir = 4 }, /obj/item/wallframe/defib_mount, -/obj/item/defibrillator/loaded, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + dir = 8 }, +/obj/item/hypospray/mkii, /obj/item/clothing/mask/surgical, /obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/clothing/glasses/hud/health, /obj/item/storage/firstaid/regular, +/obj/item/clothing/glasses/hud/health/suns, +/obj/item/clothing/head/suns/surgery, +/obj/item/clothing/gloves/color/latex/nitrile/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/sneakers/suns, +/obj/item/clothing/suit/hooded/suns, +/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat, +/obj/item/clothing/under/syndicate/suns/doctorscrubs, +/obj/item/clothing/under/syndicate/suns/sciencejumpsuit, +/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat, +/obj/item/clothing/mask/surgical/suns, +/obj/item/holosign_creator/medical, +/obj/item/defibrillator/loaded, +/obj/item/flashlight/pen, +/obj/item/flashlight/pen, /turf/open/floor/plasteel/dark, /area/ship/medical) "JY" = ( @@ -4540,10 +4488,6 @@ /turf/open/floor/plasteel/tech, /area/ship/cargo) "Sy" = ( -/obj/item/clothing/head/maidheadband/syndicate, -/obj/item/clothing/under/syndicate/skirt/maid, -/obj/item/clothing/accessory/maidapron/syndicate, -/obj/item/clothing/gloves/color/latex/nitrile/evil, /obj/item/clothing/shoes/laceup, /obj/item/clothing/shoes/laceup, /obj/item/clothing/suit/toggle/lawyer/black, @@ -4556,12 +4500,16 @@ name = "Uniform Closet"; pixel_x = 30 }, -/obj/item/clothing/gloves/combat/maid, /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/machinery/light/small/directional/south, +/obj/item/clothing/gloves/color/latex/nitrile/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/shoes/sneakers/suns, +/obj/item/clothing/suit/hooded/suns, +/obj/item/clothing/mask/surgical/suns, /turf/open/floor/carpet/red, /area/ship/crew/janitor) "SF" = ( @@ -4677,12 +4625,6 @@ pixel_y = 30 }, /obj/item/storage/bag/chemistry, -/obj/item/clothing/suit/longcoat/chemist, -/obj/item/clothing/suit/toggle/labcoat/chemist, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, /obj/item/clothing/glasses/sunglasses/chemical, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker/large, @@ -4699,6 +4641,8 @@ /obj/structure/sign/warning/chemdiamond{ pixel_x = 30 }, +/obj/item/flashlight/pen, +/obj/item/flashlight/pen, /turf/open/floor/plasteel/tech, /area/ship/medical) "Tw" = ( @@ -4945,10 +4889,6 @@ /obj/effect/turf_decal/trimline/opaque/black/line, /turf/open/floor/mineral/plastitanium/red, /area/ship/hallway/central) -"VG" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) "VT" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/canteen/kitchen) @@ -4977,10 +4917,10 @@ "Wb" = ( /obj/effect/turf_decal/corner_techfloor_grid/diagonal, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/head/helmet/space/syndicate/black/med, -/obj/item/clothing/suit/space/syndicate/black/med, /obj/structure/extinguisher_cabinet/directional/west, -/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/suit/space/syndicate/suns, +/obj/item/clothing/head/helmet/space/syndicate/suns, +/obj/item/clothing/mask/gas/suns, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Wc" = ( @@ -5157,28 +5097,14 @@ name = "Uniform closet"; pixel_x = 32 }, -/obj/item/clothing/under/syndicate/tacticool/skirt, -/obj/item/clothing/under/syndicate/tacticool/skirt, -/obj/item/clothing/under/syndicate/tacticool/skirt, -/obj/item/clothing/under/syndicate/tacticool/skirt, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/item/flashlight, /obj/item/flashlight, /obj/item/flashlight, /obj/item/flashlight, /obj/item/flashlight, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) "Xk" = ( @@ -5260,10 +5186,6 @@ /obj/effect/turf_decal/trimline/opaque/brown/filled/line, /turf/open/floor/plasteel/tech, /area/ship/crew/canteen/kitchen) -"Yf" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/medical) "Yo" = ( /obj/structure/window/plasma/reinforced/spawner/north, /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ @@ -5341,9 +5263,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/catwalk/over, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/ship/engineering) @@ -5401,9 +5320,6 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "ZJ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/effect/decal/cleanable/plasma, /turf/open/floor/plasteel/tech/techmaint, @@ -5509,7 +5425,7 @@ hl kU kU kU -VG +aP ls Cc Cc @@ -5554,7 +5470,7 @@ Wb aP Xk Xk -lQ +Xk Im wk wk @@ -5668,7 +5584,7 @@ wk (7,1,1) = {" Ss xO -xO +gz xO Te bx @@ -5730,7 +5646,7 @@ It sN Kv It -sI +It wk "} (9,1,1) = {" @@ -5803,7 +5719,7 @@ wk "} (11,1,1) = {" Ss -az +Ss Ss wk wk @@ -5862,7 +5778,7 @@ Xk TE Ch It -pI +vs zV UN It @@ -6211,7 +6127,7 @@ wk "} (23,1,1) = {" dZ -aR +kj dZ wk wk @@ -6342,7 +6258,7 @@ oP re Qt It -sI +It wk "} (27,1,1) = {" @@ -6462,7 +6378,7 @@ CF nd Xb Bh -DX +JI Do lN CM @@ -6506,7 +6422,7 @@ TS WQ WQ WQ -gz +WQ aL wk wk @@ -6529,7 +6445,7 @@ TS dL dL dL -Yf +TS QV TS TS diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm index 8683437567f1..6a8cee6cc78a 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm @@ -1669,7 +1669,6 @@ /obj/item/gun/ballistic/automatic/pistol, /obj/item/clothing/accessory/holster, /obj/item/grenade/chem_grenade/metalfoam, -/obj/item/card/mining_access_card, /obj/machinery/airalarm/directional/west, /obj/item/tank/jetpack/suit, /turf/open/floor/carpet/red, diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index e839c066954e..673a111ecbe1 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -3830,7 +3830,7 @@ req_access_txt = "20" }, /obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/under/syndicate/officer, +/obj/item/clothing/under/syndicate/ngr/officer, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate, /obj/item/clothing/gloves/krav_maga/combatglovesplus, /obj/item/clothing/shoes/jackboots, @@ -3843,7 +3843,7 @@ }, /obj/item/gun/ballistic/derringer/traitor, /obj/item/clothing/under/syndicate/sniper, -/obj/item/clothing/suit/gorlex, +/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain, /obj/item/ammo_box/a357, /obj/item/ammo_box/a357, /obj/item/radio/headset/syndicate/alt/leader, @@ -3976,7 +3976,7 @@ pixel_y = 7 }, /obj/item/clothing/under/syndicate/sniper, -/obj/item/clothing/under/syndicate/aclfgrunt, +/obj/item/clothing/under/syndicate/ngr, /obj/item/clothing/shoes/combat, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/suit/armor/vest/duster, @@ -4798,7 +4798,7 @@ /obj/item/ammo_box/magazine/m45{ pixel_x = 3 }, -/obj/item/clothing/under/syndicate/aclfgrunt, +/obj/item/clothing/under/syndicate/ngr, /obj/item/clothing/gloves/tackler/combat/insulated, /obj/item/clothing/suit/armor/vest/leather{ desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of the Gorlex Marauders." diff --git a/_maps/shuttles/syndicate/syndicate_luxembourg.dmm b/_maps/shuttles/syndicate/syndicate_luxembourg.dmm deleted file mode 100644 index 6dde77123cba..000000000000 --- a/_maps/shuttles/syndicate/syndicate_luxembourg.dmm +++ /dev/null @@ -1,3314 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aB" = ( -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"aD" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/crew/dorm) -"aK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom/directional/south, -/obj/machinery/navbeacon/wayfinding{ - codes_txt = "patrol;next_patrol=lux_engine"; - location = "lux_crew" - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"bi" = ( -/obj/machinery/button/door{ - id = "syndiefuck"; - name = "Loading Shutters Control"; - pixel_x = -25; - pixel_y = -7; - dir = 4 - }, -/obj/machinery/button/door{ - id = "warehouse"; - name = "Warehouse Control"; - pixel_x = -25; - pixel_y = 5; - dir = 4 - }, -/obj/machinery/button/door{ - id = "cargodoors"; - name = "Cargo Bay Shutter Control"; - pixel_x = -35; - pixel_y = 5; - dir = 4 - }, -/obj/machinery/button/door{ - id = "externalshutters"; - name = "External Shutters Control"; - pixel_x = -35; - pixel_y = -7; - dir = 4 - }, -/obj/machinery/computer/cargo/express{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"bp" = ( -/obj/effect/turf_decal/siding/blue/corner{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue/half{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"bt" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 8 - }, -/obj/structure/catwalk/over/plated_catwalk/white, -/turf/open/floor/plating, -/area/ship/engineering) -"bB" = ( -/obj/structure/rack, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 9 - }, -/obj/item/gps/mining, -/obj/item/paicard, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"bN" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"bV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/displaycase, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"cb" = ( -/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/carpet/red_gold, -/area/ship/crew/dorm) -"cq" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/computer/mech_bay_power_console{ - dir = 8 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"cs" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/effect/turf_decal/siding/blue/corner, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"cB" = ( -/obj/item/toy/figure/cargotech, -/obj/item/clothing/suit/hooded/wintercoat/cargo, -/obj/item/stack/sheet/cardboard/fifty, -/obj/item/hand_labeler, -/obj/item/hand_labeler_refill, -/obj/item/clothing/under/syndicate/donk, -/obj/item/clothing/suit/hazardvest/donk, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/item/stack/wrapping_paper, -/obj/item/stack/packageWrap, -/obj/structure/closet/wall{ - dir = 8; - icon_door = "orange_wall"; - name = "employee closet"; - pixel_x = 28 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) -"cI" = ( -/obj/structure/rack, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/item/rack_parts, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"dp" = ( -/obj/structure/displaycase, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"dA" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/hallway/central) -"dC" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/space_heater, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"dH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/displaycase, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"dL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/engineering{ - name = "Engineering" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"dM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"eD" = ( -/obj/item/storage/belt/utility, -/obj/item/storage/belt/utility, -/obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 10 - }, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"eF" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, -/obj/structure/mirror{ - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/medical{ - pixel_x = -5; - pixel_y = -4 - }, -/obj/structure/closet/wall/white/med{ - dir = 1; - name = "medicine locker"; - pixel_y = -28 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/dorm) -"eL" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/catwalk/over/plated_catwalk/white, -/obj/machinery/door/airlock/engineering{ - name = "Engineering" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"eX" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"fn" = ( -/obj/machinery/light/directional/east, -/obj/structure/table, -/obj/machinery/microwave, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"fo" = ( -/obj/item/card/emag, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/storage/backpack/duffelbag/syndie{ - name = "manager's duffel bag" - }, -/obj/item/clothing/under/syndicate/donk/qm, -/obj/item/clothing/suit/hazardvest/donk/qm, -/obj/item/melee/classic_baton/telescopic, -/obj/item/radio/headset/syndicate/alt/leader, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/structure/closet/secure_closet/wall{ - dir = 4; - icon_state = "solgov_wall"; - name = "manager's locker"; - pixel_x = -28; - req_access_txt = "41" - }, -/obj/machinery/light_switch{ - pixel_y = 22 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) -"fv" = ( -/obj/machinery/selling_pad, -/obj/effect/turf_decal/box, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"fy" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/opaque/brown/filled/warning, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"fB" = ( -/obj/effect/decal/cleanable/oil, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 8 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"ga" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "cargodoors" - }, -/obj/item/radio/intercom/directional/north{ - pixel_y = 22 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"gf" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"gj" = ( -/obj/machinery/light/directional/north, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 6 - }, -/obj/structure/closet/secure_closet/engineering_welding, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"gC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"hd" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"hi" = ( -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"hm" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) -"hs" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"hu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 4 - }, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/mask/breath, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"hX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 8 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"if" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/obj/machinery/computer/cryopod/directional/south, -/obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/crew/dorm) -"it" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - dir = 1; - id = "luxembourg_cargo"; - locked = 1 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "syndiefuck" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"iF" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/item/vending_refill/engineering, -/obj/item/vending_refill/engineering, -/obj/item/vending_refill/engivend, -/obj/item/vending_refill/engivend, -/obj/item/vending_refill/hydronutrients, -/obj/item/vending_refill/hydronutrients, -/obj/item/vending_refill/boozeomat, -/obj/item/vending_refill/boozeomat, -/obj/item/vending_refill/medical, -/obj/item/vending_refill/medical, -/obj/item/vending_refill/cigarette, -/obj/item/vending_refill/cigarette, -/obj/item/vending_refill/snack, -/obj/item/vending_refill/snack, -/obj/item/vending_refill/sovietsoda, -/obj/item/vending_refill/cola, -/obj/item/vending_refill/cola, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"iO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) -"iR" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/plating, -/area/ship/engineering) -"iZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 9 - }, -/obj/structure/catwalk/over/plated_catwalk/white, -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"jr" = ( -/turf/open/floor/carpet/red_gold, -/area/ship/hallway/central) -"jv" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/rack, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"jH" = ( -/obj/structure/table, -/obj/item/radio/intercom/wideband/table{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_y = 22 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"jK" = ( -/obj/machinery/air_sensor/atmos/air_tank, -/turf/open/floor/engine/air, -/area/ship/engineering) -"ke" = ( -/obj/machinery/mech_bay_recharge_port{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"ks" = ( -/obj/structure/closet/crate, -/obj/item/gun_voucher, -/obj/item/gun_voucher, -/obj/item/gun_voucher, -/obj/item/gun_voucher, -/obj/item/gun_voucher, -/obj/item/gun_voucher, -/obj/item/gun_voucher, -/obj/item/gun_voucher, -/obj/item/gun_voucher, -/obj/item/gun_voucher, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"kE" = ( -/obj/machinery/chem_master/condimaster, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"kI" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) -"kZ" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "externalshutters" - }, -/turf/open/floor/plating, -/area/ship/hallway/central) -"lb" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"lg" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) -"lt" = ( -/obj/machinery/atmospherics/components/binary/volume_pump, -/obj/structure/catwalk/over/plated_catwalk/white, -/turf/open/floor/plating, -/area/ship/engineering) -"lK" = ( -/obj/effect/turf_decal/siding/blue/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"lQ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters{ - id = "warehouse" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/storage) -"lW" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ - dir = 1 - }, -/obj/structure/catwalk/over/plated_catwalk/white, -/turf/open/floor/plating, -/area/ship/engineering) -"mi" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "externalshutters" - }, -/turf/open/floor/plating, -/area/ship/crew/dorm) -"mm" = ( -/obj/item/toy/figure/cargotech, -/obj/item/clothing/suit/hooded/wintercoat/cargo, -/obj/item/stack/sheet/cardboard/fifty, -/obj/item/hand_labeler, -/obj/item/hand_labeler_refill, -/obj/item/clothing/under/syndicate/donk, -/obj/item/clothing/suit/hazardvest/donk, -/obj/item/stack/wrapping_paper, -/obj/item/stack/packageWrap, -/obj/structure/railing, -/obj/structure/closet/wall{ - dir = 4; - icon_door = "orange_wall"; - name = "employee closet"; - pixel_x = -28 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) -"mE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/effect/turf_decal/kfp_small/left{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"mK" = ( -/obj/machinery/light/directional/south, -/obj/machinery/computer/atmos_control/tank/air_tank{ - dir = 4 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"na" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering) -"nz" = ( -/obj/structure/sign/donk{ - pixel_x = -32 - }, -/obj/structure/rack, -/obj/item/radio/headset, -/obj/item/radio/headset, -/obj/item/radio/headset, -/obj/item/radio/headset, -/obj/item/radio/headset, -/obj/item/radio/headset, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"ow" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - id = "externalshutters" - }, -/turf/open/floor/plating, -/area/ship/crew/canteen) -"pd" = ( -/obj/machinery/light/directional/east, -/obj/structure/closet/crate/large{ - name = "Donk! Co. Powerloader In a Box" - }, -/obj/effect/decal/cleanable/oil, -/obj/effect/turf_decal/rechargefloor, -/obj/mecha/working/ripley/cargo{ - name = "\improper Donk! Co. Cargo Loading Device" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"pt" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/engineering) -"pJ" = ( -/obj/machinery/firealarm/directional/south, -/obj/machinery/autolathe, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"pL" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 1 - }, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"pR" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"qe" = ( -/obj/effect/turf_decal/atmos/air, -/turf/open/floor/engine/air, -/area/ship/engineering) -"qf" = ( -/obj/structure/table, -/obj/machinery/door/firedoor, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"qh" = ( -/obj/machinery/airalarm/directional/west, -/obj/item/stack/sheet/cardboard/fifty, -/obj/item/hand_labeler, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 8 - }, -/obj/machinery/navbeacon/wayfinding{ - codes_txt = "patrol;next_patrol=lux_shopfloor"; - location = "lux_lobby" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"ql" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/engineering) -"qO" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/chair/plastic{ - dir = 4 - }, -/obj/effect/turf_decal/siding/red{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/neutral/border{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"qP" = ( -/obj/machinery/door/airlock/external, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 5 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"qR" = ( -/turf/open/floor/engine/air, -/area/ship/engineering) -"qV" = ( -/obj/item/toy/sword, -/obj/structure/closet/crate/wooden/toy, -/obj/item/ammo_box/magazine/toy/smgm45/riot, -/obj/item/ammo_box/magazine/toy/smgm45/riot, -/obj/item/gun/ballistic/automatic/smg/c20r/toy/unrestricted/riot, -/obj/item/soap/syndie, -/obj/item/soap/syndie, -/obj/item/soap/syndie, -/obj/item/soap/syndie, -/obj/item/soap/syndie, -/obj/item/soap/syndie, -/obj/item/soap/syndie, -/obj/item/soap/syndie, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"rh" = ( -/obj/effect/turf_decal/siding/blue/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/blue/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/opaque/blue/filled/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"rm" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/red_gold, -/area/ship/crew/dorm) -"rq" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/window{ - dir = 8; - name = "Canteen" - }, -/obj/effect/turf_decal/siding/red, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"rG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"rU" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/opaque/orange/filled/warning, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) -"rV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/east, -/turf/open/floor/engine/air, -/area/ship/engineering) -"sh" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"sk" = ( -/obj/effect/turf_decal/atmos/plasma, -/turf/open/floor/engine/plasma, -/area/ship/engineering) -"sF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"sI" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/industrial/traffic{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"sV" = ( -/mob/living/simple_animal/bot/mulebot{ - bot_name = "\proper Christine"; - desc = "A Multiple Utility Load Effector bot. This one seems oddly menacing..."; - id = "Christine"; - name = "\proper Christine" - }, -/obj/effect/turf_decal/corner/opaque/brown/bordercee, -/obj/machinery/navbeacon/wayfinding{ - codes_txt = null; - location = "mulestation" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"tx" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/item/stack/sheet/mineral/plasma/five, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) -"tF" = ( -/obj/structure/bed/pod, -/obj/item/bedsheet/blue, -/obj/structure/curtain/bounty, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"tH" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/siding/red{ - dir = 10 - }, -/obj/effect/turf_decal/corner/opaque/neutral/bordercorner{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"tO" = ( -/obj/effect/turf_decal/siding/blue/corner, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"tU" = ( -/obj/machinery/camera{ - dir = 10 - }, -/turf/open/floor/plating, -/area/template_noop) -"tV" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/button/door{ - id = "cargodoors"; - pixel_x = 8; - pixel_y = -24 - }, -/obj/machinery/door/window{ - dir = 8; - name = "Cargo Bay" - }, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "cargodoors" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"ug" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/eastright, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "cargodoors" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"ul" = ( -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/power/port_gen/pacman, -/obj/item/stack/sheet/mineral/plasma/five, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) -"uo" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/engineering) -"uB" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, -/obj/item/reagent_containers/food/drinks/shaker{ - pixel_x = 10 - }, -/obj/item/kitchen/knife{ - pixel_x = -8 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"uK" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{ - dir = 8 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/turf/open/floor/engine/plasma, -/area/ship/engineering) -"uX" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 4 - }, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/syndicate/green, -/obj/item/clothing/head/helmet/space/syndicate/green, -/obj/item/clothing/mask/breath, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"vb" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters{ - id = "warehouse" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/storage) -"vf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"vp" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering) -"vw" = ( -/obj/machinery/camera{ - dir = 1 - }, -/turf/open/floor/plating, -/area/template_noop) -"vz" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner, -/obj/machinery/door/poddoor/shutters{ - id = "externalshutters" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"vT" = ( -/obj/structure/closet/crate, -/obj/item/grenade/c4, -/obj/item/grenade/c4, -/obj/item/grenade/c4, -/obj/item/grenade/c4, -/obj/item/grenade/c4, -/obj/item/grenade/c4, -/obj/item/grenade/c4, -/obj/item/grenade/c4, -/obj/item/grenade/c4, -/obj/item/grenade/c4, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"wd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"wN" = ( -/obj/structure/table, -/obj/machinery/chem_dispenser/drinks, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"wP" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"wT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ - dir = 8 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/turf/open/floor/engine/plasma, -/area/ship/engineering) -"xa" = ( -/obj/effect/turf_decal/siding/blue, -/obj/effect/turf_decal/corner/opaque/blue/half{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"xc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/chair/plastic{ - dir = 4 - }, -/obj/effect/turf_decal/siding/red{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/neutral/border{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"xt" = ( -/obj/machinery/light/directional/east, -/obj/item/clothing/head/HoS/beret/syndicate, -/obj/item/radio/headset/syndicate/alt, -/obj/item/gun/ballistic/shotgun/doublebarrel, -/obj/item/clothing/under/rank/civilian/bartender, -/obj/structure/closet/secure_closet/bar{ - req_access = null; - req_one_access_txt = list(25,41) - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) -"xw" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/clothing{ - default_price = 0; - extra_price = 0 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"yd" = ( -/obj/structure/table, -/obj/machinery/chem_dispenser/drinks/beer, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"yf" = ( -/obj/effect/turf_decal/siding/blue/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"yh" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24; - pixel_y = 5 - }, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/brown/bordercorner{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"ym" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"yQ" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/engineering) -"yX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/blue/corner, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 4 - }, -/obj/machinery/navbeacon/wayfinding{ - codes_txt = "patrol;next_patrol=lux_kitchen"; - location = "lux_shopfloor" - }, -/obj/machinery/holopad/emergency/cargo, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"zc" = ( -/obj/structure/rack, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"zW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/crew/dorm) -"Ai" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/door/airlock{ - name = "Dormitory" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/crew/dorm) -"AE" = ( -/obj/machinery/door/airlock/external, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/plating, -/area/ship/engineering) -"AL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Bt" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew/canteen) -"Bw" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/cargo) -"BM" = ( -/obj/structure/bed/pod, -/obj/item/bedsheet/blue, -/obj/structure/window/reinforced/tinted/frosted, -/obj/structure/curtain/bounty, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -19; - pixel_y = 12 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/crew/dorm) -"BX" = ( -/obj/machinery/airalarm/directional/west, -/obj/machinery/cryopod{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/crew/dorm) -"BZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"CC" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"CI" = ( -/obj/effect/turf_decal/siding/blue/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"CM" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/engineering) -"CT" = ( -/obj/machinery/computer/atmos_control/tank/toxin_tank{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"CV" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/red, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"CW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/item/stack/circuit_stack/full, -/obj/item/stack/circuit_stack/full, -/obj/item/stack/circuit_stack/full, -/obj/item/stack/circuit_stack/full, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Da" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock{ - name = "Canteen" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/crew/canteen) -"Dq" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/obj/machinery/navbeacon/wayfinding{ - codes_txt = "patrol;next_patrol=lux_crew"; - location = "lux_kitchen" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"Dw" = ( -/obj/structure/table, -/obj/structure/window/plasma/reinforced, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"DA" = ( -/obj/effect/turf_decal/siding/red, -/obj/machinery/firealarm/directional/south, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 6; - pixel_y = -24 - }, -/obj/machinery/airalarm/directional/east, -/obj/machinery/vending/dinnerware, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"DE" = ( -/obj/structure/rack, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"DG" = ( -/obj/machinery/light/directional/south, -/obj/structure/rack, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"DJ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/effect/turf_decal/number/five{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"DW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/chair/plastic, -/turf/open/floor/carpet/red_gold, -/area/ship/crew/dorm) -"Ee" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Ej" = ( -/obj/machinery/modular_computer/console/preset/command{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"Er" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering) -"EG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/brown/filled/warning{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"EO" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/dorm) -"EW" = ( -/turf/open/floor/engine/plasma, -/area/ship/engineering) -"EZ" = ( -/obj/item/radio/headset/syndicate/alt, -/obj/item/toy/figure/cargotech, -/obj/item/clothing/suit/hooded/wintercoat/cargo, -/obj/item/stack/sheet/cardboard/fifty, -/obj/item/hand_labeler, -/obj/item/hand_labeler_refill, -/obj/item/clothing/under/syndicate/donk, -/obj/item/clothing/suit/hazardvest/donk, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/item/stack/wrapping_paper, -/obj/item/stack/packageWrap, -/obj/structure/closet/wall{ - dir = 4; - icon_door = "orange_wall"; - name = "employee closet"; - pixel_x = -28 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) -"Fj" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/item/paper{ - desc = "A piece of paper depicting a extremely pissed up upper manager"; - default_raw_text = "YOU DAMNNED FOOLS! YOU ARENT SUPPOSED TO USE YOUR STOCK, YOU'RE SUPPOSED TO SELL THEM!! WE AREN'T WASTING MY MONEY ARE WE!?! NOW GET BACK TO WORK!!!"; - name = "angry letter from upper management" - }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) -"Fq" = ( -/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 = 4 - }, -/obj/machinery/holopad/emergency/bar, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"FV" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/dorm) -"Ga" = ( -/obj/machinery/computer/helm, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"Gr" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/engineering) -"GD" = ( -/obj/docking_port/stationary{ - width = 30; - height = 15; - dir = 8; - dwidth = 15 - }, -/turf/template_noop, -/area/template_noop) -"GG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/engineering) -"Hx" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew/dorm) -"HG" = ( -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - id = "luxembourg_cargo"; - locked = 1 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "syndiefuck" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"HK" = ( -/obj/structure/rack, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/obj/machinery/light/directional/east, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"HZ" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/rag, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"Id" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/carpet/red_gold, -/area/ship/crew/dorm) -"Ij" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/docking_port/mobile{ - can_move_docking_ports = 1; - dir = 2; - launch_status = 0 - }, -/obj/machinery/door/poddoor/shutters{ - id = "externalshutters" - }, -/turf/open/floor/plating, -/area/ship/hallway/central) -"Ip" = ( -/obj/item/toy/figure/cargotech, -/obj/item/clothing/suit/hooded/wintercoat/cargo, -/obj/item/stack/sheet/cardboard/fifty, -/obj/item/hand_labeler, -/obj/item/hand_labeler_refill, -/obj/item/clothing/under/syndicate/donk, -/obj/item/clothing/suit/hazardvest/donk, -/obj/item/stack/wrapping_paper, -/obj/item/stack/packageWrap, -/obj/structure/railing, -/obj/structure/closet/wall{ - dir = 8; - icon_door = "orange_wall"; - name = "employee closet"; - pixel_x = 28 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) -"Iv" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"IT" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/effect/turf_decal/siding/blue, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = 11 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Je" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Ji" = ( -/obj/structure/bed/pod, -/obj/item/bedsheet/blue, -/obj/structure/curtain/bounty, -/turf/open/floor/carpet/red_gold, -/area/ship/crew/dorm) -"Jq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Jr" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 1 - }, -/obj/effect/turf_decal/siding/blue/corner, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"JO" = ( -/obj/structure/closet/crate/science, -/obj/item/circuitboard/machine/chem_dispenser/drinks, -/obj/item/circuitboard/machine/chem_dispenser/drinks, -/obj/item/circuitboard/machine/chem_dispenser/drinks, -/obj/item/circuitboard/machine/chem_dispenser/drinks/beer, -/obj/item/circuitboard/machine/chem_dispenser/drinks/beer, -/obj/item/circuitboard/machine/chem_dispenser/drinks/beer, -/obj/item/circuitboard/machine/deep_fryer, -/obj/item/circuitboard/machine/deep_fryer, -/obj/item/circuitboard/machine/deep_fryer, -/obj/item/circuitboard/machine/mechfab, -/obj/item/circuitboard/machine/mechfab, -/obj/item/circuitboard/machine/mechfab, -/obj/item/circuitboard/machine/mechfab, -/obj/item/circuitboard/machine/mechfab, -/obj/item/circuitboard/machine/ore_redemption, -/obj/item/circuitboard/machine/ore_redemption, -/obj/item/circuitboard/machine/ore_redemption, -/obj/item/circuitboard/machine/microwave, -/obj/item/circuitboard/machine/microwave, -/obj/item/circuitboard/machine/microwave, -/obj/machinery/firealarm/directional/east, -/obj/machinery/light_switch{ - pixel_x = 6; - pixel_y = 24 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"JT" = ( -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "syndiefuck" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"JU" = ( -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 6 - }, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/syndicate/blue, -/obj/item/clothing/head/helmet/space/syndicate/blue, -/obj/item/clothing/mask/breath, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"JV" = ( -/obj/effect/turf_decal/corner/opaque/brown/bordercorner{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Ka" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage) -"Kg" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/shower{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted/frosted, -/obj/structure/curtain, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/machinery/light_switch{ - pixel_y = 23; - pixel_x = 11 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/dorm) -"Kk" = ( -/obj/machinery/air_sensor/atmos/toxin_tank, -/turf/open/floor/engine/plasma, -/area/ship/engineering) -"Ko" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/navbeacon/wayfinding{ - codes_txt = "patrol;next_patrol=lux_lobby"; - location = "lux_warehouse" - }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) -"KH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/autodrobe/all_access{ - default_price = 0; - extra_price = 0 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"KX" = ( -/obj/structure/closet/crate, -/obj/item/construction/rcd/combat, -/obj/item/construction/rcd/combat, -/obj/item/construction/rcd/combat, -/obj/item/construction/rcd/combat, -/obj/item/construction/rcd/combat, -/obj/item/construction/rcd/combat, -/obj/item/construction/rcd/combat, -/obj/item/construction/rcd/combat, -/obj/item/construction/rcd/combat, -/obj/item/construction/rcd/combat, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"KZ" = ( -/obj/effect/turf_decal/siding/red, -/obj/structure/closet/secure_closet/freezer/wall{ - dir = 1; - name = "refrigerator"; - pixel_y = -32 - }, -/obj/item/storage/box/donkpockets/donkpocketteriyaki, -/obj/item/storage/box/donkpockets/donkpocketteriyaki, -/obj/item/storage/box/donkpockets/donkpocketteriyaki, -/obj/item/storage/box/donkpockets/donkpocketteriyaki, -/obj/item/storage/box/donkpockets/donkpocketspicy, -/obj/item/storage/box/donkpockets/donkpocketspicy, -/obj/item/storage/box/donkpockets/donkpocketspicy, -/obj/item/storage/box/donkpockets/donkpocketspicy, -/obj/item/storage/box/donkpockets/donkpockethonk, -/obj/item/storage/box/donkpockets/donkpockethonk, -/obj/item/storage/box/donkpockets/donkpockethonk, -/obj/item/storage/box/donkpockets/donkpockethonk, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"La" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "cargodoors"; - pixel_y = 25 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Lr" = ( -/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 = 4 - }, -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/paper{ - desc = "A piece of paper depicting a extremely pissed up upper manager"; - default_raw_text = "YOU ARENT SUPPOSED TO BE MINING, HEAR ME!?!! YOU'RE SUPPOSED TO BE SELLING SHIT TO THE CONSUMERS YOU HEAR!! AS PUNISHMENT FOR THE LAST SHIFT, I HAVE REMOVED ALLL OF YOUR MINING TOOLS!! NOW GET BACK TO WORK!!"; - name = "angry letter from upper management" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"Lu" = ( -/obj/structure/chair/plastic{ - dir = 1 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/crew/dorm) -"LU" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/east, -/turf/open/floor/engine/air, -/area/ship/engineering) -"LV" = ( -/obj/machinery/vending/boozeomat/all_access{ - default_price = 0; - extra_price = 0 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"LY" = ( -/obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/structure/closet/crate, -/obj/item/card/emag/limited, -/obj/item/card/emag/limited, -/obj/item/card/emag/limited, -/obj/item/card/emag/limited, -/obj/item/card/emag/limited, -/obj/item/card/emag/limited, -/obj/item/card/emag/limited, -/obj/item/card/emag/limited, -/obj/item/card/emag/limited, -/obj/item/card/emag/limited, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"Mg" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"Mi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/reinforced, -/obj/structure/window/plasma/reinforced, -/obj/machinery/door/window/eastright, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "cargodoors" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Mj" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump, -/obj/machinery/advanced_airlock_controller{ - pixel_x = -25 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"Mx" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 10; - pixel_y = -21 - }, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/trimline/opaque/blue/filled/warning, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Mz" = ( -/obj/structure/tank_dispenser/oxygen, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 9 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"MT" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "externalshutters" - }, -/turf/open/floor/plating, -/area/ship/cargo) -"MU" = ( -/obj/machinery/door/window/brigdoor{ - name = "Bridge"; - req_access_txt = "41" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/hallway/central) -"Nr" = ( -/turf/template_noop, -/area/template_noop) -"NH" = ( -/obj/effect/turf_decal/siding/blue/corner, -/obj/effect/turf_decal/corner/opaque/blue/half{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"NJ" = ( -/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/ship/hallway/central) -"NQ" = ( -/obj/machinery/light/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ - pixel_x = 6 - }, -/obj/item/lighter/greyscale{ - pixel_x = -3; - pixel_y = 4 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/crew/dorm) -"On" = ( -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, -/obj/structure/closet/crate, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"Op" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "externalshutters" - }, -/turf/open/floor/plating, -/area/ship/crew/canteen) -"Oq" = ( -/obj/structure/table, -/obj/item/toy/cards/deck/syndicate, -/turf/open/floor/carpet/red_gold, -/area/ship/crew/dorm) -"Oz" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"OR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 6 - }, -/obj/effect/decal/cleanable/oil, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"OY" = ( -/obj/structure/closet/crate/trashcart, -/obj/effect/spawner/lootdrop/maintenance/eight, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 9 - }, -/obj/machinery/button/shieldwallgen{ - id = "luxembourg_cargo"; - pixel_x = -10; - pixel_y = 25 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/button/door{ - id = "syndiefuck"; - pixel_x = -20; - pixel_y = 26 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Pb" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/dorm) -"Ph" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/effect/turf_decal/number/zero{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"Ps" = ( -/obj/machinery/light/directional/south, -/obj/item/banner/cargo, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 10 - }, -/obj/machinery/button/shieldwallgen{ - dir = 1; - id = "luxembourg_cargo"; - pixel_x = -10; - pixel_y = -25 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/button/door{ - dir = 1; - id = "syndiefuck"; - pixel_x = -20; - pixel_y = -26 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"PO" = ( -/obj/structure/sign/poster/contraband/syndicate_recruitment{ - pixel_x = 4; - pixel_y = -30 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/blue/filled/warning, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"PW" = ( -/obj/structure/sign/donk{ - pixel_x = -32 - }, -/obj/structure/rack, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"QG" = ( -/obj/machinery/light/directional/west, -/obj/machinery/vending/toyliberationstation, -/obj/structure/window/plasma/reinforced, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"QQ" = ( -/obj/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/hallway/central) -"QT" = ( -/obj/machinery/light/directional/east, -/obj/structure/window/plasma/reinforced, -/obj/machinery/computer/selling_pad_control{ - dir = 8 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"QU" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/button/door{ - id = "warehouse"; - pixel_x = 24; - pixel_y = 21 - }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) -"Rk" = ( -/obj/structure/rack, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/obj/machinery/light/directional/west, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"Ro" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/structure/catwalk/over/plated_catwalk/white, -/obj/machinery/door/airlock/engineering{ - name = "Engineering" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Rp" = ( -/turf/open/floor/carpet/red_gold, -/area/ship/crew/dorm) -"RH" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - id = "externalshutters" - }, -/turf/open/floor/plating, -/area/ship/cargo) -"RM" = ( -/obj/effect/turf_decal/trimline/opaque/brown/filled/warning, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Sn" = ( -/obj/effect/turf_decal/siding/blue, -/obj/effect/turf_decal/siding/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"SS" = ( -/obj/item/radio/headset/syndicate/alt, -/obj/item/toy/figure/cargotech, -/obj/item/clothing/suit/hooded/wintercoat/cargo, -/obj/item/stack/sheet/cardboard/fifty, -/obj/item/hand_labeler, -/obj/item/hand_labeler_refill, -/obj/item/clothing/under/syndicate/donk, -/obj/item/clothing/suit/hazardvest/donk, -/obj/item/stack/wrapping_paper, -/obj/item/stack/packageWrap, -/obj/structure/closet/wall{ - dir = 4; - icon_door = "orange_wall"; - name = "employee closet"; - pixel_x = -28 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) -"Tj" = ( -/obj/effect/turf_decal/siding/red, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 11; - pixel_y = -16 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"Ty" = ( -/obj/machinery/light/directional/east, -/obj/structure/closet/crate/large, -/obj/item/mecha_parts/mecha_equipment/mining_scanner, -/mob/living/simple_animal/bot/secbot/grievous/toy, -/obj/effect/decal/cleanable/blood/old, -/obj/item/hand_labeler_refill, -/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp, -/obj/item/mecha_parts/mecha_equipment/rcd, -/obj/item/mecha_parts/mecha_equipment/cable_layer, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"TB" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"TJ" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "externalshutters" - }, -/turf/open/floor/plating, -/area/ship/storage) -"TP" = ( -/obj/structure/rack, -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"TY" = ( -/obj/effect/turf_decal/corner/opaque/brown/bordercorner{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Ud" = ( -/obj/effect/turf_decal/siding/blue, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Uk" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/storage) -"Uo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/volume_pump, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/engineering) -"Uu" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) -"Uw" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/structure/curtain, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/dorm) -"UE" = ( -/turf/open/floor/plating, -/area/ship/engineering) -"UI" = ( -/obj/effect/turf_decal/corner/opaque/neutral/mono, -/turf/open/floor/plasteel/mono/dark, -/area/ship/crew/canteen) -"UO" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering) -"Va" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/engineering) -"Vb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/opaque/blue/filled/warning, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Vi" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/turf_decal/industrial/traffic{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"Vn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/corner/opaque/brown/border{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Vs" = ( -/obj/machinery/atmospherics/components/binary/volume_pump, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/engineering) -"VG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/effect/turf_decal/number/two{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"VR" = ( -/turf/closed/wall/r_wall/syndicate/nodiagonal, -/area/ship/engineering) -"VS" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/plastitaniumglass{ - amount = 20 - }, -/obj/item/stack/sheet/mineral/plastitanium{ - amount = 20 - }, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/effect/decal/cleanable/dirt, -/obj/item/hand_labeler_refill, -/obj/item/stack/sheet/mineral/wood/fifty, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"Wh" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/opaque/orange/filled/warning, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/dorm) -"Wt" = ( -/obj/machinery/smartfridge/bloodbank/preloaded, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage) -"WB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"WE" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"WQ" = ( -/obj/machinery/firealarm/directional/east, -/obj/machinery/suit_storage_unit/inherit{ - req_access_txt = "41" - }, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/mask/breath, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) -"WU" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Xf" = ( -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/navbeacon/wayfinding{ - codes_txt = "patrol;next_patrol=lux_warehouse"; - location = "lux_engine" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Xw" = ( -/obj/machinery/washing_machine, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/dorm) -"XM" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/pump, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"XS" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/obj/machinery/door/poddoor/shutters{ - id = "externalshutters" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Yd" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk/over/plated_catwalk/white, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"Yq" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"YE" = ( -/obj/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/item/radio/intercom/directional/east{ - pixel_y = 37 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/hallway/central) -"YI" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/canteen) -"YK" = ( -/obj/machinery/airalarm/directional/west, -/obj/item/clothing/head/collectable/chef, -/obj/item/clothing/head/collectable/paper, -/obj/item/clothing/head/collectable/tophat, -/obj/item/clothing/head/collectable/captain, -/obj/item/clothing/head/collectable/beret, -/obj/item/clothing/head/collectable/welding, -/obj/item/clothing/head/collectable/flatcap, -/obj/item/clothing/head/collectable/pirate, -/obj/item/clothing/head/collectable/kitty, -/obj/item/clothing/head/collectable/rabbitears, -/obj/item/clothing/head/collectable/wizard, -/obj/item/clothing/head/collectable/hardhat, -/obj/item/clothing/head/collectable/HoS, -/obj/item/clothing/head/collectable/HoP, -/obj/item/clothing/head/collectable/thunderdome, -/obj/item/clothing/head/collectable/swat, -/obj/item/clothing/head/collectable/slime, -/obj/item/clothing/head/collectable/police, -/obj/item/clothing/head/collectable/xenom, -/obj/item/clothing/head/collectable/petehat, -/obj/structure/closet/crate, -/turf/open/floor/plasteel/mono/dark, -/area/ship/storage) -"YL" = ( -/obj/structure/chair/plastic{ - dir = 4 - }, -/obj/effect/turf_decal/siding/red{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/neutral/border{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"YO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/storage) -"YZ" = ( -/obj/structure/closet/secure{ - icon_state = "eng_secure"; - name = "GEC Engineer's locker" - }, -/obj/item/clothing/gloves/color/yellow, -/obj/item/pipe_dispenser, -/obj/item/clothing/glasses/meson/engine, -/obj/item/clothing/suit/toggle/hazard, -/obj/item/clothing/head/beret/eng/hazard, -/obj/item/clothing/head/beret/eng, -/obj/item/holosign_creator/engineering, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/item/clothing/under/syndicate/gec, -/obj/item/clothing/under/syndicate/gec, -/obj/item/stack/tape/industrial/pro, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/light_switch{ - pixel_y = 23; - pixel_x = 11 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Zm" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 9 - }, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/engineering) -"ZV" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 5 - }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ship/engineering) - -(1,1,1) = {" -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -GD -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -"} -(2,1,1) = {" -Nr -Nr -Nr -Nr -Nr -Nr -hs -HG -JT -JT -JT -it -Ka -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -"} -(3,1,1) = {" -Nr -Nr -Nr -Nr -Bw -MT -hs -OY -hX -hX -fB -Ps -Ka -TJ -TJ -Uk -Nr -Nr -Nr -Nr -pt -VR -pt -Nr -Nr -Nr -Nr -"} -(4,1,1) = {" -Nr -Nr -Nr -Bw -hs -Mz -qh -JV -AL -hi -CC -RM -vb -VS -qV -Wt -TJ -Uk -Nr -Uk -VR -qe -VR -pt -Nr -Nr -Nr -"} -(5,1,1) = {" -Nr -Nr -hs -hs -bB -TY -CC -OR -gf -Je -wP -fy -lQ -QU -kI -iF -vT -Ka -TJ -Ka -VR -qR -jK -VR -Nr -Nr -Nr -"} -(6,1,1) = {" -Nr -Nr -RH -sV -yh -BZ -Vn -Ee -EG -hu -uX -JU -Ka -JO -iO -Fj -YO -YK -ks -On -vp -rV -LU -VR -pt -Nr -Nr -"} -(7,1,1) = {" -Nr -Nr -hs -hs -hs -ga -ug -Mi -tV -hs -hs -hs -Ka -Ka -Ty -Ko -Uu -lg -hm -rU -Ro -uo -ZV -mK -vp -pt -Nr -"} -(8,1,1) = {" -Nr -Nr -Nr -WE -WE -La -aB -NJ -Ud -TP -Rk -PW -cI -Ka -Ka -KX -LY -cq -pd -ke -vp -dC -GG -Uo -XS -iR -hd -"} -(9,1,1) = {" -tU -WE -kZ -WE -QG -NH -wd -WB -tO -Iv -Iv -Iv -yf -DG -Ka -Ka -Ka -Ka -Ka -Ka -vp -gj -Zm -Vs -vz -sh -Nr -"} -(10,1,1) = {" -WE -WE -Ej -bi -QQ -xa -dp -bV -Sn -TP -TP -jv -pL -Mx -vp -fo -SS -EZ -mm -tx -pR -XM -ql -pJ -vp -vp -vp -"} -(11,1,1) = {" -Ij -Ga -dA -jr -MU -rh -TB -WU -yX -gC -gC -Yq -Jq -Vb -dL -VG -Ph -DJ -mE -yQ -Xf -CM -Va -dM -AE -Mj -qP -"} -(12,1,1) = {" -WE -WE -jH -fv -YE -xa -dp -dH -Sn -TP -TP -DE -Jr -PO -vp -WQ -xt -cB -Ip -ul -pR -lb -Gr -eD -na -UO -Er -"} -(13,1,1) = {" -vw -WE -kZ -WE -QT -bp -Oz -vf -lK -ym -cs -eX -CI -DG -EO -EO -EO -EO -EO -EO -vp -CW -lW -lt -vz -sh -Nr -"} -(14,1,1) = {" -Nr -Nr -Nr -WE -WE -YL -YL -qO -xc -tH -IT -HK -zc -EO -EO -BX -if -EO -Kg -Uw -vp -YZ -Yd -lt -vz -sh -UE -"} -(15,1,1) = {" -Nr -Nr -YI -YI -YI -qf -HZ -Lr -Dw -rq -YI -EO -EO -EO -nz -Vi -sI -Ai -FV -Wh -eL -iZ -bt -CT -vp -pt -Nr -"} -(16,1,1) = {" -Nr -Nr -ow -YI -yd -UI -UI -Fq -UI -Tj -YI -Ji -NQ -BM -zW -bN -aK -Pb -Xw -eF -vp -uK -wT -VR -pt -Nr -Nr -"} -(17,1,1) = {" -Nr -Nr -Bt -YI -wN -UI -rG -Mg -Dq -CV -Da -cb -aD -Id -rm -xw -KH -EO -mi -EO -VR -EW -Kk -VR -Nr -Nr -Nr -"} -(18,1,1) = {" -Nr -Nr -Nr -Bt -YI -uB -kE -sF -UI -KZ -YI -Rp -DW -Oq -Lu -EO -mi -Hx -Nr -Hx -VR -sk -VR -pt -Nr -Nr -Nr -"} -(19,1,1) = {" -Nr -Nr -Nr -Nr -Bt -Op -YI -fn -LV -DA -YI -tF -EO -mi -mi -Hx -Nr -Nr -Nr -Nr -pt -VR -pt -Nr -Nr -Nr -Nr -"} -(20,1,1) = {" -Nr -Nr -Nr -Nr -Nr -Nr -YI -YI -Op -YI -YI -EO -EO -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -Nr -"} diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 347764f2e220..4b6183391ff1 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -37,19 +37,29 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/light/directional/east, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/aft) "aj" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "ak" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 4 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 10 }, -/obj/machinery/light/directional/north, -/obj/machinery/vending/cola/random, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "al" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -64,23 +74,18 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "aA" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/syndicake{ - pixel_y = 10; - pixel_x = 3 +/obj/machinery/shieldgen{ + anchored = 1; + req_access = list(150) }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -10; - pixel_y = 5 +/obj/effect/turf_decal/corner/opaque/syndiered/bordercee{ + dir = 8 }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -3; - pixel_y = 3 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "aD" = ( /obj/structure/sign/poster/contraband/m90{ icon_state = "poster-m90"; @@ -92,14 +97,34 @@ /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "syndicate"; + name = "lieutenant locker"; + req_access = list(3,150) }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/item/clothing/under/syndicate/ngr/officer, +/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain, +/obj/item/clothing/head/ngrcap, +/obj/item/clothing/shoes/combat, +/obj/item/megaphone/sec{ + name = "syndicate megaphone" }, -/turf/open/floor/mineral/plastitanium/red, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/clothing/head/HoS/beret/syndicate, +/obj/item/radio/headset/syndicate/alt/leader, +/obj/item/clothing/gloves/krav_maga/combatglovesplus, +/obj/item/ammo_box/magazine/m10mm/ap, +/obj/item/ammo_box/magazine/m10mm/ap, +/obj/item/clothing/suit/armor/hos/trenchcoat, +/obj/machinery/button/door{ + pixel_x = 9; + pixel_y = 25; + id = "twinkle_armory"; + name = "Armory Access"; + req_access = list(3,150) + }, +/turf/open/floor/mineral/plastitanium, /area/ship/security) "aE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -110,31 +135,44 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "aG" = ( -/obj/machinery/light/directional/east, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) +/obj/structure/closet/secure_closet/wall{ + dir = 8; + pixel_x = 28 + }, +/obj/item/kitchen/knife, +/obj/item/cutting_board, +/obj/item/clothing/under/suit/waiter/syndicate, +/obj/item/clothing/suit/hazardvest/donk, +/obj/item/clothing/under/syndicate/donk, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/obj/item/reagent_containers/food/drinks/shaker, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) "aX" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/turf_decal/syndicateemblem/middle/middle{ +/obj/effect/turf_decal/syndicateemblem/middle/right{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/holopad/emergency/command, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/bottom/middle, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "bd" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ - dir = 8 +/obj/effect/turf_decal/syndicateemblem/bottom/middle, +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 1 }, -/obj/effect/turf_decal/syndicateemblem/bottom/right{ +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "bf" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible{ @@ -184,17 +222,17 @@ }, /turf/open/floor/plating, /area/ship/engineering/atmospherics) -"bv" = ( -/obj/structure/bed, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" - }, -/obj/item/bedsheet/black, -/obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = 23 +"br" = ( +/obj/effect/turf_decal/syndicateemblem/middle/middle, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 }, -/turf/open/floor/carpet/nanoweave/red, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) +"bv" = ( +/obj/structure/dresser, +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/turf/open/floor/plasteel, /area/ship/crew/dorm) "bH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -218,13 +256,9 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "bL" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = 11 - }, -/turf/template_noop, -/area/template_noop) +/obj/structure/table/reinforced, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "bM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -246,40 +280,28 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "bQ" = ( -/obj/effect/turf_decal/corner/opaque/orange{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, +/obj/machinery/light/directional/north, +/obj/machinery/turretid{ + pixel_y = 32; + req_access = null; + req_access_txt = "150" }, -/obj/structure/closet/secure_closet/miner{ - req_access = list(150,10); - populate = 0 +/obj/effect/turf_decal/spline/fancy/opaque/black/corner, +/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ + dir = 4 }, -/obj/item/clothing/under/syndicate/gorlex, -/obj/item/clothing/suit/space/syndicate/black/orange, -/obj/item/clothing/head/helmet/space/syndicate/black/orange, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/flashlight/seclite, -/obj/item/storage/belt/mining/alt, -/obj/item/stack/sheet/mineral/sandbags, -/obj/item/storage/bag/ore, -/obj/item/shovel, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "bR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters, +/obj/machinery/light/directional/south, +/obj/machinery/vending/snack/random, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "bU" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -287,22 +309,15 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "bV" = ( -/obj/effect/turf_decal/corner/opaque/orange/three_quarters{ - dir = 1 - }, -/obj/item/clothing/under/syndicate/gec, -/obj/item/clothing/shoes/magboots/syndie, -/obj/item/clothing/head/helmet/space/syndicate/black/engie, -/obj/item/clothing/suit/space/syndicate/black/engie, -/obj/structure/closet/secure_closet/engineering_personal{ - req_access = list(150,10) - }, -/obj/item/pipe_dispenser, -/obj/structure/sign/poster/contraband/gec{ - pixel_y = -32 +/obj/machinery/light/directional/south, +/obj/machinery/airalarm/directional/south, +/obj/structure/bed, +/obj/structure/curtain/cloth/fancy{ + name = "blood-red curtains" }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) +/obj/item/bedsheet/black, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm) "bY" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/warning{ dir = 1 @@ -311,21 +326,10 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "cd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/camera/autoname{ - dir = 10 - }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/steeldecal/steel_decals3, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "ch" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -333,21 +337,47 @@ }, /area/ship/engineering/communications) "cj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 4 +/obj/structure/closet, +/obj/machinery/light/small/directional/east, +/obj/item/clothing/mask/gas/syndicate/voicechanger, +/obj/item/clothing/mask/gas/syndicate/voicechanger, +/obj/item/clothing/mask/gas/syndicate/voicechanger, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/radio/headset/syndicate{ + keyslot = null }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 8 +/obj/item/radio/headset/syndicate{ + keyslot = null }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/effect/turf_decal/techfloor{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) "ck" = ( /obj/machinery/chem_heater, /obj/effect/turf_decal/corner/opaque/orange/full, +/obj/effect/turf_decal/steeldecal/steel_decals_central1, /turf/open/floor/plasteel/dark, /area/ship/medical) "cp" = ( @@ -368,7 +398,7 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/aft) "cw" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -383,17 +413,36 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "cC" = ( -/obj/machinery/vending/coffee, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, +/obj/item/canvas/twentythreeXtwentythree{ + name = "Battleplan Board"; + desc = "Remember, no plan survives the battle."; + pixel_y = 32 + }, +/obj/structure/table, +/obj/machinery/fax{ + pixel_y = 5 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "cD" = ( -/obj/machinery/holopad/emergency/bar, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/obj/structure/cable/yellow{ + icon_state = "6-8" + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 9 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"cI" = ( +/obj/effect/turf_decal/steeldecal/steel_decals10, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "cJ" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -411,20 +460,35 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "cL" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/obj/effect/turf_decal/corner_techfloor_grid/full{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor/orange/corner{ + dir = 1 + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) +"cT" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "cW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -432,34 +496,43 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/light/directional/south, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning, +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) -"cX" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/door/airlock/engineering{ + req_access = list(150,10); + dir = 4; + name = "Engineering Access" }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/engine, +/area/ship/engineering/engine) +"cX" = ( +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, +/obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 6 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/ship/hallway/port) "da" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 +/obj/machinery/suit_storage_unit/syndicate, +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, +/turf/open/floor/mineral/plastitanium, /area/ship/security) "db" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; req_access = list(150,10); dir = 4 @@ -484,49 +557,30 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "dk" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "dl" = ( -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + dir = 9 }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 + dir = 9 }, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-8" }, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/port) "dm" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "hos"; - name = "Captain's Locker"; - req_access = list(151) - }, -/obj/item/areaeditor/shuttle, -/obj/item/clothing/under/syndicate/officer, -/obj/item/clothing/suit/armor/vest/capcarapace/syndicate, -/obj/item/clothing/head/HoS/syndicate, -/obj/item/codespeak_manual/unlimited, -/obj/item/storage/belt/sabre, -/obj/item/shield/riot/tele, -/obj/item/storage/lockbox/medal, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, +/obj/structure/rack, /obj/machinery/light/directional/north, -/obj/item/card/id/syndicate_command/captain_id, -/turf/open/floor/carpet/nanoweave/red, -/area/ship/crew/dorm/dormtwo) +/obj/item/gun/energy/ionrifle/carbine, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) "do" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -540,29 +594,28 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "dp" = ( -/obj/machinery/door/airlock/public/glass, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 +/obj/effect/turf_decal/industrial/warning, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/turf/open/floor/plasteel/tech, -/area/ship/crew/canteen) +/turf/open/floor/pod/dark, +/area/ship/cargo) "dq" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/westright, -/obj/machinery/door/window/eastright{ - req_access = list(3,150) +/obj/machinery/computer/secure_data/laptop{ + dir = 8; + pixel_y = 6; + pixel_x = 1 }, -/obj/machinery/recharger, +/obj/machinery/door/window/brigdoor/eastright, /obj/machinery/door/firedoor/border_only{ - dir = 8 + dir = 4 }, /obj/machinery/door/firedoor/border_only{ - dir = 4 + dir = 8 }, /turf/open/floor/mineral/plastitanium, /area/ship/security) @@ -572,40 +625,38 @@ }, /area/ship/medical) "dD" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 - }, -/obj/machinery/nuclearbomb/beer{ - desc = "It's an old, decommissioned bomb, previously used by Nuclear Operatives during the Corporate War. It seems to have a tap drilled in."; - name = "\improper nuclear fission explosive" - }, -/turf/open/floor/plasteel, +/obj/machinery/vending/boozeomat/syndicate_access, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "dE" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/holopad/emergency/medical, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, /turf/open/floor/plasteel/dark, -/area/ship/medical) +/area/ship/security) "dH" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks/beer, /obj/machinery/light/directional/north, -/turf/open/floor/wood, -/area/ship/crew/canteen) -"dL" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 +/obj/structure/rack, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 }, -/obj/machinery/light/directional/west, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"dL" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "dO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -616,12 +667,11 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/firealarm/directional/east, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/aft) "dP" = ( /obj/structure/sign/poster/contraband/tools{ pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/modular_computer/console/preset/engineering, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) @@ -631,11 +681,8 @@ /area/ship/engineering/atmospherics) "dU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, +/obj/machinery/light/directional/east, +/turf/open/floor/wood, /area/ship/crew/canteen) "dV" = ( /obj/machinery/stasis, @@ -651,10 +698,6 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "ea" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, @@ -664,22 +707,36 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/aft) +"ec" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "eg" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/button/door{ - dir = 4; - pixel_x = -25; - name = "Engine Shutters"; - id = "twinkle_engines" +/obj/machinery/power/terminal{ + dir = 8 }, -/turf/open/floor/plating, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 1 + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "en" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -696,24 +753,24 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/hatch{ - name = "Bridge"; - req_access = list(150) - }, +/obj/machinery/door/airlock/grunge, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "ep" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 10 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/rack, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/suit/space/syndicate, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "er" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, @@ -742,24 +799,45 @@ }, /area/ship/medical) "eF" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/structure/table/wood, +/obj/item/storage/fancy/cigarettes/cigars/havana{ + pixel_x = 4; + pixel_y = 2 }, -/obj/machinery/vending/cigarette/syndicate, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"eL" = ( -/obj/structure/chair/stool{ - dir = 8 +/obj/item/lighter{ + pixel_x = -10; + pixel_y = -2 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/item/clothing/mask/cigarette/cigar{ + pixel_x = -4 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/item/toy/plush/moth/punished{ + pixel_x = 7; + pixel_y = 11 + }, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm/dormtwo) +"eL" = ( +/obj/structure/chair/stool{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"eN" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/dark, +/area/ship/security) "eQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "eR" = ( /obj/structure/grille, @@ -771,27 +849,31 @@ /obj/effect/turf_decal/trimline/opaque/orange/line{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/vending/medical/syndicate_access, /turf/open/floor/plasteel/dark, /area/ship/medical) "fm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 + dir = 5 }, /obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "1-4" }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/light/directional/south, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "fn" = ( -/obj/machinery/cryopod{ +/obj/machinery/cryopod/syndicate{ dir = 8 }, -/obj/machinery/light/directional/north, +/obj/machinery/computer/cryopod/directional/south, +/obj/effect/turf_decal/techfloor{ + dir = 6 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) "fz" = ( @@ -819,37 +901,55 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "fJ" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" }, -/obj/structure/reagent_dispensers/water_cooler, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 +/obj/item/clothing/suit/armor/vest/syndie, +/obj/item/clothing/head/helmet/operator, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/storage/belt/security/webbing{ + name = "syndicate webbing"; + desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/obj/machinery/light_switch{ - pixel_y = 22 +/obj/item/radio/headset/syndicate/alt{ + keyslot = null }, -/turf/open/floor/mineral/plastitanium/red, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/black, +/obj/machinery/light/directional/east, +/obj/item/flashlight/seclite, +/obj/item/kitchen/knife/combat, +/turf/open/floor/mineral/plastitanium, /area/ship/security) "fK" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_y = 3 - }, -/obj/item/pen{ - pixel_y = 3 - }, -/turf/open/floor/mineral/plastitanium, +/obj/machinery/light/directional/south, +/turf/open/floor/mineral/plastitanium/red, /area/ship/security) "fN" = ( -/obj/structure/window/reinforced/spawner, -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/window/reinforced/spawner{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/warning, +/obj/machinery/door/airlock/engineering{ + req_access = list(150,10); + dir = 4; + name = "Engineering Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/vending/dinnerware, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/turf/open/floor/engine, +/area/ship/engineering/engine) "fO" = ( /obj/structure/railing, /obj/structure/railing{ @@ -861,13 +961,11 @@ /turf/open/floor/plating, /area/ship/external/dark) "fQ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/turf/open/floor/wood, +/area/ship/crew/canteen) "fT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -883,7 +981,6 @@ /area/ship/medical) "fV" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; dir = 4 }, @@ -899,13 +996,20 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "fX" = ( -/obj/machinery/suit_storage_unit/syndicate, -/obj/effect/turf_decal/box/white/corners{ - dir = 4 +/obj/structure/bed/double, +/obj/item/bedsheet/double/black, +/obj/item/paper{ + name = "concealed note"; + icon_state = "scrap"; + color = "#505050"; + desc = "This note is crumpled and torn."; + default_raw_text = "ever since the war ended some eighteen years ago, the syndicate has been at odds with ourselves. our branches' ideals and personal goals are dividing the syndicate more and more.

tensions keep rising on the frontier sectors, where it's less likely that people will get caught sabotaging or hindering each other, and you, presumably, have just been given captainship of a vessel full of members who all hate each other.

to put it bluntly, you're in deep. this melting pot of ideologies, at its worst, is going to tear your leadership apart. you're going to need to keep tensions low on this two decade old warship so it doesn't all go to shit.

keep track of where every member comes from:
-you are, most likely, from the aclf
-the lieutenant is an officer from the new gorlex republic
-the medics come from cybersun
-the engineers are from the gec
-the operatives are a mix of the 2nd battlegroup and the aclf
-the bartender is from donk
-the miner is from suns
-deck assistants are a wildcard, not contracted from anyone in specific" }, -/obj/effect/turf_decal/box/white/corners, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/structure/curtain/cloth/fancy{ + name = "blood-red curtains" + }, +/turf/open/floor/carpet/red, +/area/ship/crew/dorm/dormtwo) "gh" = ( /obj/machinery/door/airlock/external{ req_access = list(150) @@ -913,33 +1017,17 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "gi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 + dir = 10 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "gk" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 8 - }, -/obj/machinery/door/poddoor{ - id = "twinkle_armory" + dir = 6 }, /turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) +/area/ship/security) "gm" = ( /obj/effect/turf_decal/industrial/warning, /obj/structure/cable{ @@ -964,41 +1052,30 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "gv" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "gz" = ( -/obj/machinery/computer/cryopod/directional/north{ - pixel_y = 26 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/closet/wall{ - dir = 4; - pixel_x = -28; - name = "gear closet" +/obj/effect/turf_decal/industrial/warning{ + dir = 4 }, -/obj/item/radio/headset/syndicate/alt, -/obj/item/radio/headset/syndicate/alt, -/obj/item/radio/headset/syndicate/alt, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/radio/headset/syndicate, -/obj/item/radio/headset/syndicate, -/obj/item/radio/headset/syndicate, -/obj/item/radio/off, -/obj/item/radio/off, -/obj/item/radio/off, -/obj/item/radio/off, -/turf/open/floor/plasteel/tech/grid, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/crew/cryo) "gC" = ( /obj/effect/turf_decal/corner/opaque/orange{ @@ -1009,37 +1086,47 @@ /area/ship/engineering/engine) "gE" = ( /obj/effect/turf_decal/industrial/warning{ - dir = 5 + dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/effect/turf_decal/box/corners{ + dir = 1 }, -/obj/structure/closet/crate{ - name = "Mining Crate" +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/obj/structure/closet/secure_closet/miner{ + req_access = list(150, 48); + populate = 0 }, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/mini, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, /obj/item/storage/bag/ore, /obj/item/mining_scanner, /obj/item/mining_scanner, -/obj/item/mining_scanner, -/obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = 23 +/obj/item/pickaxe/mini, +/obj/item/storage/belt/mining/alt, +/obj/item/flashlight/seclite, +/obj/item/radio/headset/syndicate{ + keyslot = null }, +/obj/item/clothing/under/syndicate/suns/workerjumpsuit, +/obj/item/clothing/head/safety_helmet/suns, +/obj/item/clothing/suit/toggle/suns/workervest, +/obj/item/clothing/gloves/suns, /turf/open/floor/pod/dark, /area/ship/cargo) "gI" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/vending/coffee, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "gL" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 @@ -1047,6 +1134,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "gU" = ( @@ -1054,21 +1144,9 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "gW" = ( -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "gX" = ( /obj/machinery/door/airlock/hatch{ name = "Custodial Closet"; @@ -1083,18 +1161,27 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/janitor) "gZ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 4 +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 8 +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 }, /turf/open/floor/plasteel, -/area/ship/crew/canteen) +/area/ship/crew/dorm) "hb" = ( /obj/machinery/computer/operating, /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ @@ -1103,86 +1190,36 @@ /turf/open/floor/plasteel/mono/white, /area/ship/medical/surgery) "hd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, +/obj/machinery/light/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) +"hr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/port) +"ht" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/turf/open/floor/engine, +/area/ship/engineering/engine) +"hw" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"hj" = ( -/obj/item/hypospray/mkii/CMO/combat{ - pixel_x = -8; - pixel_y = 6 - }, -/obj/item/reagent_containers/glass/bottle/vial/large{ - pixel_y = 4; - pixel_x = 7 - }, -/obj/item/reagent_containers/glass/bottle/vial/large{ - pixel_y = 4; - pixel_x = 7 - }, -/obj/item/reagent_containers/glass/bottle/vial/large{ - pixel_y = 4; - pixel_x = 7 - }, -/obj/item/reagent_containers/glass/bottle/vial/large{ - pixel_y = 4; - pixel_x = 7 - }, -/obj/structure/sign/poster/contraband/mothpill{ - pixel_x = 32 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/opaque/orange/line{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/medical) -"hr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) -"ht" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/engine, -/area/ship/engineering/engine) -"hw" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) -"hE" = ( -/obj/structure/table/wood/reinforced, -/obj/item/paper_bin, -/obj/item/pen/fourcolor, -/turf/open/floor/carpet/red, -/area/ship/crew/office) "hN" = ( /obj/effect/turf_decal/corner/opaque/orange{ dir = 5 @@ -1196,14 +1233,17 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "hP" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters, -/obj/machinery/light/directional/south, -/obj/machinery/vending/snack/random, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/item/soap/syndie, +/obj/structure/curtain, +/obj/machinery/shower{ + pixel_y = 19 + }, +/obj/effect/turf_decal/techfloor/hole, +/obj/effect/turf_decal/techfloor/hole/right, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/dorm) "hR" = ( /obj/machinery/door/airlock/hatch{ - name = "Mech Launcher #2"; req_access = list(150); dir = 4 }, @@ -1213,47 +1253,26 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "hS" = ( -/obj/structure/table, -/obj/item/storage/box/emps{ - pixel_x = -5; - pixel_y = 10 - }, -/obj/item/storage/box/flashbangs{ - pixel_y = 10; - pixel_x = 5 - }, -/obj/item/suppressor/specialoffer{ - pixel_y = 6; - pixel_x = -8 - }, -/obj/item/suppressor/specialoffer{ - pixel_y = -1; - pixel_x = -8 - }, -/obj/item/stock_parts/cell/gun{ - pixel_y = 1; - pixel_x = 9 - }, -/obj/item/stock_parts/cell/gun{ - pixel_y = 1; - pixel_x = 9 - }, -/obj/item/stock_parts/cell/gun{ - pixel_y = 1; - pixel_x = 9 +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "hU" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "hW" = ( @@ -1267,38 +1286,60 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "hY" = ( -/obj/structure/table, -/obj/item/storage/fancy/donut_box{ - name = "suspicious donut box" +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/ship/crew/dorm) "hZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "ia" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/turf/open/floor/plasteel/dark, +/area/ship/engineering/atmospherics) "ie" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "ig" = ( /obj/effect/turf_decal/industrial/warning{ @@ -1317,23 +1358,39 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ih" = ( -/obj/structure/table/wood, -/obj/machinery/jukebox/boombox{ - pixel_x = -10 +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/obj/machinery/door/firedoor/border_only, -/obj/item/clothing/head/chefhat{ - pixel_x = 7 +/obj/structure/chair/stool/bar{ + dir = 1 }, /turf/open/floor/wood, /area/ship/crew/canteen) "ii" = ( -/obj/machinery/vending/medical/syndicate_access, /obj/effect/turf_decal/corner/opaque/syndiered/full, +/obj/structure/closet/secure_closet/medical3{ + req_access = list(150, 5); + icon_state = "tac"; + populate = 0 + }, +/obj/item/clothing/under/rank/medical/doctor/red, +/obj/item/clothing/suit/longcoat/roboblack{ + name = "syndicate medic's black longcoat" + }, +/obj/item/clothing/under/syndicate/medic/skirt, +/obj/item/clothing/under/syndicate/medic, +/obj/item/clothing/head/helmet/medical, +/obj/item/clothing/suit/armor/vest/marine/trauma, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical/webbing, +/obj/item/clothing/gloves/color/latex/nitrile/evil, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "im" = ( -/obj/structure/chair/comfy/black, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "ip" = ( @@ -1349,8 +1406,11 @@ desc = "A poster that details the dangerously unsafe power generation methods of most ships."; pixel_x = -32 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "ir" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 @@ -1358,18 +1418,11 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "iu" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance/four, -/obj/item/reagent_containers/food/snacks/burger/red{ - name = "suspicious red burger"; - desc = "A suspicious looking burger."; - color = "#730622" +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) +/turf/open/floor/wood, +/area/ship/crew/canteen) "iz" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 @@ -1400,19 +1453,27 @@ /area/ship/engineering/engine) "iC" = ( /obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 4 + dir = 8 }, -/turf/open/floor/plating, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "iG" = ( -/obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ - icon_state = "0-2" + icon_state = "1-8" }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/cryo) +/obj/effect/turf_decal/techfloor/orange, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) "iI" = ( -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "iJ" = ( @@ -1432,31 +1493,37 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "iK" = ( -/obj/machinery/mech_bay_recharge_port, /obj/effect/turf_decal/techfloor{ dir = 1 }, /obj/effect/turf_decal/corner/opaque/syndiered/half, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"iL" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 +/obj/effect/decal/cleanable/garbage{ + pixel_x = 16; + pixel_y = 2 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/obj/item/stack/ore/salvage/scrapmetal{ + pixel_x = -1; + pixel_y = -13 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/item/stack/ore/salvage/scrapbluespace{ + pixel_x = -5; + pixel_y = 7 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"iL" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/sign/poster/contraband/space_up{ - pixel_y = -32 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/engineering{ + dir = 1; + req_access = list(150,10) }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "iV" = ( /obj/machinery/light/directional/north, /obj/structure/table, @@ -1543,42 +1610,34 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"jr" = ( -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ +/obj/effect/turf_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 8 +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"jo" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/turf/open/floor/plating, +/obj/machinery/door/window, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"jr" = ( +/obj/machinery/atmospherics/components/binary/volume_pump{ + dir = 8 + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "jv" = ( -/obj/item/storage/bag/chemistry, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/glass/beaker, -/obj/structure/closet/wall/orange{ - name = "Chemical Closet"; - pixel_y = 28 - }, -/obj/structure/sign/warning/chemdiamond{ - pixel_x = 30 - }, -/obj/item/clothing/glasses/sunglasses/chemical, -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/opaque/orange/line{ +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"jx" = ( +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 5 }, -/turf/open/floor/plasteel/dark, -/area/ship/medical) -"jx" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "jz" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -1587,27 +1646,15 @@ /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "jA" = ( -/obj/machinery/door/airlock/hatch{ - name = "Engineering Office"; - dir = 4 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 9 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-8" }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "jG" = ( /obj/effect/decal/cleanable/oil/slippery, /obj/effect/decal/cleanable/dirt/dust, @@ -1619,10 +1666,6 @@ "jH" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - id = "twinkle_armory"; - dir = 4 - }, /turf/open/floor/plating, /area/ship/security/armory) "jJ" = ( @@ -1647,6 +1690,22 @@ /obj/item/bedsheet/medical, /turf/open/floor/plasteel/dark, /area/ship/medical) +"jO" = ( +/obj/structure/table/reinforced, +/obj/item/folder/syndicate/red{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/folder/syndicate/blue{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/folder/red{ + pixel_x = -4 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "jT" = ( /obj/structure/sign/syndicate, /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -1670,27 +1729,39 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ka" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 + dir = 10 }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = 0 +/obj/machinery/camera/autoname{ + dir = 10 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "kc" = ( -/obj/machinery/suit_storage_unit/syndicate, -/obj/effect/turf_decal/box/white/corners{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/box/white/corners{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/light/directional/south, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "kd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1699,72 +1770,87 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/aft) "ke" = ( /obj/effect/turf_decal/industrial/warning, /obj/machinery/light/directional/south, /turf/open/floor/engine, /area/ship/engineering/engine) "kf" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/obj/machinery/light/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/plasteel/dark, +/area/ship/security) "kl" = ( -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/light/directional/north, +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "hos"; + name = "Captain's Locker"; + req_access = list(150, 20) }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/item/card/id/syndicate_command/captain_id, +/obj/item/storage/lockbox/medal, +/obj/item/codespeak_manual{ + charges = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/item/gun/ballistic/revolver, +/obj/item/megaphone/sec{ + name = "syndicate megaphone" }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/item/radio/headset/syndicate/captain, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/suit/armor/vest/capcarapace/syndicate, +/obj/item/clothing/under/syndicate/ngr/officer, +/obj/item/clothing/head/HoS/syndicate, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm/dormtwo) "ky" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/computer/atmos_control/tank/air_tank{ - dir = 8 - }, -/turf/open/floor/plating, +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/machinery/light/directional/east, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "kE" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 +/obj/effect/turf_decal/syndicateemblem/top/right, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "kF" = ( -/obj/structure/table/wood/reinforced, -/obj/item/folder/syndicate{ - desc = "A black folder."; - name = "folder"; - pixel_x = 7 - }, -/obj/item/book/random{ - pixel_x = -6 - }, -/turf/open/floor/carpet/red, +/obj/machinery/holopad/emergency/command, +/turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "kH" = ( -/obj/structure/rack, -/obj/effect/turf_decal/box/white/corners{ - dir = 1 +/obj/item/clothing/suit/armor/vest/syndie, +/obj/item/clothing/head/helmet/operator, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/storage/belt/security/webbing{ + name = "syndicate webbing"; + desc = "Unique and versatile chest rig, can hold syndicate gear." }, -/obj/effect/turf_decal/box/white/corners{ - dir = 8 +/obj/item/radio/headset/syndicate/alt{ + keyslot = null }, -/obj/structure/closet/emcloset/wall{ - dir = 1; - pixel_y = -28 +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/black, +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" }, +/obj/machinery/light/directional/east, +/obj/item/clothing/head/soft/black, +/obj/item/clothing/glasses/sunglasses, +/obj/item/flashlight/seclite, +/obj/item/kitchen/knife/combat, /turf/open/floor/mineral/plastitanium, /area/ship/security) "kJ" = ( @@ -1781,34 +1867,56 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "kR" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/newscaster/directional/north{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "kT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 9 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"kV" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ - dir = 1 +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/obj/effect/turf_decal/syndicateemblem/top/left{ +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/door/airlock/hatch{ + dir = 4 + }, /turf/open/floor/mineral/plastitanium, +/area/ship/security) +"kV" = ( +/obj/effect/turf_decal/syndicateemblem/top/middle{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "kX" = ( /obj/structure/sign/syndicate, @@ -1817,24 +1925,19 @@ }, /area/ship/bridge) "lg" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, +/obj/machinery/light/directional/west, /obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "1-4" }, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "lj" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1845,16 +1948,20 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "ln" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/syndicake{ + pixel_y = 10; + pixel_x = 3 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/structure/sign/poster/official/no_erp{ + pixel_y = 32 + }, +/obj/item/toy/cards/deck/syndicate{ + pixel_x = -7 + }, +/turf/open/floor/plasteel, +/area/ship/crew/dorm) "lo" = ( /obj/machinery/power/shieldwallgen/atmos{ anchored = 1; @@ -1872,44 +1979,53 @@ /turf/open/floor/plating, /area/ship/cargo) "lq" = ( -/obj/structure/closet/secure_closet/freezer/kitchen/wall{ - dir = 8; - pixel_x = 28 +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ + dir = 1 }, -/obj/item/clothing/under/suit/waiter/syndicate, -/obj/item/circuitboard/machine/deep_fryer, -/obj/item/circuitboard/machine/gibber, -/obj/item/cutting_board, -/turf/open/floor/wood, -/area/ship/crew/canteen) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "lv" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 8 + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "lw" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/door/airlock/atmos/glass{ + req_one_access_txt = "150"; + req_access = list(150,10); + dir = 4 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/structure/cable/yellow{ + icon_state = "4-10" + }, +/obj/effect/turf_decal/techfloor/orange/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) "lx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/camera/autoname{ +/obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "lF" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 8 @@ -1923,24 +2039,14 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "lG" = ( -/obj/machinery/light/directional/south, -/obj/structure/table/reinforced, -/obj/item/folder/syndicate/red{ - pixel_x = -8; - pixel_y = 6 - }, -/obj/item/folder/syndicate/blue{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/folder/red{ - pixel_x = -4 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/machinery/cryopod/syndicate{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/effect/turf_decal/techfloor{ + dir = 10 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) "lI" = ( /obj/effect/turf_decal/industrial/caution{ dir = 8 @@ -1948,58 +2054,56 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "lO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{ - dir = 1 +/obj/effect/turf_decal/trimline/opaque/syndiered/warning, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/advanced_airlock_controller{ + pixel_x = 25 }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "lT" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/obj/effect/turf_decal/borderfloorblack{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) +"lY" = ( +/obj/structure/cable/yellow{ + icon_state = "4-9" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/chair/stool/bar{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) -"lY" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder/constructed, /turf/open/floor/wood, /area/ship/crew/canteen) "ma" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/machinery/computer/slot_machine, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 + dir = 8 }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/obj/structure/chair/stool/bar{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /area/ship/crew/canteen) "ml" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /area/ship/crew/canteen) "mm" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/structure/noticeboard{ dir = 4; pixel_x = -32 @@ -2007,13 +2111,19 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "mo" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/computer/atmos_control/tank/air_tank{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "mp" = ( /turf/template_noop, @@ -2047,26 +2157,44 @@ /turf/open/floor/engine/n2, /area/ship/engineering/atmospherics) "mx" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/turf_decal/syndicateemblem/top/middle{ +/obj/effect/turf_decal/syndicateemblem/top/right{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 4 + }, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "mB" = ( -/obj/machinery/newscaster/directional/west, -/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ - dir = 4 +/obj/machinery/light/directional/west, +/obj/machinery/computer/camera_advanced{ + dir = 4; + icon_state = "computer-right"; + icon_keyboard = "syndie_key" }, -/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ - dir = 5 +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 8 }, /turf/open/floor/mineral/plastitanium, -/area/ship/security) +/area/ship/bridge) "mG" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) +"mO" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -2074,20 +2202,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/camera/autoname, -/turf/open/floor/plating, -/area/ship/hallway/central) -"mO" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/turf/open/floor/plasteel/dark, +/area/ship/security) "mS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2219,42 +2338,63 @@ /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 1 }, -/turf/open/floor/plating, +/obj/item/trash/pistachios, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "nr" = ( -/obj/machinery/suit_storage_unit/syndicate, -/obj/effect/turf_decal/box/white/corners{ - dir = 1 +/obj/structure/table, +/obj/item/storage/box/zipties{ + pixel_x = -5; + pixel_y = 11 }, -/obj/effect/turf_decal/box/white/corners{ - dir = 8 +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = 8; + pixel_y = 3 }, +/obj/machinery/light/directional/west, /turf/open/floor/mineral/plastitanium, /area/ship/security) "nt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/suit_storage_unit/syndicate{ + suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/sbg; + name = "lieutenant's suit storage unit" }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/turf/open/floor/mineral/plastitanium, +/area/ship/security) +"nw" = ( +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plating, -/area/ship/hallway/central) -"nE" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 10 +/obj/item/rack_parts{ + pixel_x = -6; + pixel_y = 11 }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 4 +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"nE" = ( +/obj/effect/turf_decal/corner/opaque/syndiered, +/obj/effect/turf_decal/borderfloorblack{ + dir = 9 }, -/obj/machinery/vending/toyliberationstation, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "nS" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -2264,42 +2404,49 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "oc" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 8 +/obj/structure/table, +/obj/item/clothing/head/warden/drill{ + name = "lieutenant's campaign hat"; + desc = "A special armored campaign hat with the Syndicate insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."; + pixel_x = 2; + pixel_y = -7 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/item/reagent_containers/food/snacks/donut/choco{ + pixel_x = 3; + pixel_y = 7 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = -7; + pixel_y = 6 }, -/turf/open/floor/mineral/plastitanium/red, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, /area/ship/security) "oi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/closet/firecloset/wall{ + dir = 1; + pixel_y = -28 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "oj" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/vending/cigarette/syndicate, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "on" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 4 @@ -2316,41 +2463,21 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "ox" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/structure/table/reinforced, +/obj/item/paper_bin/carbon, +/obj/item/pen/fountain, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "oB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/borderfloorblack{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/orange/filled/warning, -/obj/machinery/door/airlock/external{ - req_access = list(150,10); - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/engine, -/area/ship/engineering/engine) +/obj/machinery/firealarm/directional/east, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "oC" = ( /obj/effect/turf_decal/corner/opaque/orange{ dir = 6 @@ -2370,21 +2497,16 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "oD" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "oG" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 4 +/obj/machinery/door/airlock/grunge{ + req_access = list(3,150) }, -/obj/machinery/firealarm/directional/east, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "oJ" = ( @@ -2394,6 +2516,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "oL" = ( @@ -2414,7 +2539,6 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "oM" = ( -/obj/structure/table, /obj/machinery/button/massdriver{ pixel_x = 23; dir = 8; @@ -2433,6 +2557,10 @@ /obj/machinery/camera/autoname{ dir = 10 }, +/obj/structure/table_frame{ + pixel_y = 2; + pixel_x = -3 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "oP" = ( @@ -2453,16 +2581,13 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "oX" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, /obj/effect/turf_decal/industrial/warning, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/aft) "pc" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2473,7 +2598,6 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ph" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, /obj/item/modular_computer/tablet/preset/advanced{ pixel_x = 8 @@ -2485,52 +2609,47 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "pj" = ( -/obj/machinery/door/window/southright, -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/wood, /area/ship/crew/canteen) "pl" = ( -/obj/machinery/computer/mech_bay_power_console, /obj/effect/turf_decal/techfloor{ dir = 1 }, /obj/effect/turf_decal/corner/opaque/syndiered/half, +/obj/structure/salvageable/computer, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "pm" = ( -/obj/structure/filingcabinet/double, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, /obj/structure/sign/poster/contraband/ss13{ pixel_y = 32 }, +/obj/structure/table, +/obj/item/megaphone{ + pixel_y = 4; + pixel_x = 3 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "pp" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) -"pr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing{ - dir = 9 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) "ps" = ( -/obj/structure/bed, -/obj/structure/sign/poster/contraband/smoke{ - pixel_y = 32 +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/item/bedsheet/black, -/turf/open/floor/carpet/nanoweave/red, +/turf/open/floor/plasteel, /area/ship/crew/dorm) "pt" = ( /obj/machinery/atmospherics/pipe/manifold/green/visible{ @@ -2566,17 +2685,15 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "pw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/light/directional/north, +/obj/structure/chair/office/dark{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "pB" = ( /obj/machinery/power/terminal{ dir = 1 @@ -2590,25 +2707,36 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "pD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 +/obj/item/kirbyplants/random, +/obj/machinery/light/directional/west, +/obj/structure/sign/poster/official/moth/smokey{ + pixel_y = 32 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "pE" = ( -/obj/machinery/button/door{ - pixel_x = -25; - pixel_y = 10; - dir = 4; - id = "twinkle_armory"; - name = "Armory Access"; - req_access = list(3,150) +/obj/effect/turf_decal/industrial/warning{ + dir = 4 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/port) "pF" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, /obj/effect/turf_decal/industrial/warning{ @@ -2620,59 +2748,82 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/eight, -/obj/machinery/airalarm/directional/west, -/obj/item/circuitboard/machine/autolathe, -/obj/item/stock_parts/manipulator, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/matter_bin, -/obj/item/stack/sheet/glass, +/obj/machinery/light/directional/west, /turf/open/floor/pod/dark, /area/ship/cargo) "pI" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters, -/obj/effect/turf_decal/syndicateemblem/bottom/left{ +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "pL" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 1 }, -/obj/machinery/camera/autoname, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/atmospherics) "pN" = ( -/obj/machinery/suit_storage_unit/syndicate, -/obj/effect/turf_decal/box/white/corners{ - dir = 4 +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" }, -/obj/effect/turf_decal/box/white/corners, -/obj/machinery/camera/autoname{ - dir = 10 +/obj/item/clothing/suit/armor/vest/syndie, +/obj/item/clothing/head/helmet/operator, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/storage/belt/security/webbing{ + name = "syndicate webbing"; + desc = "Unique and versatile chest rig, can hold syndicate gear." + }, +/obj/item/radio/headset/syndicate/alt{ + keyslot = null }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/black, +/obj/machinery/light/directional/west, +/obj/item/flashlight/seclite, +/obj/item/kitchen/knife/combat, /turf/open/floor/mineral/plastitanium, /area/ship/security) "pO" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"pR" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/structure/sign/poster/contraband/stechkin{ - pixel_x = 32 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/plating, +/area/ship/hallway/port) +"pR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_x = -8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) "pU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -2682,6 +2833,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/light/directional/west, /turf/open/floor/plating, /area/ship/hallway/central) "qb" = ( @@ -2698,15 +2850,10 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ql" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_x = 25 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "qo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2716,29 +2863,14 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) "qp" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "qr" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2770,20 +2902,17 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "qA" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 9 - }, /obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, /obj/machinery/light_switch{ dir = 4; pixel_x = -20; pixel_y = 12 }, -/turf/open/floor/plasteel, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/steeldecal/steel_decals_central7, +/turf/open/floor/wood, /area/ship/crew/canteen) "qF" = ( /obj/structure/table, @@ -2791,7 +2920,7 @@ pixel_y = 4; pixel_x = -5 }, -/obj/item/book/manual/wiki/tcomms{ +/obj/item/book/manual/wiki/engineering{ pixel_x = 9; pixel_y = 3 }, @@ -2817,17 +2946,16 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "qL" = ( -/obj/structure/bed, -/obj/item/toy/plush/among{ - color = "#730622"; - name = "suspicious amoung pequeño"; - desc = "Get out of my head!" +/obj/structure/toilet{ + dir = 8 }, -/obj/machinery/flasher{ - pixel_y = -23; - id = "twinkle_flash2" +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/sink{ + pixel_y = -11; + pixel_x = -9; + dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plating, /area/ship/security) "qM" = ( /obj/machinery/door/airlock/external{ @@ -2843,17 +2971,37 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "qN" = ( -/obj/machinery/photocopier, /obj/machinery/light/directional/north, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 }, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_y = 5 + }, +/obj/item/pen/fourcolor{ + pixel_y = 5 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "qP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, +/obj/machinery/light/directional/north, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/storage/box/ingredients/carnivore, +/obj/item/storage/box/ingredients/vegetarian, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/effect/spawner/lootdrop/donkpockets, +/obj/effect/spawner/lootdrop/donkpockets, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "qQ" = ( /obj/machinery/telecomms/broadcaster/preset_right{ @@ -2866,7 +3014,6 @@ dir = 1 }, /obj/machinery/firealarm/directional/north, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light_switch{ pixel_y = 22; pixel_x = -12 @@ -2883,23 +3030,23 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, -/obj/machinery/holopad/emergency/command, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "qY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -13; + pixel_y = -20 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "ra" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2925,7 +3072,6 @@ /area/ship/engineering/engine) "rd" = ( /obj/machinery/door/airlock/engineering{ - name = "Engineer Room"; req_access = list(150,10) }, /obj/effect/turf_decal/corner/opaque/orange/full, @@ -2960,12 +3106,14 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "ru" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "rQ" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 8 @@ -2983,48 +3131,46 @@ /turf/open/floor/plasteel/elevatorshaft, /area/ship/bridge) "sc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/structure/railing{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 8 }, /turf/open/floor/mineral/plastitanium, -/area/ship/security) +/area/ship/bridge) "sd" = ( -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/security) "sf" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks, -/turf/open/floor/wood, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "si" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/structure/sign/poster/official/moth/piping{ + desc = "This informational poster uses Safety Moth(TM) to tell atmospheric technicians correct types of piping to be used. Proper pipe placement prevents poor performance! It's signed by 'AspEv'."; + pixel_x = 32 }, -/obj/structure/cable/yellow{ - icon_state = "6-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/engineering{ + req_access = list(150,10) }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) "sj" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/power/terminal{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "sk" = ( /obj/effect/turf_decal/industrial/warning{ @@ -3080,23 +3226,8 @@ dir = 5 }, /obj/effect/turf_decal/trimline/opaque/syndiered/corner, -/obj/machinery/light/directional/east, -/obj/structure/sign/poster/solgov/suns{ - pixel_x = 32 - }, /turf/open/floor/plasteel/dark, /area/ship/medical) -"sz" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) "sC" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/machinery/computer/atmos_control/tank/toxin_tank{ @@ -3123,10 +3254,14 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "sG" = ( -/obj/machinery/light/directional/north, -/obj/machinery/vending/security/marine/syndicate, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/light/directional/east, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "sI" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 8 @@ -3170,26 +3305,27 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/engineering/engine) "sY" = ( -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/machinery/light/directional/east, -/turf/open/floor/plating, +/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 8 + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "tg" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay"; - req_one_access_txt = "150"; - req_access = list(150); - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/turf/open/floor/plasteel/dark, -/area/ship/medical) +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) "th" = ( /obj/effect/turf_decal/industrial/caution{ dir = 4 @@ -3210,40 +3346,26 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "tl" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ - dir = 8 - }, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "tn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/light/directional/west, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "tp" = ( -/obj/structure/toilet/secret{ - secret_type = "/obj/item/toy/plush/moth"; - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/pod/light, +/area/ship/cargo) "tr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing{ - dir = 10; - layer = 3.1 +/obj/effect/turf_decal/corner/opaque/syndiered/border{ + dir = 1 }, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered/border, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) @@ -3260,22 +3382,20 @@ /turf/open/floor/engine/air, /area/ship/engineering/atmospherics) "tH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "tS" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/structure/railing{ + dir = 10; + layer = 3.1 }, /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 @@ -3283,30 +3403,34 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "tU" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/wood, -/area/ship/crew/canteen) +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ + dir = 1 + }, +/obj/item/trash/candy, +/obj/effect/turf_decal/techfloor/orange{ + dir = 9 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/atmospherics) "tY" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"tZ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/turf/open/floor/plating, +/area/ship/hallway/starboard) +"tZ" = ( +/obj/effect/turf_decal/syndicateemblem/bottom/middle, +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "ug" = ( /obj/structure/rack, @@ -3344,7 +3468,7 @@ /mob/living/simple_animal/hostile/carp/cayenne{ name = "Cayenne II"; desc = "A descendant from the legendary Cayenne, a failed Syndicate experiment in weaponized space carp."; - faction = list("PlayerSyndicate") + faction = list("playerSyndicate") }, /obj/item/toy/nuke, /obj/effect/turf_decal/corner/opaque/syndiered/border, @@ -3357,8 +3481,8 @@ /area/ship/bridge) "uE" = ( /obj/machinery/door/airlock/hatch{ - name = "Captain's Quarters"; - req_access = list(151); + name = "Captain Quarters"; + req_access = list(150, 20); dir = 4 }, /obj/structure/cable/yellow{ @@ -3370,8 +3494,23 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) +"uH" = ( +/obj/structure/sign/directions/engineering{ + pixel_y = 5; + dir = 8 + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 + }, +/area/ship/crew/dorm/dormtwo) "uK" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 1 @@ -3392,39 +3531,31 @@ /area/ship/engineering/communications) "uX" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medbay"; req_one_access_txt = "150"; req_access = list(150); dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, +/obj/effect/turf_decal/corner/opaque/syndiered/full, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 }, -/obj/effect/turf_decal/corner/opaque/syndiered/full, /turf/open/floor/plasteel/dark, /area/ship/medical) "uY" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ + dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "vd" = ( /obj/machinery/porta_turret/ship/syndicate/heavy{ @@ -3445,10 +3576,18 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "vn" = ( -/obj/structure/tank_dispenser/oxygen, -/obj/machinery/light/directional/south, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/grunge, +/turf/open/floor/pod/dark, +/area/ship/cargo) "vz" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 @@ -3469,16 +3608,24 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/hatch{ - name = "Bridge"; - req_access = list(150) - }, +/obj/machinery/door/airlock/grunge, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "vE" = ( -/obj/machinery/suit_storage_unit/syndicate, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "vJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3490,16 +3637,21 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "vL" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 6 +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/item/toy/plush/moth{ + name = "lieutenant moth plushie"; + desc = "A plushie depicting an adorable mothperson, featuring realistic mothperson agony sounds every time you hug it. They seem to be hiding something." + }, +/obj/effect/turf_decal/steeldecal/steel_decals10, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 4 }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "vO" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/turf_decal/syndicateemblem/middle/right{ - dir = 8 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -3537,19 +3689,15 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "wb" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/item/toy/plush/moth{ - name = "lieutenant moth plushie"; - desc = "A plushie depicting an adorable mothperson, featuring realistic mothperson agony sounds every time you hug it. They seem to be hiding something." - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/drinks/beer, +/obj/machinery/light/directional/north, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) "wg" = ( /obj/structure/cable/yellow{ icon_state = "2-9" @@ -3558,13 +3706,13 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "wh" = ( -/obj/machinery/door/poddoor{ - id = "twinkle_external" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/security) +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "wi" = ( /obj/effect/turf_decal/industrial/warning, /obj/structure/cable{ @@ -3582,31 +3730,52 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "wm" = ( -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "wr" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 4 }, -/obj/machinery/light/directional/west, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/bottom/middle, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "wu" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, -/obj/machinery/camera/autoname{ - dir = 9 +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) +"wx" = ( +/obj/effect/turf_decal/steeldecal/steel_decals4, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "wz" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/wood, -/area/ship/crew/canteen) +/obj/machinery/door/airlock/atmos/glass{ + req_one_access_txt = "150"; + req_access = list(150,10); + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/techfloor/orange/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) "wA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/decal/cleanable/dirt/dust, @@ -3634,7 +3803,6 @@ dir = 8 }, /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; dir = 4 }, @@ -3696,55 +3864,26 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "wR" = ( -/obj/item/gun/energy/ionrifle, -/obj/structure/rack, -/obj/item/storage/backpack/duffelbag/syndie/x4, -/obj/item/card/emag, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/window/westleft{ - dir = 1; - req_access = list(3,150) +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/ammo_casing/caseless/rocket, -/obj/item/ammo_casing/caseless/rocket, -/obj/item/ammo_casing/caseless/rocket/hedp, -/obj/item/ammo_casing/caseless/rocket/hedp, -/obj/item/ammo_box/a12g, -/obj/item/ammo_box/a12g, -/obj/item/ammo_box/a12g, -/obj/item/gun/ballistic/rocketlauncher, -/obj/item/gun/ballistic/automatic/ebr, -/obj/item/gun/ballistic/automatic/ebr{ - pixel_x = -6; - pixel_y = -3 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) -"wV" = ( -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"wV" = ( +/obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/door/airlock/hatch{ - name = "Briefing"; - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/airlock/grunge{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "wZ" = ( @@ -3768,8 +3907,11 @@ dir = 9 }, /obj/machinery/light/directional/west, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "xc" = ( /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/corner/opaque/syndiered/half{ @@ -3787,34 +3929,32 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) -"xe" = ( -/obj/structure/toilet/secret{ - secret_type = "/obj/item/toy/plush/moth"; - dir = 4 - }, -/obj/structure/sign/poster/contraband/punch_shit{ - pixel_y = 32 +"xg" = ( +/obj/effect/turf_decal/syndicateemblem/bottom/left{ + dir = 8 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) -"xg" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 1 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "xh" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 10 +/obj/machinery/power/terminal{ + dir = 8 }, -/turf/open/floor/plating, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 9 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "xj" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -3886,27 +4026,28 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "xz" = ( -/obj/machinery/flasher{ - pixel_y = -23; - id = "twinkle_flash1" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/machinery/newscaster/directional/north{ + pixel_y = 32 + }, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "xB" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 }, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "xH" = ( /obj/machinery/door/poddoor{ id = "twinkle_rightmassdriver"; @@ -3918,8 +4059,11 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "xW" = ( /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/trimline/opaque/syndiered/warning{ @@ -3940,7 +4084,6 @@ /area/template_noop) "ya" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; req_access = list(150,10); dir = 8 }, @@ -3979,18 +4122,15 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "yn" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/camera/autoname{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/advanced_airlock_controller{ + pixel_x = 25 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/dark, -/area/ship/engineering/atmospherics) +/area/ship/hallway/port) "yr" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -4009,15 +4149,19 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "yz" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-8" }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/port) "yB" = ( /obj/effect/turf_decal/industrial/warning, /obj/structure/cable{ @@ -4030,17 +4174,11 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "yF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "yI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -4061,49 +4199,47 @@ /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "yN" = ( -/obj/structure/sign/poster/contraband/syndicate_recruitment{ - pixel_x = -32 +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = -11 + }, +/obj/item/radio/intercom/table{ + dir = 8; + pixel_x = -5; + pixel_y = 3 }, /turf/open/floor/mineral/plastitanium, /area/ship/security) "yO" = ( -/obj/structure/closet/wall{ - dir = 4; - pixel_x = -28; - name = "uniform closet" +/obj/machinery/door/airlock/grunge, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/clothing/under/syndicate/aclfgrunt, -/obj/item/clothing/under/syndicate/aclfgrunt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate/skirt, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/under/syndicate, -/obj/item/storage/backpack/duffelbag/syndie, -/obj/item/storage/backpack/duffelbag/syndie, -/obj/item/storage/backpack, -/obj/item/storage/backpack, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satchel, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/turf/open/floor/plasteel/tech/grid, +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/crew/cryo) "yP" = ( -/obj/item/soap/syndie, -/obj/structure/curtain, -/obj/machinery/shower{ - pixel_y = 19 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/techfloor/hole, -/obj/effect/turf_decal/techfloor/hole/right, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "yX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -4117,6 +4253,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "zc" = ( @@ -4141,32 +4280,22 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "zi" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "zk" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/warning, -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 25 +/obj/machinery/door/airlock/external{ + req_access = list(150) }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "zp" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 }, @@ -4177,49 +4306,59 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "zr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "zs" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 1 + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/button/door{ - dir = 4; - pixel_x = -25; - name = "Engine Shutters"; - id = "twinkle_engines" +/obj/effect/turf_decal/corner_techfloor_grid/full, +/obj/effect/turf_decal/techfloor/orange/corner{ + dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "zy" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 4 + }, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "zG" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 1 }, /obj/machinery/light/directional/north, -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/syndie/surgery{ - pixel_y = 4; - pixel_x = -6 - }, -/obj/item/reagent_containers/medigel/sterilizine{ - pixel_x = 9; - pixel_y = 1 - }, +/obj/structure/table/optable, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "zH" = ( @@ -4245,6 +4384,9 @@ dir = 8 }, /obj/effect/decal/cleanable/oil/streak, +/obj/structure/fluff/broken_flooring{ + icon_state = "plating" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "zK" = ( @@ -4256,35 +4398,18 @@ /area/ship/engineering) "zO" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 - }, -/obj/structure/closet/firecloset/wall{ - dir = 1; - pixel_y = -28 + dir = 5 }, +/obj/structure/closet/emcloset/anchored, +/obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"zP" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/area/ship/hallway/starboard) +"zQ" = ( +/obj/effect/turf_decal/industrial/warning{ dir = 10 }, -/obj/structure/sign/poster/official/moth{ - pixel_x = 32 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) -"zQ" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/structure/cable/yellow{ + icon_state = "1-8" }, /obj/structure/cable/yellow{ icon_state = "1-5" @@ -4305,18 +4430,31 @@ }, /area/ship/medical) "zZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/effect/turf_decal/corner/opaque/orange/three_quarters{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/item/clothing/under/syndicate/gec, +/obj/item/clothing/shoes/magboots/syndie, +/obj/item/clothing/head/helmet/space/syndicate/black/engie, +/obj/item/clothing/suit/space/syndicate/black/engie, +/obj/structure/closet/secure_closet/engineering_personal{ + req_access = list(150,10); + populate = 0 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/item/pipe_dispenser, +/obj/structure/sign/poster/contraband/gec{ + pixel_y = -32 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/item/storage/belt/utility/syndicate, +/obj/item/clothing/under/syndicate/gec, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/head/hardhat/red{ + name = "hard hat" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "Af" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ dir = 8 @@ -4363,6 +4501,11 @@ /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 4 }, +/obj/item/radio/intercom/wideband/table{ + dir = 4; + pixel_x = 6; + pixel_y = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Ap" = ( @@ -4372,20 +4515,34 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "Aq" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 9 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "At" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "Ax" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -4402,8 +4559,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "Ay" = ( /obj/effect/turf_decal/corner/opaque/orange{ dir = 10 @@ -4418,26 +4578,31 @@ /turf/open/floor/engine/n2, /area/ship/engineering/atmospherics) "AK" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "AL" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/door/airlock/engineering/glass/critical{ - name = "Supermatter"; - req_access = list(150,10); - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/open/floor/engine, -/area/ship/engineering/engine) -"AQ" = ( -/obj/structure/chair{ - dir = 4 +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, +/turf/open/floor/plating, +/area/ship/hallway/port) +"AQ" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, @@ -4447,6 +4612,9 @@ /obj/machinery/camera/autoname{ dir = 5 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "AW" = ( @@ -4456,42 +4624,90 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "Bc" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) +"Bi" = ( +/obj/effect/turf_decal/syndicateemblem/middle/middle{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "Bj" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 }, /area/ship/security) -"Bq" = ( -/obj/structure/chair/stool/bar{ - dir = 1 +"Bn" = ( +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "operative's locker" }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 5 +/obj/item/clothing/suit/armor/vest/syndie, +/obj/item/clothing/head/helmet/operator, +/obj/item/gun/ballistic/automatic/pistol/no_mag, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/storage/belt/security/webbing{ + name = "syndicate webbing"; + desc = "Unique and versatile chest rig, can hold syndicate gear." + }, +/obj/item/radio/headset/syndicate/alt{ + keyslot = null }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/gloves/color/black, +/obj/machinery/light/directional/east, +/obj/item/clothing/head/beret/black, +/obj/item/flashlight/seclite, +/obj/item/kitchen/knife/combat, +/turf/open/floor/mineral/plastitanium, +/area/ship/security) +"Bq" = ( +/obj/structure/rack, /obj/machinery/camera/autoname{ - dir = 8 + dir = 6 }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 8 +/obj/item/ammo_box/magazine/sniper_rounds{ + pixel_x = 9; + pixel_y = 4 }, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/obj/item/ammo_box/magazine/sniper_rounds{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/item/gun/ballistic/automatic/sniper_rifle/syndicate{ + spawnwithmagazine = 0; + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) "Bs" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/grunge, +/turf/open/floor/pod/dark, +/area/ship/cargo) "Bw" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 @@ -4514,49 +4730,40 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "BG" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"BK" = ( +/obj/structure/bed, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) +"BL" = ( /obj/structure/sign/poster/contraband/c20r{ pixel_y = 32 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 - }, -/obj/structure/rack, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) -"BK" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) -"BL" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 + icon_state = "4-8" }, -/obj/machinery/camera/autoname{ - dir = 6 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, /area/ship/security) "BM" = ( /obj/machinery/atmospherics/pipe/manifold/green/visible{ @@ -4578,14 +4785,29 @@ dir = 4; pixel_x = -28 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "BS" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{ dir = 4 }, /turf/open/floor/engine/plasma, /area/ship/engineering/atmospherics) +"BT" = ( +/obj/structure/sign/directions/security{ + pixel_y = -4 + }, +/obj/structure/sign/directions/engineering{ + pixel_y = 5; + dir = 8 + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 + }, +/area/ship/crew/office) "BU" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 @@ -4618,8 +4840,12 @@ /area/ship/engineering/engine) "Cj" = ( /obj/structure/table/wood, -/obj/item/paper_bin/carbon, -/obj/item/pen/edagger, +/obj/item/paper_bin/carbon{ + pixel_x = -8 + }, +/obj/item/pen/edagger{ + pixel_x = -9 + }, /obj/item/storage/secure/safe/intel{ pixel_x = -32; dir = 8 @@ -4628,6 +4854,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/item/paper{ + pixel_x = 6; + pixel_y = 5; + name = "README - notice to the captain"; + default_raw_text = "

Dear Admiral,

Congratulations on being chosen to lead one of our top-of-the-line Twinkleshine Battle Cruisers. Your leadership and efforts have been hereby noted, and your name will share space with the titles of many other great Syndicate officers.

This vessel is staffed with workers from every branch of the Syndicate. Please take the time to familiarize yourself with the ship's features and crew, and make sure to maintain positive relationships with your crew.



check under your bed"; + desc = "This sheet of paper looks old and dusty."; + color = "#3f010d" + }, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "Cl" = ( @@ -4642,18 +4876,35 @@ }, /turf/open/floor/circuit/red, /area/ship/engineering/communications) -"Cw" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/cable{ +"Cq" = ( +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/camera/autoname{ - dir = 6 +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/ship/hallway/starboard) +"Cw" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/camera/autoname{ + dir = 6 }, /turf/open/floor/engine, /area/ship/engineering/engine) @@ -4683,11 +4934,10 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "CJ" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 9 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/steeldecal/steel_decals_central4, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/dorm) "CQ" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium, @@ -4707,8 +4957,7 @@ dir = 8 }, /obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/machinery/door/airlock/hatch{ - name = "Briefing"; +/obj/machinery/door/airlock/grunge{ dir = 4 }, /turf/open/floor/plasteel/tech, @@ -4733,14 +4982,12 @@ /area/ship/medical) "CU" = ( /obj/machinery/light/directional/south, -/obj/structure/chair{ - dir = 1 +/obj/item/chair{ + pixel_x = -12; + pixel_y = -4 }, /obj/effect/turf_decal/techfloor, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plating, /area/ship/bridge) "CV" = ( /obj/effect/turf_decal/industrial/warning{ @@ -4766,48 +5013,39 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "De" = ( -/obj/structure/table, -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/item/storage/box/medipens{ - pixel_y = 7; - pixel_x = -4 +/obj/effect/turf_decal/corner/opaque/orange{ + dir = 10 }, -/obj/item/storage/firstaid/tactical{ - pixel_y = 4; - pixel_x = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/item/clothing/glasses/hud/health/night, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel/dark, -/area/ship/medical) +/area/ship/engineering) "Dh" = ( -/obj/machinery/smartfridge/bloodbank/preloaded{ - pixel_y = 32; - density = 0 - }, /obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/structure/closet/wall/white/med{ - name = "medical locker"; - dir = 8; - pixel_x = 28 - }, -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/clothing/glasses/hud/health/night, -/obj/item/clothing/glasses/hud/health/night, -/obj/item/clothing/suit/longcoat/roboblack{ - name = "syndicate medic's black longcoat" +/obj/structure/closet/secure_closet/medical3{ + req_access = list(150, 5); + icon_state = "tac"; + populate = 0 }, +/obj/machinery/light/directional/north, +/obj/item/clothing/under/rank/medical/doctor/red, /obj/item/clothing/suit/longcoat/roboblack{ name = "syndicate medic's black longcoat" }, -/obj/item/clothing/under/rank/medical/doctor/red, -/obj/item/clothing/under/rank/medical/doctor/red, -/obj/item/clothing/under/syndicate/cybersun, -/obj/item/clothing/under/syndicate/cybersun, -/obj/item/storage/belt/medical/webbing, -/obj/item/storage/belt/medical/webbing, -/obj/item/storage/belt/medical, +/obj/item/clothing/under/syndicate/medic/skirt, +/obj/item/clothing/under/syndicate/medic, +/obj/item/clothing/head/helmet/medical, +/obj/item/clothing/suit/armor/vest/marine/trauma, +/obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked, /obj/item/storage/belt/medical, +/obj/item/storage/belt/medical/webbing, +/obj/item/clothing/gloves/color/latex/nitrile/evil, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/radio/headset/syndicate{ + keyslot = null + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "Dk" = ( @@ -4841,53 +5079,62 @@ dir = 8 }, /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; req_one_access_txt = "150"; dir = 4 }, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "Dp" = ( -/obj/machinery/door/airlock/hatch{ - name = "Lieutenant's Office"; - req_access = list(3,150) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/mineral/plastitanium, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/light_switch{ + pixel_y = 22; + pixel_x = -12 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ship/security) "Dt" = ( /obj/machinery/air_sensor/atmos/air_tank, /turf/open/floor/engine/air, /area/ship/engineering/atmospherics) "Dx" = ( -/obj/structure/chair{ - dir = 8 - }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) +"DB" = ( +/obj/effect/turf_decal/steeldecal/steel_decals8, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "DF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/sign/poster/official/moth/piping{ - desc = "This informational poster uses Safety Moth(TM) to tell atmospheric technicians correct types of piping to be used. Proper pipe placement prevents poor performance! It's signed by 'AspEv'."; - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; - req_one_access_txt = "150"; - req_access = list(150,10) - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/turf/open/floor/plasteel, +/area/ship/crew/dorm) "DK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -4923,26 +5170,30 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "DW" = ( -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "Ed" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 5 +/obj/structure/toilet{ + dir = 4 }, -/obj/machinery/airalarm/directional/north, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/structure/sink{ + dir = 8; + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/dorm) "Ee" = ( /obj/structure/sign/syndicate, /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -4950,10 +5201,12 @@ }, /area/ship/crew/office) "Eh" = ( -/obj/structure/chair{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-5" + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 }, -/turf/open/floor/mineral/plastitanium, /area/ship/security) "Ei" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -4963,8 +5216,11 @@ dir = 4; pixel_x = -28 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "En" = ( /obj/effect/turf_decal/industrial/warning, /turf/open/floor/engine, @@ -4975,6 +5231,12 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) +"Eq" = ( +/obj/structure/sign/directions/security, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 + }, +/area/ship/crew/office) "Et" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -4992,19 +5254,12 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ey" = ( -/obj/structure/rack, -/obj/item/storage/box/handcuffs{ - pixel_y = 9; - pixel_x = -8 - }, -/obj/item/storage/box/flashes{ - pixel_x = 8; - pixel_y = 7 +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 8 }, -/obj/item/storage/box/evidence{ - pixel_x = -2 +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 }, -/turf/open/floor/mineral/plastitanium, /area/ship/security) "ED" = ( /obj/effect/turf_decal/corner/opaque/orange{ @@ -5025,25 +5280,8 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "EG" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ - dir = 1 - }, -/obj/machinery/button/flasher{ - pixel_x = 23; - dir = 8; - pixel_y = 6; - id = "twinkle_flash1" - }, -/obj/machinery/button/flasher{ - pixel_x = 23; - dir = 8; - pixel_y = -7; - id = "twinkle_flash2" - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/turf/open/floor/plasteel/dark, /area/ship/security) "EH" = ( /obj/item/trash/chips, @@ -5051,14 +5289,10 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "EJ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/corner/opaque/syndiered/border{ dir = 4 }, /turf/open/floor/mineral/plastitanium, @@ -5074,11 +5308,10 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "EQ" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod/dark, /area/ship/cargo) "ER" = ( @@ -5086,12 +5319,6 @@ /turf/open/floor/engine/n2, /area/ship/engineering/atmospherics) "ET" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 2 - }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "EU" = ( @@ -5100,32 +5327,38 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "EX" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 8 }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = 0 +/obj/effect/turf_decal/steeldecal/steel_decals_central6{ + dir = 4 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "Fa" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 8 - }, /obj/machinery/light/directional/west, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/obj/structure/cable/yellow{ + icon_state = "1-6" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/chair/stool/bar{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /area/ship/crew/canteen) "Fc" = ( /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 1 }, -/obj/structure/rack, +/obj/structure/fluff/broken_flooring{ + icon_state = "plating"; + dir = 4 + }, +/obj/item/stack/ore/salvage/scrapplasma{ + pixel_x = 3; + pixel_y = 2 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Fh" = ( @@ -5169,6 +5402,13 @@ dir = 1 }, /obj/structure/rack, +/obj/item/storage/bag/trash{ + pixel_x = -6 + }, +/obj/item/storage/bag/trash{ + pixel_y = 3; + pixel_x = 6 + }, /obj/item/soap/syndie{ pixel_y = -3; pixel_x = -2 @@ -5177,22 +5417,24 @@ pixel_y = -6; pixel_x = 2 }, -/obj/item/storage/bag/trash{ - pixel_x = -6 - }, -/obj/item/storage/bag/trash, /turf/open/floor/wood/walnut, /area/ship/crew/janitor) "Fl" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/firecloset/wall{ - pixel_y = 28 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/camera/autoname{ + dir = 10 + }, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "Fm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -5220,18 +5462,29 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Fr" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/rack, +/obj/item/storage/toolbox/ammo/c10mm{ + pixel_x = -5; + pixel_y = 10; + name = "ammo can (10mm)" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/item/storage/toolbox/ammo/a308{ + pixel_x = 6; + pixel_y = 6; + name = "ammo can (.308)" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/item/storage/toolbox/ammo/c45{ + pixel_x = -4; + pixel_y = 2; + name = "ammo can (.45)" }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/item/storage/toolbox/ammo/shotgun{ + pixel_x = 4; + pixel_y = -2; + name = "ammo can (Buckshot)" + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) "Fs" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -5239,17 +5492,18 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/structure/sign/poster/contraband/space_cola{ - pixel_y = 32 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "Ft" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -5257,13 +5511,23 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Fu" = ( -/obj/item/kirbyplants/random, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 6 +/obj/structure/sign/poster/contraband/bulldog{ + pixel_y = 32 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "FE" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/surgery{ @@ -5275,27 +5539,38 @@ pixel_x = 6 }, /obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/item/storage/backpack/duffelbag/syndie/surgery{ + pixel_x = 3 + }, +/obj/item/reagent_containers/medigel/sterilizine{ + pixel_x = -11; + pixel_y = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "FI" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/smartfridge/bloodbank/preloaded, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 }, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/area/ship/medical/surgery) "FR" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 }, /area/ship/engineering/atmospherics) "FS" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/syndicateemblem/top/left{ + dir = 8 }, -/obj/effect/turf_decal/corner/opaque/syndiered, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/middle/left, +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "FV" = ( /obj/machinery/door/poddoor{ @@ -5310,6 +5585,7 @@ /obj/machinery/chem_dispenser, /obj/machinery/light/directional/south, /obj/effect/turf_decal/corner/opaque/orange/full, +/obj/effect/turf_decal/steeldecal/steel_decals_central1, /turf/open/floor/plasteel/dark, /area/ship/medical) "Gg" = ( @@ -5323,44 +5599,61 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Gj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) -"Gk" = ( -/obj/item/clothing/gloves/krav_maga/combatglovesplus, -/obj/item/ammo_box/magazine/m10mm/ap, -/obj/item/ammo_box/magazine/m10mm/ap, -/obj/item/clothing/head/HoS/beret/syndicate, -/obj/item/radio/headset/syndicate/alt/leader, -/obj/item/gun/ballistic/automatic/pistol/no_mag, -/obj/item/megaphone/sec, -/obj/item/clothing/under/syndicate/combat, -/obj/machinery/light/directional/north, -/obj/item/clothing/shoes/combat, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, -/obj/item/clothing/head/caphat/gorlexcap, -/obj/item/clothing/suit/gorlex, -/obj/item/clothing/under/syndicate/officer, -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "syndicate"; - name = "lieutenant locker"; - req_access = list(3,150) +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) +"Gk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 0 }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "Gm" = ( -/obj/structure/closet/crate/bin, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/structure/rack, +/obj/item/gun/ballistic/automatic/ebr{ + pixel_x = -16; + pixel_y = 7; + spawnwithmagazine = 0 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/item/gun/ballistic/automatic/ebr{ + pixel_x = -9; + pixel_y = 2; + spawnwithmagazine = 0 + }, +/obj/item/ammo_box/magazine/ebr{ + pixel_x = 10; + pixel_y = -1 + }, +/obj/item/ammo_box/magazine/ebr{ + pixel_x = 4 + }, +/obj/item/ammo_box/magazine/ebr{ + pixel_y = -3; + pixel_x = 7 + }, +/obj/item/ammo_box/magazine/ebr{ + pixel_y = -2 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) "Gn" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1; @@ -5370,15 +5663,18 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) "Go" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/machinery/camera/autoname{ dir = 5 }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/mineral/ore_redemption{ + dir = 4 + }, /turf/open/floor/pod/dark, /area/ship/cargo) "Gq" = ( @@ -5415,33 +5711,47 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Gx" = ( -/obj/item/trash/sosjerky, -/turf/open/floor/plating, +/obj/machinery/light/directional/east, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Gy" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"GC" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/cable/yellow{ - icon_state = "1-8" + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, /turf/open/floor/plating, +/area/ship/hallway/starboard) +"GC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "GD" = ( -/obj/structure/rack, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/turf/open/floor/mineral/plastitanium/red, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, /area/ship/security) "GE" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -5458,29 +5768,22 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "GG" = ( -/obj/item/kirbyplants/random, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, /obj/structure/sign/poster/contraband/aclf{ pixel_y = -32 }, +/obj/machinery/photocopier{ + pixel_x = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "GH" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/machinery/vending/cigarette/syndicate, +/turf/open/floor/plasteel, +/area/ship/crew/dorm) "GM" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -5488,31 +5791,25 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/sign/poster/contraband/space_up{ + pixel_y = -32 }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "GN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{ - dir = 1 +/obj/structure/closet/emcloset/wall{ + dir = 4; + pixel_x = -28 }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, +/obj/effect/turf_decal/trimline/opaque/syndiered/warning, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) "GO" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -5528,6 +5825,21 @@ }, /turf/open/floor/engine, /area/ship/engineering/engine) +"GP" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/item/circuitboard/machine/autolathe, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stack/sheet/glass, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/pod/dark, +/area/ship/cargo) "GU" = ( /obj/effect/turf_decal/rechargefloor, /obj/effect/turf_decal/techfloor{ @@ -5539,34 +5851,18 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "GW" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/port) "GZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /obj/effect/turf_decal/trimline/opaque/syndiered/line, -/obj/structure/closet/crate/freezer, -/obj/item/bodypart/chest/robot, -/obj/item/bodypart/leg/right/robot, -/obj/item/bodypart/r_arm/robot, -/obj/item/bodypart/leg/left/robot, -/obj/item/bodypart/l_arm/robot, -/obj/item/organ/ears/cat, -/obj/item/organ/tail/cat, -/obj/item/organ/liver/cybernetic/tier2, -/obj/item/organ/lungs/cybernetic/tier2, -/obj/item/organ/heart/cybernetic/tier2, -/obj/item/organ/ears/cybernetic, +/obj/structure/closet/crate/freezer/surplus_limbs/organs, /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "Hd" = ( @@ -5580,16 +5876,11 @@ /turf/open/floor/plating, /area/ship/external/dark) "He" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 +/obj/machinery/door/airlock/external{ + req_access = list(150) }, -/obj/machinery/light/small/directional/west, /turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) +/area/ship/hallway/port) "Hj" = ( /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -5598,16 +5889,20 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Hk" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 8 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/open/floor/plating, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "Ht" = ( /obj/machinery/telecomms/receiver/preset_right{ @@ -5617,18 +5912,27 @@ /turf/open/floor/circuit/red, /area/ship/engineering/communications) "Hu" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) +"Hx" = ( +/obj/machinery/light/directional/west, +/obj/structure/table/reinforced, +/obj/item/binoculars, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "HF" = ( /obj/structure/table, /obj/item/wrench/medical{ @@ -5639,88 +5943,32 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "HG" = ( -/obj/machinery/light/directional/north, -/obj/structure/closet/crate/bin, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ +/obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, +/turf/open/floor/plasteel/dark, /area/ship/security) "HH" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 4 - }, -/obj/structure/table, -/obj/item/clothing/head/warden/drill{ - name = "lieutenant's campaign hat"; - desc = "A special armored campaign hat with the Syndicate insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."; - pixel_x = 2; - pixel_y = -7 - }, -/obj/item/reagent_containers/food/snacks/donut/choco{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/coffee{ - pixel_x = -7; - pixel_y = 6 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "HI" = ( /obj/structure/chair/office{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "HL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) -"HQ" = ( -/obj/structure/chair{ +/obj/effect/turf_decal/syndicateemblem/middle/middle, +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4 }, -/obj/item/canvas/twentythreeXtwentythree{ - name = "Battleplan Board"; - desc = "Remember, no plan survives the battle."; - pixel_x = -25; - pixel_y = 5 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/crew/office) -"HY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/obj/machinery/camera/autoname{ - dir = 6 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "Ib" = ( /obj/machinery/door/window/eastright{ dir = 8; @@ -5740,6 +5988,7 @@ icon_state = "1-2" }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/light/directional/west, /turf/open/floor/plating, /area/ship/hallway/central) "Ie" = ( @@ -5756,6 +6005,17 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/machinery/camera/autoname{ + dir = 9 + }, +/obj/machinery/light_switch{ + pixel_y = 11; + dir = 8; + pixel_x = 20 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Ig" = ( @@ -5777,22 +6037,14 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ii" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/closet/secure_closet/freezer/kitchen/wall{ - dir = 4; - pixel_x = -28; - req_access = null +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/storage/box/ingredients/vegetarian, -/obj/item/storage/box/ingredients/carnivore, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/storage/fancy/egg_box, -/obj/item/storage/fancy/egg_box, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, /area/ship/crew/canteen) "Il" = ( /obj/effect/turf_decal/techfloor, @@ -5822,29 +6074,40 @@ icon_state = "0-8" }, /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 10; + pixel_y = -20 + }, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "IB" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) -"IC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/door/airlock/hatch{ - name = "Security" +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/port) +"IC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/plating, +/area/ship/hallway/port) "ID" = ( /obj/effect/turf_decal/siding/wood/end{ dir = 1 @@ -5877,6 +6140,7 @@ /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 8 }, +/obj/machinery/holopad/emergency/medical, /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "IN" = ( @@ -5884,10 +6148,7 @@ dir = 1 }, /obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "IT" = ( @@ -5912,11 +6173,20 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) "IV" = ( -/obj/machinery/door/airlock/external{ - req_access = list(150) +/obj/structure/closet/emcloset/wall{ + dir = 4; + pixel_x = -28 + }, +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, +/obj/item/clothing/suit/space/syndicate, +/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "Jf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -5952,29 +6222,17 @@ "Jr" = ( /obj/effect/decal/cleanable/plasma, /obj/effect/decal/cleanable/vomit/old{ - pixel_y = -6; - pixel_x = -6 + pixel_y = 22; + pixel_x = 12 }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"Jw" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Jy" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line{ @@ -5983,28 +6241,19 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "Jz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/sign/warning/radiation{ - pixel_y = 32 - }, -/obj/effect/turf_decal/trimline/opaque/orange/filled/warning, -/obj/effect/turf_decal/trimline/opaque/orange/filled/warning{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/door/airlock/external{ - req_access = list(150,10); - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/engine, -/area/ship/engineering/engine) +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/ship/hallway/port) "JA" = ( /obj/effect/turf_decal/industrial/warning/corner, /obj/structure/cable{ @@ -6070,46 +6319,39 @@ /turf/template_noop, /area/template_noop) "JY" = ( -/obj/structure/bed, -/obj/structure/sign/poster/official/no_erp{ - pixel_x = 32 - }, -/obj/item/storage/box/syndie_kit/sleepytime, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/item/bedsheet/black, -/turf/open/floor/carpet/nanoweave/red, -/area/ship/crew/dorm) +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "Ke" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Kg" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/light/directional/north, +/obj/machinery/vending/cola/random, +/obj/effect/turf_decal/borderfloorblack/corner{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "Kk" = ( /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 @@ -6144,23 +6386,14 @@ "Ks" = ( /obj/machinery/chem_master, /obj/effect/turf_decal/corner/opaque/orange/full, +/obj/effect/turf_decal/steeldecal/steel_decals_central1, /turf/open/floor/plasteel/dark, /area/ship/medical) "Ku" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Kw" = ( /obj/machinery/door/poddoor{ @@ -6171,22 +6404,19 @@ /turf/open/floor/plating, /area/ship/bridge) "Kx" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/machinery/door/window/eastleft, -/turf/open/floor/plasteel, +/obj/structure/table/wood, +/obj/machinery/jukebox/boombox{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "Ky" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/machinery/camera/autoname{ + dir = 8 }, -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /area/ship/crew/canteen) "Kz" = ( /obj/structure/cable/yellow{ @@ -6207,35 +6437,19 @@ /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "KA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/industrial/warning, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/machinery/door/airlock/hatch{ - name = "Cargo Bay" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/port) "KB" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 6 - }, -/obj/machinery/computer/camera_advanced{ - dir = 4; - icon_state = "computer-right"; - icon_keyboard = "syndie_key" - }, -/obj/effect/turf_decal/corner/opaque/syndiered/half{ - dir = 8 +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/turf/open/floor/plasteel/dark, +/area/ship/security) "KD" = ( /obj/structure/table, /obj/machinery/button/massdriver{ @@ -6267,74 +6481,76 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "KF" = ( -/obj/structure/table/wood/reinforced, -/obj/item/disk/nuclear/fake/obvious{ - pixel_y = 5; - pixel_x = 6 - }, -/obj/item/book/manual/nuclear{ - pixel_x = -8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/turf/open/floor/carpet/red, +/turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "KI" = ( /obj/structure/table/optable, /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 1 }, +/obj/machinery/camera/autoname{ + dir = 6 + }, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "KJ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/door/airlock/grunge, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/security) "KK" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 4 +/obj/machinery/cryopod/syndicate{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/techfloor{ + dir = 5 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) "KM" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "KQ" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/airlock/hatch{ - name = "Cargo Bay" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/port) "KU" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "La" = ( /obj/structure/chair/stool{ @@ -6348,27 +6564,25 @@ /area/ship/bridge) "Lp" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Laser Room"; req_access = list(150,10); dir = 4 }, /turf/open/floor/engine, /area/ship/engineering/engine) "Ls" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/item/canvas/twentythreeXtwentythree{ - name = "Battleplan Board"; - desc = "Remember, no plan survives the battle."; - pixel_x = -25; - pixel_y = -1 - }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) +"Lw" = ( +/obj/item/clothing/suit/space/hardsuit/security/suns, +/obj/machinery/suit_storage_unit/inherit, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "LF" = ( /obj/effect/turf_decal/atmos/air{ dir = 8 @@ -6376,18 +6590,70 @@ /turf/open/floor/engine/air, /area/ship/engineering/atmospherics) "LG" = ( -/obj/machinery/door/airlock/hatch{ - name = "Restroom" +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/structure/closet{ + icon_state = "syndicate" }, +/obj/item/clothing/suit/jacket/letterman_syndie, +/obj/item/clothing/suit/jacket/letterman_syndie, +/obj/item/clothing/suit/hooded/hoodie/red, +/obj/item/clothing/suit/hooded/hoodie/red, +/obj/item/clothing/under/syndicate, +/obj/item/clothing/under/syndicate, +/obj/item/clothing/under/syndicate/skirt, +/obj/item/clothing/under/syndicate/skirt, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/head/soft/black, +/obj/item/clothing/head/soft/black, +/obj/item/clothing/head/soft/black, +/obj/item/clothing/head/soft/black, /turf/open/floor/plasteel, /area/ship/crew/dorm) "LH" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/structure/closet/cardboard{ + name = "mot containment box"; + desc = "WARNING: Contains mot." }, -/turf/open/floor/plating, +/obj/item/storage/box/syndimaid, +/obj/item/trash/cheesie, +/mob/living/carbon/human/species/moth{ + name = "Secret Box Moth"; + real_name = "Box Moth"; + gender = "female"; + faction = list("neutral","playerSyndicate") + }, +/obj/item/reagent_containers/food/snacks/spacetwinkie{ + pixel_y = 12; + pixel_x = 10 + }, +/obj/item/reagent_containers/food/snacks/spacetwinkie{ + pixel_x = -9; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/snacks/spacetwinkie{ + pixel_x = 7 + }, +/obj/item/reagent_containers/food/snacks/spacetwinkie{ + pixel_x = -2; + pixel_y = 14 + }, +/obj/item/reagent_containers/food/snacks/spacetwinkie{ + pixel_y = -5; + pixel_x = -6 + }, +/obj/structure/sign/poster/contraband/syndiemoth{ + pixel_x = -32; + desc = "A Syndicate-commissioned poster that uses Syndie Moth(TM?) to tell the viewer to keep the nuclear authentication disk unsecured. It's signed by 'AspEv'." + }, +/obj/item/toy/balloon/syndicate, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "LX" = ( /obj/machinery/power/shuttle/engine/electric{ @@ -6423,19 +6689,8 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "Mo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Mq" = ( /obj/effect/turf_decal/industrial/warning, @@ -6472,6 +6727,10 @@ pixel_x = 9 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/fluff/paper/stack{ + pixel_x = -7; + pixel_y = -15 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "MA" = ( @@ -6479,14 +6738,14 @@ name = "captain's suit storage unit"; suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/elite }, -/obj/structure/sign/poster/contraband/have_a_puff{ - pixel_x = -32 - }, /obj/machinery/light_switch{ dir = 1; pixel_x = 10; pixel_y = -20 }, +/obj/structure/sign/poster/contraband/have_a_puff{ + pixel_x = -32 + }, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) "MC" = ( @@ -6496,7 +6755,10 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "MK" = ( -/turf/open/floor/mineral/plastitanium, +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(150, 58) + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/security) "ML" = ( /obj/machinery/door/poddoor{ @@ -6522,16 +6784,17 @@ /turf/open/floor/circuit/red, /area/ship/engineering/communications) "MZ" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; - req_one_access_txt = "150"; - req_access = list(150,10); +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/terminal{ dir = 8 }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "0-4" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 10 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "Na" = ( /obj/effect/turf_decal/industrial/warning, @@ -6551,89 +6814,53 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Nh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + icon_state = "1-2" }, -/obj/structure/closet/secure_closet/armory1{ - populate = 0; - icon_state = "syndicate" +/obj/item/kirbyplants{ + icon_state = "plant-21"; + pixel_x = 8 }, -/obj/item/clothing/head/helmet/swat, -/obj/item/clothing/head/helmet/swat, -/obj/item/clothing/head/helmet/swat, -/obj/item/clothing/suit/armor/vest/bulletproof, -/obj/item/clothing/suit/armor/vest/bulletproof, -/obj/item/clothing/suit/armor/vest/bulletproof, -/obj/machinery/light_switch{ - pixel_y = 22; - pixel_x = -12 +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/turf/open/floor/plating, +/area/ship/hallway/aft) "Nj" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/window/brigdoor/southleft{ - dir = 8; - req_access = list(3,150) +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, /area/ship/security) "No" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/machinery/holopad/emergency, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/firealarm/directional/south, +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/fancy{ + name = "blood-red curtains" }, -/turf/open/floor/plasteel, +/turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm) "Nr" = ( /obj/effect/turf_decal/corner/transparent/bar/diagonal, /turf/open/floor/plasteel, /area/ship/crew/dorm) "NC" = ( -/obj/item/kirbyplants/random, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 }, +/obj/structure/filingcabinet/double, /turf/open/floor/plasteel/tech, /area/ship/crew/office) "NE" = ( -/obj/structure/sign/poster/contraband/bulldog{ - pixel_y = 32 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) -"NF" = ( -/obj/structure/closet/emcloset/wall{ - dir = 4; - pixel_x = -28 +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 }, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/effect/turf_decal/trimline/opaque/syndiered/warning, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "NI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -6767,7 +6994,6 @@ /area/ship/engineering/engine) "Oz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) @@ -6781,11 +7007,19 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "OK" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 6 +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 1 + }, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "ON" = ( /obj/structure/cable/yellow{ @@ -6811,67 +7045,63 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "OS" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/terminal{ + dir = 8 }, -/obj/item/trash/pistachios, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) -"OY" = ( -/obj/structure/closet/secure_closet/brig/wall{ - pixel_y = 28; - req_access = list(3,150) - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 - }, -/obj/machinery/camera/autoname{ +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/techfloor/orange{ dir = 8 }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/atmospherics) +"OY" = ( +/obj/structure/bed, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "OZ" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/obj/machinery/button/door{ + dir = 4; + pixel_x = -25; + name = "Engine Shutters"; + id = "twinkle_engines" + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "Pa" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 6 - }, -/obj/machinery/computer/secure_data/laptop{ - dir = 8; - pixel_y = 6; - pixel_x = 2 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/grunge, /turf/open/floor/mineral/plastitanium/red, /area/ship/security) "Pb" = ( -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/camera/autoname{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) @@ -6889,11 +7119,18 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Pe" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "Pn" = ( /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/trimline/opaque/syndiered/warning, @@ -6915,15 +7152,18 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Pv" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ - dir = 1 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 }, -/obj/structure/table/optable, -/obj/machinery/camera/autoname{ - dir = 6 +/obj/effect/turf_decal/steeldecal/steel_decals_central7, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/turf/open/floor/plasteel/white, -/area/ship/medical/surgery) +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "Pz" = ( /obj/structure/sign/syndicate, /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -6931,18 +7171,16 @@ }, /area/ship/engineering/atmospherics) "PA" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/effect/turf_decal/syndicateemblem/middle/middle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "PB" = ( /obj/machinery/door/airlock/hatch{ - name = "Mech Launcher #1"; req_access = list(150); dir = 4 }, @@ -6952,14 +7190,26 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "PE" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 1 +/obj/machinery/power/terminal{ + dir = 8 }, -/obj/item/trash/candy, -/turf/open/floor/plating, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 10 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "PL" = ( /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -6981,8 +7231,12 @@ /turf/open/floor/wood/walnut, /area/ship/crew/janitor) "PN" = ( -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "PQ" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 @@ -6993,9 +7247,6 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "PY" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Dorms" - }, /obj/effect/turf_decal/corner/transparent/bar{ dir = 5 }, @@ -7008,11 +7259,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel, /area/ship/crew/dorm) "Qa" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, +/obj/structure/table/wood, +/turf/open/floor/wood, /area/ship/crew/canteen) "Qd" = ( /obj/effect/turf_decal/corner/opaque/orange{ @@ -7052,13 +7304,18 @@ /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "Qk" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/light/directional/north, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "Ql" = ( /obj/effect/turf_decal/corner/transparent/bar/diagonal, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -7091,46 +7348,53 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/janitor) "Qt" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 +/obj/structure/closet/secure_closet/warden{ + name = "redshield's locker"; + populate = 0 }, +/obj/item/clothing/shoes/combat/suns, +/obj/item/clothing/shoes/laceup/suns, +/obj/item/clothing/glasses/hud/security/suns, +/obj/item/clothing/gloves/tackler/dolphin/suns, +/obj/item/clothing/suit/toggle/suns/pkcoat, +/obj/item/clothing/suit/armor/vest/bulletproof/suns/hos, +/obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos, +/obj/item/clothing/head/welding/suns/hos, +/obj/item/clothing/under/syndicate/suns/pkuniform, +/obj/item/radio/headset/syndicate/alt{ + keyslot = null + }, +/obj/item/gun/ballistic/automatic/powered/gauss/modelh, +/obj/item/storage/belt/sabre/solgov, +/obj/item/ammo_box/magazine/modelh, +/obj/item/ammo_box/magazine/modelh, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Qv" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/sign/poster/official/moth{ + pixel_x = 32 }, /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 + icon_state = "2-8" }, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood, /area/ship/crew/canteen) -"Qx" = ( -/obj/structure/closet/secure_closet/brig/wall{ - pixel_y = 28; - req_access = list(3,150) +"QC" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 10 +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 23 + }, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "QD" = ( /obj/machinery/door/window/eastright{ name = "Engine Access" @@ -7160,19 +7424,10 @@ /turf/open/floor/plating, /area/ship/bridge) "QR" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/structure/table/wood, -/obj/item/storage/photo_album/syndicate{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/camera{ - pixel_x = -2 - }, -/obj/machinery/light/directional/south, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/obj/structure/bed, +/obj/machinery/light/directional/east, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) "QT" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 10 @@ -7210,30 +7465,29 @@ /area/ship/engineering) "Rc" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Rd" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-8" }, -/obj/machinery/light_switch{ - pixel_y = -10; - dir = 8; - pixel_x = 20 +/obj/structure/closet/emcloset, +/obj/effect/spawner/lootdrop/maintenance/four, +/obj/item/reagent_containers/food/snacks/burger/red{ + name = "suspicious red burger"; + desc = "A suspicious looking burger."; + color = "#730622" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 1 + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Rh" = ( /obj/effect/turf_decal/industrial/warning{ @@ -7250,15 +7504,17 @@ "Rj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/light/directional/east, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "1-5" + icon_state = "2-8" }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/techfloor/orange{ + dir = 1 + }, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Ru" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -7267,16 +7523,39 @@ /obj/machinery/camera/autoname{ dir = 5 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/area/ship/hallway/aft) "Rv" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 4 +/obj/structure/rack, +/obj/item/gun/ballistic/shotgun/bulldog{ + pixel_x = -7; + pixel_y = 7; + spawnwithmagazine = 0 }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/item/gun/ballistic/shotgun/bulldog{ + pixel_y = -3; + pixel_x = 2; + spawnwithmagazine = 0 }, -/turf/open/floor/mineral/plastitanium/red, +/obj/machinery/light/directional/north, +/obj/item/ammo_box/magazine/m12g{ + pixel_x = -8; + pixel_y = -4 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_y = -7 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_y = -9; + pixel_x = -10 + }, +/obj/item/ammo_box/magazine/m12g{ + pixel_y = -12 + }, +/turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Ry" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -7300,15 +7579,23 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "RB" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/machinery/light/directional/north, -/obj/structure/table/reinforced, -/obj/item/kitchen/knife, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/machinery/camera/autoname{ + dir = 6 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "RE" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/machinery/light/directional/south, @@ -7339,39 +7626,32 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "RT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/shieldgen{ - anchored = 1; - req_access = list(150) - }, -/obj/effect/turf_decal/corner/opaque/syndiered/bordercee{ - dir = 8 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 +/obj/structure/table, +/obj/effect/turf_decal/corner/opaque/syndiered/full, +/obj/item/storage/box/medipens{ + pixel_y = 7; + pixel_x = -4 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/turf/open/floor/plasteel/dark, +/area/ship/medical) "RU" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/newscaster/directional/south, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "RW" = ( -/obj/machinery/door/airlock/external{ - req_access = list(150) - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/starboard) "Sa" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -7382,59 +7662,92 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Sb" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Sd" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 4 +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 23 + }, +/obj/effect/turf_decal/techfloor{ dir = 1 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/crew/cryo) +"Sd" = ( +/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ dir = 4 }, +/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Sg" = ( +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) +"Si" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 - }, /obj/machinery/light_switch{ dir = 4; pixel_x = -20; pixel_y = 12 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) -"Si" = ( -/obj/machinery/vending/security/marine/syndicate, +/obj/structure/rack, +/obj/item/clothing/suit/armor/riot/minutemen{ + desc = "Designed to protect against close range attacks. This one is painted black."; + pixel_y = 1; + pixel_x = 5 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = -8 + }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "Sj" = ( -/obj/machinery/vending/boozeomat/syndicate_access, -/obj/machinery/light/directional/north, -/turf/open/floor/wood, -/area/ship/crew/canteen) -"Sp" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/effect/turf_decal/corner/opaque/orange/full, -/obj/machinery/shieldgen{ - anchored = 1; - req_access = list(150) +/obj/machinery/door/airlock/grunge, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, /turf/open/floor/plasteel/dark, -/area/ship/engineering) -"Sr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/area/ship/crew/dorm) +"Sk" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 9 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"Sp" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/effect/turf_decal/corner/opaque/orange/full, +/obj/machinery/shieldgen{ + anchored = 1; + req_access = list(150) + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) +"Sr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ @@ -7444,35 +7757,23 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "Sv" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; - req_one_access_txt = "150"; - req_access = list(150,10); - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-10" - }, -/turf/open/floor/plating, +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "Sy" = ( -/obj/structure/table/wood, -/obj/item/pizzabox/pineapple{ - pixel_y = 5 - }, -/obj/item/pizzabox/pineapple{ - pixel_y = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/item/pizzabox/pineapple{ - pixel_y = 15 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/item/pizzabox/pineapple{ - pixel_y = 20 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/wood, -/area/ship/crew/canteen) +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/camera/autoname, +/turf/open/floor/plating, +/area/ship/hallway/port) "SA" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -7502,79 +7803,57 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "SI" = ( -/obj/item/trash/syndi_cakes, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/power/terminal{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "0-2" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "SK" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/structure/closet/cardboard{ - name = "mot containment box"; - desc = "WARNING: Contains mot." - }, -/obj/item/storage/box/syndimaid, -/obj/item/trash/cheesie, -/mob/living/carbon/human/species/moth{ - name = "Secret Box Moth"; - real_name = "Box Moth"; - gender = "female"; - faction = list("neutral","PlayerSyndicate") - }, -/obj/item/reagent_containers/food/snacks/spacetwinkie{ - pixel_y = 12; - pixel_x = 10 - }, -/obj/item/reagent_containers/food/snacks/spacetwinkie{ - pixel_x = -9; - pixel_y = 8 - }, -/obj/item/reagent_containers/food/snacks/spacetwinkie{ - pixel_x = 7 - }, -/obj/item/reagent_containers/food/snacks/spacetwinkie{ - pixel_x = -2; - pixel_y = 14 +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/reagent_containers/food/snacks/spacetwinkie{ - pixel_y = -5; - pixel_x = -6 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/structure/sign/poster/contraband/syndiemoth{ - pixel_x = -32; - desc = "A Syndicate-commissioned poster that uses Syndie Moth(TM?) to tell the viewer to keep the nuclear authentication disk unsecured. It's signed by 'AspEv'." +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/item/toy/balloon/syndicate, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "SM" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 6 }, -/obj/structure/sign/warning/radiation{ - pixel_x = -32 +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "SR" = ( -/obj/machinery/door/airlock/glass{ - name = "Cryo" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/industrial/warning{ + dir = 10 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/cryo) +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/pod/dark, +/area/ship/cargo) "SS" = ( /obj/structure/sign/poster/official/moth/meth{ pixel_y = -32 @@ -7588,10 +7867,15 @@ pixel_y = 1 }, /obj/structure/table/glass, -/obj/effect/turf_decal/trimline/opaque/orange/line, /obj/effect/turf_decal/trimline/opaque/orange/filled/line{ dir = 8 }, +/obj/effect/turf_decal/trimline/opaque/orange/line{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/mothpill{ + pixel_x = 32 + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "ST" = ( @@ -7603,56 +7887,71 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "SV" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/machinery/light/small/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) "SZ" = ( -/obj/machinery/door/window/brigdoor/southleft{ - dir = 8; - req_access = list(3,150) - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/structure/bed, +/obj/structure/curtain/cloth/fancy{ + name = "blood-red curtains" }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) +/obj/item/bedsheet/black, +/obj/item/storage/box/syndie_kit/sleepytime, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm) "Tl" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 6 +/obj/effect/turf_decal/syndicateemblem/top/right{ + dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 6 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Tn" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/hallway/port) "Tq" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, /obj/item/paper_bin/construction, /obj/item/pen, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "Tt" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/newscaster/directional/south, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"Tv" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/bridge) "TC" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 6 @@ -7676,21 +7975,34 @@ /turf/open/floor/wood/walnut, /area/ship/crew/janitor) "TM" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - id = "twinkle_external" +/obj/machinery/door/airlock/engineering/glass/critical{ + name = "Supermatter"; + req_access = list(150,10); + dir = 4 }, -/turf/open/floor/plating, -/area/ship/security) -"TR" = ( -/obj/machinery/power/terminal{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/turf/open/floor/engine, +/area/ship/engineering/engine) +"TR" = ( +/obj/item/trash/syndi_cakes, +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "1-4" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "TT" = ( /obj/machinery/vending/wallmed{ @@ -7701,6 +8013,14 @@ }, /turf/open/floor/engine, /area/ship/engineering/engine) +"TU" = ( +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "TY" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 9 @@ -7714,33 +8034,41 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ua" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/power/terminal{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/button/door{ + dir = 4; + pixel_x = -25; + name = "Engine Shutters"; + id = "twinkle_engines" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "Uc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor{ + id = "twinkle_armory" + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "Uf" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 +/obj/item/wallframe/extinguisher_cabinet{ + pixel_y = 17; + pixel_x = -2 }, -/obj/effect/turf_decal/corner/opaque/syndiered/half, -/obj/structure/rack, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plating, /area/ship/bridge) "Ug" = ( /obj/machinery/power/emitter/welded, @@ -7751,15 +8079,31 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Um" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light/directional/west, /turf/open/floor/pod/dark, /area/ship/cargo) "Up" = ( -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 1 +/obj/structure/closet/secure_closet/security{ + populate = 0; + icon_state = "syndicate"; + name = "explosives locker" + }, +/obj/item/storage/backpack/duffelbag/syndie/c4{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/gun/ballistic/rocketlauncher{ + pixel_y = 6; + pixel_x = -3 + }, +/obj/item/ammo_casing/caseless/rocket/hedp, +/obj/item/ammo_casing/caseless/rocket/hedp, +/obj/item/ammo_casing/caseless/rocket{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/ammo_casing/caseless/rocket{ + pixel_x = -6; + pixel_y = -3 }, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) @@ -7769,14 +8113,32 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Ux" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/window/reinforced/spawner{ +/obj/machinery/door/airlock/medical/glass{ + req_one_access_txt = "150"; + req_access = list(150); dir = 4 }, -/obj/structure/table/reinforced, -/obj/machinery/microwave, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/syndiered/full, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/medical) "UA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -7789,10 +8151,12 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "UB" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) @@ -7821,7 +8185,6 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "UF" = ( -/obj/machinery/door/airlock/public/glass, /obj/effect/turf_decal/corner/opaque/syndiered/border{ dir = 1 }, @@ -7833,20 +8196,13 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel/tech, /area/ship/crew/canteen) "UH" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line, /turf/open/floor/plasteel/dark, /area/ship/medical) -"UI" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) "UK" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -7877,9 +8233,8 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "UW" = ( -/obj/effect/turf_decal/corner/opaque/syndiered, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/wood, +/area/ship/crew/canteen) "Va" = ( /obj/structure/sign/syndicate, /turf/closed/wall/r_wall/syndicate/nodiagonal{ @@ -7895,51 +8250,28 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Vk" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) +/turf/open/floor/pod/light, +/area/ship/cargo) "Vu" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ dir = 4 }, /turf/open/floor/engine/o2, /area/ship/engineering/atmospherics) -"Vv" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/mineral/ore_redemption{ - dir = 8 - }, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/pod/dark, -/area/ship/cargo) "Vy" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, +/obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) "VA" = ( @@ -7972,76 +8304,103 @@ /turf/open/floor/plating, /area/ship/cargo) "VG" = ( -/obj/structure/chair/stool/bar{ - dir = 1 +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 +/turf/open/floor/pod/dark, +/area/ship/cargo) +"VH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/effect/turf_decal/corner/opaque/syndiered/border, -/turf/open/floor/plasteel, -/area/ship/crew/canteen) -"VH" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/port) "VJ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/turf_decal/syndicateemblem/middle/left{ +/obj/effect/turf_decal/syndicateemblem/middle/middle{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/machinery/holopad/emergency/command, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "VM" = ( -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - pixel_y = 25 +/obj/effect/turf_decal/trimline/opaque/orange/filled/corner{ + dir = 8 }, +/obj/structure/table/glass, /obj/effect/turf_decal/trimline/opaque/orange/line{ - dir = 1 + dir = 5 }, -/obj/effect/turf_decal/trimline/opaque/orange/filled/corner{ - dir = 8 +/obj/structure/closet/wall/orange{ + name = "Chemical Closet"; + pixel_y = 28 + }, +/obj/item/storage/bag/chemistry, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/glass/beaker, +/obj/item/clothing/glasses/sunglasses/chemical, +/obj/structure/sign/warning/chemdiamond{ + pixel_x = 30 }, +/obj/item/hypospray/mkii/CMO/combat, +/obj/item/reagent_containers/glass/bottle/vial/large, +/obj/item/reagent_containers/glass/bottle/vial/large, +/obj/item/reagent_containers/glass/bottle/vial/large, +/obj/item/reagent_containers/glass/bottle/vial/large, /turf/open/floor/plasteel/dark, /area/ship/medical) "VO" = ( -/turf/open/floor/wood, +/obj/structure/table/wood, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/airalarm/directional/east, +/obj/machinery/reagentgrinder/constructed{ + pixel_y = 9 + }, +/turf/open/floor/carpet/red, /area/ship/crew/canteen) "VU" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/corner/opaque/syndiered/border{ - dir = 1 +/obj/structure/table/wood, +/obj/machinery/door/firedoor/border_only, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -5; + pixel_y = 10 }, -/obj/machinery/turretid{ - pixel_y = 32; - req_access = null; - req_access_txt = "150" +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 3; + pixel_y = 6 }, -/obj/effect/turf_decal/spline/fancy/opaque/black/corner, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_y = 3; + pixel_x = -3 + }, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) "VY" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/effect/turf_decal/industrial/warning{ dir = 5 }, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 11 + }, +/turf/open/floor/pod/dark, +/area/ship/cargo) "VZ" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, @@ -8054,6 +8413,9 @@ /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 9 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Wd" = ( @@ -8070,28 +8432,13 @@ }, /area/ship/bridge) "Wj" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/lizardwine{ - pixel_y = 14; - pixel_x = 10 - }, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/lighter{ - pixel_x = -10; - pixel_y = -2 - }, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_x = -4 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/turf/open/floor/carpet/nanoweave/red, -/area/ship/crew/dorm/dormtwo) +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "Wm" = ( /obj/structure/table, /obj/item/storage/bag/medical{ @@ -8110,34 +8457,17 @@ pixel_y = -1; pixel_x = -5 }, -/turf/open/floor/plasteel/dark, -/area/ship/medical) -"Wo" = ( -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/pod/dark, -/area/ship/cargo) -"Wr" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/turf/open/floor/plasteel/dark, +/area/ship/medical) +"Wo" = ( +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "4-8" }, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/turf/open/floor/pod/dark, +/area/ship/cargo) "Ws" = ( /obj/effect/turf_decal/atmos/plasma{ dir = 8 @@ -8145,12 +8475,16 @@ /turf/open/floor/engine/plasma, /area/ship/engineering/atmospherics) "Wy" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/mono/dark, -/area/ship/hallway/central) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/hallway/port) "WB" = ( /obj/structure/chair{ dir = 1 @@ -8158,24 +8492,31 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "WC" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/machinery/atmospherics/pipe/manifold/purple/visible, +/obj/effect/turf_decal/techfloor/orange{ + dir = 10 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/atmospherics) +"WG" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/engineering/glass/critical{ - name = "Supermatter"; - req_access = list(150,10); +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/engine, -/area/ship/engineering/engine) -"WG" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/machinery/vending/cigarette/syndicate, -/obj/structure/sign/departments/restroom{ - pixel_y = 32 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/starboard) "WH" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ dir = 8 @@ -8198,16 +8539,15 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "WL" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "WR" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 1 @@ -8218,73 +8558,76 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "WV" = ( -/obj/machinery/light/directional/north, -/obj/structure/bed, -/obj/item/toy/plush/beeplushie, -/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ - dir = 2 +/obj/machinery/door/airlock/engineering/glass/critical{ + name = "Supermatter"; + req_access = list(150,10); + dir = 4 }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security) +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/engine, +/area/ship/engineering/engine) "WX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics"; - req_one_access_txt = "150"; - req_access = list(150,10) +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/firecloset/wall{ + pixel_y = 28 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/obj/effect/turf_decal/borderfloorblack, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) "WZ" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ +/obj/effect/turf_decal/syndicateemblem/bottom/middle, +/obj/effect/turf_decal/syndicateemblem/middle/left{ dir = 4 }, -/obj/effect/turf_decal/syndicateemblem/top/right{ - dir = 8 +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Xb" = ( -/obj/machinery/light/directional/north, -/obj/structure/table/reinforced, -/obj/item/paper_bin/carbon, -/obj/item/pen/fountain, -/obj/effect/turf_decal/corner/opaque/syndiered, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/effect/turf_decal/steeldecal/steel_decals10, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Xc" = ( /obj/structure/table/reinforced, -/obj/machinery/fax, /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 }, +/obj/machinery/fax, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Xf" = ( -/obj/structure/rack, -/obj/effect/turf_decal/box/white/corners{ +/obj/structure/table/wood, +/obj/machinery/door/firedoor/border_only, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) +"Xg" = ( +/obj/effect/turf_decal/industrial/warning{ dir = 4 }, -/obj/effect/turf_decal/box/white/corners, -/obj/structure/closet/firecloset/wall{ - dir = 1; - pixel_y = -28 +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security) -"Xg" = ( -/obj/structure/bed, -/obj/item/bedsheet/syndie, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" +/obj/structure/sign/poster/contraband/space_cola{ + pixel_y = 32 }, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm/dormtwo) +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/starboard) "Xj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ dir = 8 @@ -8292,14 +8635,10 @@ /turf/open/floor/engine/plasma, /area/ship/engineering/atmospherics) "Xq" = ( -/obj/structure/table/wood/reinforced, -/obj/item/storage/fancy/donut_box{ - name = "suspicious donut box" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/turf/open/floor/carpet/red, +/turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "Xs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -8335,42 +8674,27 @@ /obj/machinery/camera/autoname{ dir = 8 }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "XL" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/door/airlock/external{ + req_access = list(150) }, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) "XN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 10 }, -/obj/machinery/power/terminal{ +/obj/effect/turf_decal/techfloor/orange{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 1 - }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering/atmospherics) "XU" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ @@ -8379,20 +8703,11 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "Ya" = ( -/obj/structure/closet/emcloset/wall{ - dir = 4; - pixel_x = -28 - }, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/clothing/suit/space/syndicate, -/obj/effect/turf_decal/trimline/opaque/syndiered/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/light/small/directional/west, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "Yc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber, /obj/structure/sign/warning/nosmoking/burnt{ @@ -8405,9 +8720,6 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "Yi" = ( -/obj/structure/chair{ - dir = 8 - }, /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 6 }, @@ -8420,17 +8732,30 @@ pixel_x = 20; pixel_y = 11 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/office) "Yj" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, +/obj/machinery/door/airlock/external{ + req_access = list(150) + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/hallway/port) "Yl" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, +/obj/effect/turf_decal/corner/opaque/syndiered/border{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/public/glass, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/tech, /area/ship/crew/canteen) "Ym" = ( /obj/machinery/door/firedoor/border_only{ @@ -8454,20 +8779,17 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Yn" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/techfloor{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) "Yo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/drinks, +/turf/open/floor/carpet/red, +/area/ship/crew/canteen) "Yp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -8485,39 +8807,45 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) -"Yz" = ( -/obj/item/kirbyplants/random, -/obj/machinery/light/directional/west, -/obj/structure/sign/poster/official/moth/smokey{ - pixel_y = 32 +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/engineering/communications) +"Yv" = ( +/obj/effect/turf_decal/steeldecal/steel_decals_central2{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security) +"Yz" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"YB" = ( -/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/port) +"YB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/light/directional/east, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "1-5" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/pod/dark, /area/ship/engineering/atmospherics) "YF" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/corner/opaque/syndiered/border{ dir = 4 }, @@ -8545,86 +8873,146 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "YO" = ( -/obj/effect/turf_decal/corner/transparent/bar/diagonal, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/structure/rack, +/obj/item/gun/ballistic/automatic/smg/c20r{ + pixel_x = 2; + pixel_y = 8; + spawnwithmagazine = 0 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/item/gun/ballistic/automatic/smg/c20r{ + pixel_y = 3; + spawnwithmagazine = 0 }, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) +/obj/item/gun/ballistic/automatic/smg/c20r{ + pixel_y = -2; + pixel_x = 3; + spawnwithmagazine = 0 + }, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45, +/turf/open/floor/mineral/plastitanium, +/area/ship/security/armory) "YR" = ( -/obj/structure/closet/secure_closet/engineering_personal{ - req_access = list(150,10) +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/eastleft, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, -/obj/effect/turf_decal/corner/opaque/orange{ - dir = 10 +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/obj/machinery/light/directional/south, -/obj/item/clothing/shoes/magboots/syndie, -/obj/item/clothing/head/helmet/space/syndicate/black/engie, -/obj/item/clothing/suit/space/syndicate/black/engie, -/obj/item/pipe_dispenser, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) +/turf/open/floor/mineral/plastitanium, +/area/ship/security) "YT" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plating, +/area/ship/hallway/port) "YW" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/border{ +/obj/machinery/camera/autoname{ + dir = 6 + }, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 8 + }, +/obj/effect/turf_decal/syndicateemblem/bottom/middle{ dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner/opaque/syndiered/border, /obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 + dir = 4 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Zc" = ( -/obj/effect/turf_decal/corner/opaque/syndiered{ +/obj/structure/closet/secure_closet/engineering_personal{ + req_access = list(150,10); + populate = 0 + }, +/obj/effect/turf_decal/corner/opaque/orange{ dir = 10 }, -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/machinery/light/directional/south, +/obj/item/clothing/shoes/magboots/syndie, +/obj/item/clothing/head/helmet/space/syndicate/black/engie, +/obj/item/clothing/suit/space/syndicate/black/engie, +/obj/item/pipe_dispenser, +/obj/item/storage/belt/utility/syndicate, +/obj/item/clothing/under/syndicate/gec, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/head/hardhat/red{ + name = "hard hat" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "Zg" = ( /obj/effect/turf_decal/industrial/warning{ dir = 6 }, -/obj/structure/tank_dispenser/oxygen, +/obj/structure/sign/poster/solgov/suns{ + pixel_x = 32 + }, +/obj/structure/crate_shelf, /turf/open/floor/pod/dark, /area/ship/cargo) "Zk" = ( -/obj/effect/turf_decal/corner/opaque/syndiered/full, -/obj/effect/turf_decal/syndicateemblem/bottom/middle{ +/obj/effect/turf_decal/syndicateemblem/bottom/right{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/syndicateemblem/middle/left{ + dir = 1 + }, +/obj/effect/turf_decal/syndicateemblem/middle/right{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, /area/ship/bridge) "Zt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/cryopod/syndicate{ + dir = 4 + }, +/obj/effect/turf_decal/techfloor{ + dir = 9 }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) +"Zu" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/obj/effect/turf_decal/steeldecal/steel_decals_central6{ + dir = 4 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/crew/cryo) "Zw" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 10 @@ -8649,13 +9037,9 @@ /turf/open/floor/engine, /area/ship/engineering/engine) "ZC" = ( -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod/dark, /area/ship/cargo) "ZD" = ( @@ -8664,33 +9048,26 @@ }, /area/ship/engineering/engine) "ZJ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 10 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/structure/closet/emcloset/anchored, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/port) "ZO" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 }, /obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "ZQ" = ( @@ -8719,7 +9096,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) @@ -8836,25 +9212,25 @@ NO iJ wM FR -PE -sj -SK +tU +aj LH Hk iC sj +MZ uP nk NK RE ch -uY Aq uY OS nq -sj +pL aj +WC FR NO iJ @@ -8867,33 +9243,33 @@ mp mp mp FR -TR xh XN eg OZ cL KU -Vk +zi xw hZ Rc -WX +SK +iL Fm DK IU -DF -pw +si Rj YB gv -KU +tg zi Ke zs Ua SI TR +PE FR mp mp @@ -8902,25 +9278,24 @@ mp mp mp FR -iu Rd Ku zr wm tl -aG +jr Gx -tl +Sv +jr FR -MZ +wz UN UN UN UN UN -Sv +lw FR -tl jr sY ky @@ -8929,6 +9304,7 @@ lv eQ Mo GC +iG FR mp mp @@ -9151,7 +9527,7 @@ ZX Qd bM zH -bV +zZ ZX hN IT @@ -9160,7 +9536,7 @@ Zz Zz ZD ZD -WC +WV ZD ZD um @@ -9186,7 +9562,7 @@ ZX fz zK qK -YR +Zc ZX RG BV @@ -9216,12 +9592,12 @@ mp (15,1,1) = {" mp mp -bL +mp ZX WK pB wA -bQ +De ZX Dk NI @@ -9230,7 +9606,7 @@ ZD ZD ZD ZD -AL +TM ZD ZD ZD @@ -9274,10 +9650,10 @@ Et yf qo mX +ia Vy Hu Pb -yn FR mp mp @@ -9293,7 +9669,7 @@ xj xj xj xj -oB +fN ZD Na vJ @@ -9312,7 +9688,7 @@ PL PL PL PL -jA +kT Bj Bj Bj @@ -9320,13 +9696,13 @@ We "} (18,1,1) = {" xj -RB -jx Ii +iu +jo pj qA Fa -nE +fQ xj Kq ZD @@ -9343,27 +9719,27 @@ xo pc TT PL +Gm Si Sg -wR PL -NE +Fu +sd yN nr Bj -Bj "} (19,1,1) = {" xj -xj -Ux +qP +sf Kx -fN -mO +ih +UW Qa -dD +lY xj -Jz +cW ZD ZD ZD @@ -9378,30 +9754,30 @@ ZD ZD ZD PL -Si -si +dm +cD sr Eo -lT -da -vn -Bj +Tt +sd +ET +ET Bj "} (20,1,1) = {" -mp -xj -Sj -VO -wz -VG -qP +ML +dD +sf +VU +ih +UW +Qa ma xj +VH yF -SM -sd -xP +oX +Sk xa Ru Ei @@ -9411,32 +9787,32 @@ xa xP oX PN -PN +ec PL -sG +YO ji wg -gk -Kg -IB -fX +Uc +mO +sd +ET +fK Bj -mp "} (21,1,1) = {" -mp ML -lY -VO -tU -VG -cD +Yo +sf +Xf +ih +UW +UW ml Yl +Jz DW -YT -gW -cq +ea +Nh ag Ax kd @@ -9445,32 +9821,32 @@ jk ag cq ea +BG tY -kl PL -Si Rv +jx TC on -cX -AK +ep +sd +da kH Bj -mp "} (22,1,1) = {" -mp -ML -sf +xj +wb +aG VO ih Ky dU Qv UF -HL -lw -vz +AL +lT +uH vz vz uE @@ -9480,33 +9856,33 @@ gX sO sO sO -VH -oi +AK +Pe PL -Si +Bq +Fr Up -hS PL -Nh -MK -vE +Tt +sd +Bj +Bj Bj -mp "} (23,1,1) = {" -mp xj -dH -lq -Sy -Bq -gZ -zP -dp +xj +xj +xj +xj +xj +xj +xj +xj +Tn WL -ru vz -Wj +eF Cj ON MA @@ -9515,66 +9891,66 @@ Qs Ry PM sO +xz kR -Fr PL PL jH jH PL -BG +BL +EG da -Xf +pN Bj -mp "} (24,1,1) = {" -mp -JM -JM -JM -JM -JM -JM JM +hP +Ed +CJ +Sj +Nr +gZ +GH JM -mG -lw +Sy +lT vz -dm +kl yM ts -Xg +fX vz ID TI Fj sO -KJ -ox -IC +QC +Cq +Bj aD +nt oc -oc -oc -ln +Eh +Tt +EG +ET ET -kc Bj -mp "} (25,1,1) = {" -mp -JM -yP -He +Wd +Wd +Wd +Wd +Wd LG -Nr -Wr +hY qI PY +Gj RU -Tt sp sp Ee @@ -9585,101 +9961,101 @@ sp sp Ee sp -VY -GH +TU +vE Bj -Ed +pw ow +gk oG -pR -KK -AK -Ey +Tt +EG +ET +ET Bj -mp "} (26,1,1) = {" -mp -Wd -Wd Wd +Zt +Yn +lG Wd -WG +ln Ql -QR +bV JM +IB oi -zO sp cC ir mm Ls -HQ +Ls AQ oJ NC sp +WX Fl -cd -Bj Bj +YR dq Bj Bj -pD -sc -pN +Tt +sd +da +fJ Bj -mp "} (27,1,1) = {" -mp Wd +Sb +Zu gz yO -Wd +DF ps No -aA JM +IC tH -At sp qN im -hE +im kF Xq KF WB wa sp -Gy -oi +wh +Pe +Bj +ET +ET +ET Bj -pL -SV -pE Dp -CJ -da -Eh -wh -mp +sd +Bj +Bj +Bj "} (28,1,1) = {" -mp Wd +KK +cj fn -iG -SR -FI -YO +Wd +SZ +bv Fi JM -Zt -pO +YT +cT sp pm qT @@ -9690,32 +10066,32 @@ Dx gL GG sp +wh Gy -nt -Bj +KJ +sG Gk HH Pa +At +sd +da +pN Bj -HG -IB -hY -wh -mp "} (29,1,1) = {" -mp +Wd Va Wd Wd Wd -bv -JY JM JM +JM +JM +pO qY -Bs -sp +BT sp Ee sp @@ -9724,34 +10100,34 @@ CR sp sp Ee -sp -kT -oi -Bj -Bj +Eq +qp +Pe Bj Bj Bj -fJ -AK +Ey +Ey +kf +sd +ET fK -TM -mp +Bj "} (30,1,1) = {" mp lo CV Go +pH +GP +SR Bw -Bw -Bw -Bw +pD Yz hr -Id -BK -Yp +ZO +pR Xs Id UA @@ -9760,18 +10136,18 @@ bH pU Yp ZO -Id +ru +WG lg tn -Yn Bj -GD -mB +KB +dE +HG EG -ia -ia +ET +ET Bj -mp "} (31,1,1) = {" mp @@ -9779,34 +10155,34 @@ VC AW ZC Um -pH -ep +tp +VG Bw -KJ -oi -UW +Wj +IB +nE IN wu If -KM +oB KM yX KM kM XE -sz -KM +IN +SM +ak Pe -oi -Gm +hS Bj -CQ +dH +GD Nj +eN +da +Bn Bj -CQ -SZ -Bj -mp "} (32,1,1) = {" JT @@ -9814,34 +10190,34 @@ VC AW UK EO -fQ EQ +dp +Bs KQ yz ZJ -Zc ex dz -uh -uh -tg +dz +dz uX +Ux uh uh dz dz zS -Tn -oi -lw +zO +Pe +gi Bj -xe +CQ +CQ MK +CQ +Bj Bj -Qx -tp Bj -mp "} (33,1,1) = {" mp @@ -9849,12 +10225,12 @@ vQ dg NT Wo -Uc +Vk ng +vn KA Wy oj -eF dz ii XU @@ -9866,30 +10242,30 @@ YJ jM vW dz +JY gI fm -zZ -Bj -WV -xz Bj -BL +wx +ET +DB +gW +Yv qL Bj -mp "} (34,1,1) = {" mp jT Bw Bw +VY gE -Vv Zg Bw +cX dl bR -hP dz Dh st @@ -9901,17 +10277,17 @@ On JE rt dz +Kg ak Pe -cW Bj +QR +BK OY -MK -Bj +cd Bj Bj Bj -mp "} (35,1,1) = {" mp @@ -9922,11 +10298,11 @@ Bw Bw Bw Bw +pE GM -iL -je je je +FI je je Jf @@ -9937,14 +10313,14 @@ uK fl dz dz +Xg Fs -qp Bj Bj Bj Bj Bj -mp +Bj mp mp "} @@ -9953,31 +10329,31 @@ mp mp mp mp +He IV Ya -Sb -RW +Yj +yP GW -pO je KI pp FE CF -dE +zc Wm bN -De +RT Ap Ie ck dz -Gy +dk +Qk XL -RW +SV GN -NF -IV +zk mp mp mp @@ -9988,12 +10364,12 @@ mp mp mp ZV -IV +He +yn ql Yj -RW -GW -kf +yP +hd je hb jz @@ -10007,12 +10383,12 @@ Ap Ie FW dz +wR Qk XL RW lO zk -IV xZ mp mp @@ -10024,11 +10400,11 @@ mp mp mp vd -xB -xB -xB -gi -pO +NE +NE +NE +kc +GW je zG hW @@ -10042,8 +10418,8 @@ WR Ie Ks dz -KJ -hd +dk +lx xB xB xB @@ -10061,9 +10437,9 @@ mp mp mp mp -xB -HY -EX +NE +RB +mG je iZ Iw @@ -10077,8 +10453,8 @@ nb VM SS dz +dk ka -lx xB mp mp @@ -10100,17 +10476,17 @@ nb Ym nb nb -Pv -pp +nb +nb nb Xc Kk -KB +mB zp np nb -jv -hj +nb +nb nb nb Fh @@ -10135,17 +10511,17 @@ Hj do wL nb -nb -nb -nb +Pv +jv +jO +ox Xb vL -wb -vL -lG -nb -nb -nb +cI +bL +Hx +Qt +Lw nb MP Oj @@ -10170,17 +10546,17 @@ bo Gv RA nb -Qt +lq +br dL zy xg pI Zk bd -PA +Bi kE wr -Yo nb BU et @@ -10205,17 +10581,17 @@ eL Fq QT en +jA +oD oD -Bc Bc ie VJ aX vO hU -dk -dk -dk +hU +hU vA yg Ir @@ -10240,17 +10616,17 @@ nb PB nb nb +YW Tl -vL +PA OK FS kV mx WZ +Tv +HL tZ -vL -OK -Fu nb nb hR @@ -10277,13 +10653,13 @@ Fc nb VB nb -VU -cj +bQ +YF +YF EJ -UI +YF YF Sd -Jw nb FV nb @@ -10308,17 +10684,17 @@ mp nb iK jG -Fc +nw nb mp QE uo -pr +sc +Sa +EX Sa -Gj tS tr -YW QE mp nb @@ -10353,7 +10729,7 @@ jh zf oP Ao -RT +aA QE mp nb diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm index 164018096972..402c5f04923c 100644 --- a/_maps/templates/shelter_3.dmm +++ b/_maps/templates/shelter_3.dmm @@ -39,7 +39,7 @@ /turf/open/floor/pod/dark, /area/survivalpod) "i" = ( -/obj/item/book/manual/wiki/barman_recipes, +/obj/item/book/manual/wiki/drinks, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/glass/rag, /obj/structure/table/wood/fancy/black, diff --git a/check_regex.yaml b/check_regex.yaml index df64dec9aae1..f19d67f7d16f 100644 --- a/check_regex.yaml +++ b/check_regex.yaml @@ -38,7 +38,7 @@ standards: - exactly: [ - 295, + 273, "non-bitwise << uses", '(? target_mob.see_invisible) - continue - if(turf_content in overrides) - continue - if(turf_content.IsObscured()) - continue - if(length(turfitems) < 30) // only create images for the first 30 items on the turf, for performance reasons - if(!(REF(turf_content) in cached_images)) - cached_images += REF(turf_content) - turf_content.RegisterSignal(turf_content, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/atom, remove_from_cache)) // we reset cache if anything in it gets deleted - if(ismob(turf_content) || length(turf_content.overlays) > 2) - turfitems[++turfitems.len] = list("[turf_content.name]", REF(turf_content), costly_icon2html(turf_content, target, sourceonly=TRUE)) - else - turfitems[++turfitems.len] = list("[turf_content.name]", REF(turf_content), icon2html(turf_content, target, sourceonly=TRUE)) - else - turfitems[++turfitems.len] = list("[turf_content.name]", REF(turf_content)) - else - turfitems[++turfitems.len] = list("[turf_content.name]", REF(turf_content)) - turfitems = url_encode(json_encode(turfitems)) - target << output("[turfitems];", "statbrowser:update_listedturf") + var/mob/target_mob = target.mob + if((target.stat_tab in target.spell_tabs) || !length(target.spell_tabs) && (length(target_mob.mob_spell_list) || length(target_mob.mind?.spell_list))) + if(num_fires % default_wait == 0) + set_spells_tab(target, target_mob) + + // Handle the examined turf of the stat panel, if it's been long enough, or if we've generated new images for it + var/turf/listed_turf = target_mob?.listed_turf + if(listed_turf && num_fires % default_wait == 0) + if(target.stat_tab == listed_turf.name || !(listed_turf.name in target.panel_tabs)) + set_turf_examine_tab(target, target_mob) + if(MC_TICK_CHECK) return +/datum/controller/subsystem/statpanels/proc/set_status_tab(client/target) + if(!global_data)//statbrowser hasnt fired yet and we were called from immediate_send_stat_data() + return + + target.stat_panel.send_message("update_stat", list( + "global_data" = global_data, + "ping_str" = "Ping: [round(target.lastping, 1)]ms (Average: [round(target.avgping, 1)]ms)", + "other_str" = target.mob?.get_status_tab_items(), + )) + +/datum/controller/subsystem/statpanels/proc/set_MC_tab(client/target) + var/turf/eye_turf = get_turf(target.eye) + var/coord_entry = COORD(eye_turf) + if(!mc_data) + generate_mc_data() + target.stat_panel.send_message("update_mc", list("mc_data" = mc_data, "coord_entry" = coord_entry)) + +/datum/controller/subsystem/statpanels/proc/set_tickets_tab(client/target) + var/list/ahelp_tickets = GLOB.ahelp_tickets.stat_entry() + target.stat_panel.send_message("update_tickets", ahelp_tickets) + var/datum/interview_manager/m = GLOB.interviews + + // get open interview count + var/dc = 0 + for (var/ckey in m.open_interviews) + var/datum/interview/current_interview = m.open_interviews[ckey] + if (current_interview && !current_interview.owner) + dc++ + var/stat_string = "([m.open_interviews.len - dc] online / [dc] disconnected)" + + // Prepare each queued interview + var/list/queued = list() + for (var/datum/interview/queued_interview in m.interview_queue) + queued += list(list( + "ref" = REF(queued_interview), + "status" = "\[[queued_interview.pos_in_queue]\]: [queued_interview.owner_ckey][!queued_interview.owner ? " (DC)": ""] \[INT-[queued_interview.id]\]" + )) + + var/list/data = list( + "status" = list( + "Active:" = "[m.open_interviews.len] [stat_string]", + "Queued:" = "[m.interview_queue.len]", + "Closed:" = "[m.closed_interviews.len]"), + "interviews" = queued + ) + + // Push update + target.stat_panel.send_message("update_interviews", data) + +/datum/controller/subsystem/statpanels/proc/set_SDQL2_tab(client/target) + var/list/sdql2A = list() + sdql2A[++sdql2A.len] = list("", "Access Global SDQL2 List", REF(GLOB.sdql2_vv_statobj)) + var/list/sdql2B = list() + for(var/datum/SDQL2_query/query as anything in GLOB.sdql2_queries) + sdql2B = query.generate_stat() + + sdql2A += sdql2B + target.stat_panel.send_message("update_sdql2", sdql2A) + +/datum/controller/subsystem/statpanels/proc/set_spells_tab(client/target, mob/target_mob) + var/list/proc_holders = target_mob.get_proc_holders() + target.spell_tabs.Cut() + + for(var/proc_holder_list as anything in proc_holders) + target.spell_tabs |= proc_holder_list[1] + + target.stat_panel.send_message("update_spells", list(spell_tabs = target.spell_tabs, proc_holders_encoded = proc_holders)) + +/datum/controller/subsystem/statpanels/proc/set_turf_examine_tab(client/target, mob/target_mob) + var/list/overrides = list() + for(var/image/target_image as anything in target.images) + if(!target_image.loc || target_image.loc.loc != target_mob.listed_turf || !target_image.override) + continue + overrides += target_image.loc + + var/list/atoms_to_display = list(target_mob.listed_turf) + for(var/atom/movable/turf_content as anything in target_mob.listed_turf) + if(turf_content.mouse_opacity == MOUSE_OPACITY_TRANSPARENT) + continue + if(turf_content.invisibility > target_mob.see_invisible) + continue + if(turf_content in overrides) + continue + if(turf_content.IsObscured()) + continue + atoms_to_display += turf_content + + /// Set the atoms we're meant to display + var/datum/object_window_info/obj_window = target.obj_window + obj_window.atoms_to_show = atoms_to_display + START_PROCESSING(SSobj_tab_items, obj_window) + refresh_client_obj_view(target) + +/datum/controller/subsystem/statpanels/proc/refresh_client_obj_view(client/refresh) + var/list/turf_items = return_object_images(refresh) + if(!length(turf_items) || !refresh.mob?.listed_turf) + return + refresh.stat_panel.send_message("update_listedturf", turf_items) + +#define OBJ_IMAGE_LOADING "statpanels obj loading temporary" +/// Returns all our ready object tab images +/// Returns a list in the form list(list(object_name, object_ref, loaded_image), ...) +/datum/controller/subsystem/statpanels/proc/return_object_images(client/load_from) + // You might be inclined to think that this is a waste of cpu time, since we + // A: Double iterate over atoms in the build case, or + // B: Generate these lists over and over in the refresh case + // It's really not very hot. The hot portion of this code is genuinely mostly in the image generation + // So it's ok to pay a performance cost for cleanliness here + + // No turf? go away + if(!load_from.mob?.listed_turf) + return list() + var/datum/object_window_info/obj_window = load_from.obj_window + var/list/already_seen = obj_window.atoms_to_images + var/list/to_make = obj_window.atoms_to_imagify + var/list/turf_items = list() + for(var/atom/turf_item as anything in obj_window.atoms_to_show) + // First, we fill up the list of refs to display + // If we already have one, just use that + var/existing_image = already_seen[turf_item] + if(existing_image == OBJ_IMAGE_LOADING) + continue + // We already have it. Success! + if(existing_image) + turf_items[++turf_items.len] = list("[turf_item.name]", REF(turf_item), existing_image) + continue + // Now, we're gonna queue image generation out of those refs + to_make += turf_item + already_seen[turf_item] = OBJ_IMAGE_LOADING + obj_window.RegisterSignal(turf_item, COMSIG_PARENT_QDELETING, /datum/object_window_info/proc/viewing_atom_deleted) // we reset cache if anything in it gets deleted + return turf_items + +#undef OBJ_IMAGE_LOADING /datum/controller/subsystem/statpanels/proc/generate_mc_data() - var/list/mc_data = list( + mc_data = list( list("CPU:", world.cpu), list("Instances:", "[num2text(world.contents.len, 10)]"), list("World Time:", "[world.time]"), @@ -162,45 +235,147 @@ SUBSYSTEM_DEF(statpanels) for(var/datum/controller/subsystem/sub_system as anything in Master.subsystems) mc_data[++mc_data.len] = list("\[[sub_system.state_letter()]][sub_system.name]", sub_system.stat_entry(), text_ref(sub_system)) mc_data[++mc_data.len] = list("Camera Net", "Cameras: [GLOB.cameranet.cameras.len] | Chunks: [GLOB.cameranet.chunks.len]", text_ref(GLOB.cameranet)) - mc_data_encoded = url_encode(json_encode(mc_data)) -/atom/proc/remove_from_cache() - SSstatpanels.cached_images -= REF(src) +///immediately update the active statpanel tab of the target client +/datum/controller/subsystem/statpanels/proc/immediate_send_stat_data(client/target) + if(!target.stat_panel.is_ready()) + return FALSE + + if(target.stat_tab == "Status") + set_status_tab(target) + return TRUE + + var/mob/target_mob = target.mob + if((target.stat_tab in target.spell_tabs) || !length(target.spell_tabs) && (length(target_mob.mob_spell_list) || length(target_mob.mind?.spell_list))) + set_spells_tab(target, target_mob) + return TRUE + + if(target_mob?.listed_turf) + if(!target_mob.TurfAdjacent(target_mob.listed_turf)) + target_mob.set_listed_turf(null) + + else if(target.stat_tab == target_mob?.listed_turf.name || !(target_mob?.listed_turf.name in target.panel_tabs)) + set_turf_examine_tab(target, target_mob) + return TRUE + + if(!target.holder) + return FALSE + + if(target.stat_tab == "MC") + set_MC_tab(target) + return TRUE -/// verbs that send information from the browser UI -/client/verb/set_tab(tab as text|null) - set name = "Set Tab" - set hidden = TRUE + if(target.stat_tab == "Tickets") + set_tickets_tab(target) + return TRUE - stat_tab = tab + if(!length(GLOB.sdql2_queries) && ("SDQL2" in target.panel_tabs)) + target.stat_panel.send_message("remove_sdql2") -/client/verb/send_tabs(tabs as text|null) - set name = "Send Tabs" - set hidden = TRUE + else if(length(GLOB.sdql2_queries) && target.stat_tab == "SDQL2") + set_SDQL2_tab(target) - panel_tabs |= tabs +/// Stat panel window declaration +/client/var/datum/tgui_window/stat_panel -/client/verb/remove_tabs(tabs as text|null) - set name = "Remove Tabs" - set hidden = TRUE +/// Datum that holds and tracks info about a client's object window +/// Really only exists because I want to be able to do logic with signals +/// And need a safe place to do the registration +/datum/object_window_info + /// list of atoms to show to our client via the object tab, at least currently + var/list/atoms_to_show = list() + /// list of atom -> image string for objects we have had in the right click tab + /// this is our caching + var/list/atoms_to_images = list() + /// list of atoms to turn into images for the object tab + var/list/atoms_to_imagify = list() + /// Our owner client + var/client/parent + /// Are we currently tracking a turf? + var/actively_tracking = FALSE - panel_tabs -= tabs +/datum/object_window_info/New(client/parent) + . = ..() + src.parent = parent -/client/verb/reset_tabs() - set name = "Reset Tabs" - set hidden = TRUE +/datum/object_window_info/Destroy(force, ...) + atoms_to_show = null + atoms_to_images = null + atoms_to_imagify = null + parent.obj_window = null + parent = null + STOP_PROCESSING(SSobj_tab_items, src) + return ..() + +/// Takes a client, attempts to generate object images for it +/// We will update the client with any improvements we make when we're done +/datum/object_window_info/process(delta_time) + // Cache the datum access for sonic speed + var/list/to_make = atoms_to_imagify + var/list/newly_seen = atoms_to_images + var/index = 0 + for(index in 1 to length(to_make)) + var/atom/thing = to_make[index] + + var/generated_string + if(ismob(thing) || length(thing.overlays) > 2) + generated_string = costly_icon2html(thing, parent, sourceonly=TRUE) + else + generated_string = icon2html(thing, parent, sourceonly=TRUE) + + newly_seen[thing] = generated_string + if(TICK_CHECK) + to_make.Cut(1, index + 1) + index = 0 + break + // If we've not cut yet, do it now + if(index) + to_make.Cut(1, index + 1) + SSstatpanels.refresh_client_obj_view(parent) + if(!length(to_make)) + return PROCESS_KILL + +/datum/object_window_info/proc/start_turf_tracking() + if(actively_tracking) + stop_turf_tracking() + var/static/list/connections = list( + COMSIG_MOVABLE_MOVED = PROC_REF(on_mob_move), + COMSIG_MOB_LOGOUT = PROC_REF(on_mob_logout), + ) + AddComponent(/datum/component/connect_mob_behalf, parent, connections) + actively_tracking = TRUE - panel_tabs = list() +/datum/object_window_info/proc/stop_turf_tracking() + qdel(GetComponent(/datum/component/connect_mob_behalf)) + actively_tracking = FALSE -/client/verb/panel_ready() - set name = "Panel Ready" - set hidden = TRUE +/datum/object_window_info/proc/on_mob_move(mob/source) + SIGNAL_HANDLER + var/turf/listed = source.listed_turf + if(!listed || !source.TurfAdjacent(listed)) + source.set_listed_turf(null) - statbrowser_ready = TRUE - init_verbs() +/datum/object_window_info/proc/on_mob_logout(mob/source) + SIGNAL_HANDLER + on_mob_move(parent.mob) -/client/verb/update_verbs() - set name = "Update Verbs" - set hidden = TRUE +/// Clears any cached object window stuff +/// We use hard refs cause we'd need a signal for this anyway. Cleaner this way +/datum/object_window_info/proc/viewing_atom_deleted(atom/deleted) + SIGNAL_HANDLER + atoms_to_show -= deleted + atoms_to_imagify -= deleted + atoms_to_images -= deleted - init_verbs() +/mob/proc/set_listed_turf(turf/new_turf) + listed_turf = new_turf + if(!client) + return + if(!client.obj_window) + client.obj_window = new(client) + if(listed_turf) + client.stat_panel.send_message("create_listedturf", listed_turf.name) + client.obj_window.start_turf_tracking() + else + client.stat_panel.send_message("remove_listedturf") + client.obj_window.stop_turf_tracking() diff --git a/code/datums/components/connect_mob_behalf.dm b/code/datums/components/connect_mob_behalf.dm new file mode 100644 index 000000000000..1c1a8a652342 --- /dev/null +++ b/code/datums/components/connect_mob_behalf.dm @@ -0,0 +1,59 @@ +/// This component behaves similar to connect_loc_behalf, but working off clients and mobs instead of loc +/// To be clear, we hook into a signal on a tracked client's mob +/// We retain the ability to react to that signal on a seperate listener, which makes this quite powerful +/datum/component/connect_mob_behalf + dupe_mode = COMPONENT_DUPE_UNIQUE + + /// An assoc list of signal -> procpath to register to the mob our client "owns" + var/list/connections + /// The master client we're working with + var/client/tracked + /// The mob we're currently tracking + var/mob/tracked_mob + +/datum/component/connect_mob_behalf/Initialize(client/tracked, list/connections) + . = ..() + if (!istype(tracked)) + return COMPONENT_INCOMPATIBLE + src.connections = connections + src.tracked = tracked + +/datum/component/connect_mob_behalf/RegisterWithParent() + RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel)) + update_signals() + +/datum/component/connect_mob_behalf/UnregisterFromParent() + unregister_signals() + UnregisterSignal(tracked, COMSIG_PARENT_QDELETING) + + tracked = null + tracked_mob = null + +/datum/component/connect_mob_behalf/proc/handle_tracked_qdel() + SIGNAL_HANDLER + qdel(src) + +/datum/component/connect_mob_behalf/proc/update_signals() + unregister_signals() + // Yes this is a runtime silencer + // We could be in a position where logout is sent to two things, one thing intercepts it, then deletes the client's new mob + // It's rare, and the same check in connect_loc_behalf is more fruitful, but it's still worth doing + if(QDELETED(tracked?.mob)) + return + tracked_mob = tracked.mob + RegisterSignal(tracked_mob, COMSIG_MOB_LOGOUT, PROC_REF(on_logout)) + for (var/signal in connections) + parent.RegisterSignal(tracked_mob, signal, connections[signal]) + +/datum/component/connect_mob_behalf/proc/unregister_signals() + if(isnull(tracked_mob)) + return + + parent.UnregisterSignal(tracked_mob, connections) + UnregisterSignal(tracked_mob, COMSIG_MOB_LOGOUT) + + tracked_mob = null + +/datum/component/connect_mob_behalf/proc/on_logout(mob/source) + SIGNAL_HANDLER + update_signals() diff --git a/code/datums/ert.dm b/code/datums/ert.dm index 844548748824..2b02a2be0198 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -67,6 +67,7 @@ random_names = FALSE leader_experience = FALSE spawn_at_outpost = FALSE + ert_template = /datum/map_template/shuttle/subshuttles/ancon /datum/ert/centcom_official/New() mission = "Conduct a routine review of [station_name()]'s vessels." @@ -89,6 +90,7 @@ rename_team = "Horde of Interns" mission = "Assist in conflict resolution." polldesc = "an unpaid internship opportunity with Nanotrasen" + ert_template = /datum/map_template/shuttle/subshuttles/ancon /datum/ert/intern/unarmed roles = list(/datum/antagonist/ert/intern/unarmed) @@ -114,6 +116,7 @@ mission = "Carry out your contract." rename_team = "Generic Inteq Team" polldesc = "an Inteq emergency team" + ert_template = /datum/map_template/shuttle/subshuttles/anvil // SolGov @@ -148,6 +151,7 @@ rename_team = "Generic Minutemen Team" polldesc = "a Minutemen emergency team" random_names = TRUE + ert_template = /datum/map_template/shuttle/subshuttles/crux /datum/ert/minutemen/bard @@ -209,6 +213,7 @@ mission = "Assist CyberSun clients." rename_team = "Cybersun Medical Intervention Team" polldesc = "a Cybersun paramedic team" + ert_template = /datum/map_template/shuttle/subshuttles/runner /datum/ert/syndicate/inspector teamsize = 1 @@ -246,7 +251,6 @@ roles = list(/datum/antagonist/ert/frontier, /datum/antagonist/ert/frontier/medic, /datum/antagonist/ert/frontier/engineer) rename_team = "Assault Frontiersmen Team" polldesc = "a well armed squad of pirates" - ert_template = /datum/map_template/shuttle/subshuttles/frontiersmen_gut /datum/ert/independent teamsize = 3 diff --git a/code/datums/mind.dm b/code/datums/mind.dm index af7d411245e2..fc91d2c71de1 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -728,7 +728,7 @@ if(istype(S, spell)) spell_list -= S qdel(S) - current?.client << output(null, "statbrowser:check_spells") + current?.client.stat_panel.send_message("check_spells") /datum/mind/proc/RemoveAllSpells() for(var/obj/effect/proc_holder/S in spell_list) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 66919ca67f3b..a66ed7d125ed 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -17,7 +17,10 @@ var/short_name var/list/job_slots = list() var/list/name_categories = list("GENERAL") + /// The prefix of the ship's name. var/prefix = "ISV" + /// The full name of the ship's faction. + var/faction_name = "Independent" var/unique_ship_access = FALSE /// Set by config JSON. If true, the template's ships' "default" spawn location (when bought by a player or loaded at roundstart) /// will be in the middle of space, instead of at an outpost. @@ -326,12 +329,6 @@ category = "subshuttles" starting_funds = 0 - -/datum/map_template/shuttle/subshuttles/frontiersmen_gut //i need to give this a better name at some point - file_name = "frontiersmen_gut" - name = "Gut Combat Freighter" - prefix = "ISV" - /datum/map_template/shuttle/subshuttles/pill file_name = "independent_pill" name = "Pill-Class Torture Device" @@ -366,6 +363,33 @@ name = "Falcon Dropship" prefix = "NTSV" +/datum/map_template/shuttle/subshuttles/crux + file_name = "minutemen_crux" + name = "Crux Dropship" + prefix = "CMSV" + +/datum/map_template/shuttle/subshuttles/ancon + file_name = "nanotrasen_ancon" + name = "Nanotrasen Ancon-Class Command Ship" + prefix = "NTSV" + name_categories = list("GENERAL", "SPACE") + +/datum/map_template/shuttle/subshuttles/frontiersmen_gut //i need to give this a better name at some point + file_name = "frontiersmen_gut" + name = "Gut Combat Freighter" + prefix = "ISV" + +/datum/map_template/shuttle/subshuttles/anvil + file_name = "inteq_anvil" + name = "Anvil-Class Dropship" + prefix = "IRMV" + name_categories = list("GENERAL", "SPACE") + +/datum/map_template/shuttle/subshuttles/runner + file_name = "syndicate_runner" + name = "Runner-Class Ambulance" + prefix = "CSSV" + name_categories = list("GENERAL", "SPACE") /datum/map_template/shuttle/subshuttles/haste file_name = "inteq_haste" diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index dccd4e87877d..8cb9f50008f4 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -123,20 +123,20 @@ //Security/Command if("Captain") heirloom_type = /obj/item/reagent_containers/food/drinks/flask/gold - if("Head of Security") - heirloom_type = /obj/item/book/manual/wiki/security_space_law +// if("Head of Security") +// heirloom_type = /obj/item/book/manual/wiki/security_space_law if("Head of Personnel") heirloom_type = /obj/item/reagent_containers/food/drinks/trophy/silver_cup - if("Warden") - heirloom_type = /obj/item/book/manual/wiki/security_space_law +// if("Warden") +// heirloom_type = /obj/item/book/manual/wiki/security_space_law if("Security Officer") - heirloom_type = pick(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec) + heirloom_type = pick(/obj/item/clothing/head/beret/sec) if("Detective") heirloom_type = /obj/item/reagent_containers/food/drinks/bottle/whiskey if("Lawyer") - heirloom_type = pick(/obj/item/gavelhammer, /obj/item/book/manual/wiki/security_space_law) + heirloom_type = pick(/obj/item/gavelhammer) if("Brig Physician") //WS edit - Brig Physicians - heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/roller, /obj/item/book/manual/wiki/security_space_law) //WS edit - Brig Physicians + heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/roller) //WS edit - Brig Physicians if("Prisoner") heirloom_type = /obj/item/pen/blue //RnD diff --git a/code/game/MapData/shuttles/srm_glaive.dm b/code/game/MapData/shuttles/srm_elder.dm similarity index 100% rename from code/game/MapData/shuttles/srm_glaive.dm rename to code/game/MapData/shuttles/srm_elder.dm diff --git a/code/game/area/areas/ruins/sandplanet.dm b/code/game/area/areas/ruins/sandplanet.dm index e2fb00acdc10..e3a93b58e065 100644 --- a/code/game/area/areas/ruins/sandplanet.dm +++ b/code/game/area/areas/ruins/sandplanet.dm @@ -7,5 +7,13 @@ icon_state = "green" /area/ruin/whitesands/pubbycrash - name = "Pubby Crash" - icon_state = "blue" + name = "Pubby-Class Wreckage" + icon_state = "bluenew" + +/area/ruin/whitesands/pubbycrash/engine_room + name = "Pubby-Class Engine Room" + icon_state = "green" + +/area/ruin/whitesands/pubbycrash/split + name = "Pubby-Class Chunk" + icon_state = "red" diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index ac66aa4f6f26..7ee4a5ce668c 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -450,7 +450,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/retro, 17) sleepyhead.apply_damage_type(15, BURN) to_chat(sleepyhead, "The symptoms of cryosleep set in as you awaken...") - +/obj/machinery/cryopod/syndicate + icon_state = "sleeper_s-open" + open_state = "sleeper_s-open" + close_state = "sleeper_s" /obj/machinery/cryopod/poor name = "low quality cryogenic freezer" diff --git a/code/game/objects/items/desk_flags.dm b/code/game/objects/items/desk_flags.dm index 3ac3418209e0..3e7c299fc3bd 100644 --- a/code/game/objects/items/desk_flags.dm +++ b/code/game/objects/items/desk_flags.dm @@ -1,7 +1,7 @@ /obj/item/desk_flag - name = "flag" + name = "blank desk flag" desc = "Show your patriotism with WaffleCo. brand desk flags!" - icon = 'icons/obj/flags.dmi' + icon = 'icons/obj/deskflags.dmi' icon_state = "flag" force = 3 throwforce = 2 @@ -17,11 +17,16 @@ icon_state = "trans" /obj/item/desk_flag/solgov - name = "solgov flag" + name = "solgov desk flag" desc = "The blue and gold flag of the Sol Government." icon_state = "solgov" /obj/item/desk_flag/trans - name = "vampire flag" + name = "vampire desk flag" desc = "The blue, cyan, and white flag of the transylvanian society of vampires." icon_state = "trans" + +/obj/item/desk_flag/gezena + name = "gezenan desk flag" + desc = "A small banner on a pole depicting the sigil of the Pan-Gezenan Federation." + icon_state = "gezena" diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index b32169951c46..8ec4353d1ca2 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) /obj/item/grown/corncob, /obj/item/poster/random_contraband, /obj/item/poster/random_official, - /obj/item/book/manual/wiki/barman_recipes, + /obj/item/book/manual/wiki/drinks, /obj/item/book/manual/chef_recipes, /obj/item/bikehorn, /obj/item/toy/beach_ball, diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index a9f9e792c962..cd01cef70503 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -83,7 +83,6 @@ item_state = "cage" worn_x_dimension = 64 worn_y_dimension = 64 - dynamic_hair_suffix = "" /obj/item/storage/box/holy/sentinel name = "Stone Sentinel Kit" diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index da1906143abc..693858bf1b2e 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -360,156 +360,177 @@ /obj/item/book/manual/wiki/chemistry name = "Chemistry Textbook" - icon_state ="chemistrybook" - author = "Nanotrasen" + icon_state = "chemistrybook" + author = "GREMLIN" title = "Chemistry Textbook" page_link = "Guide_to_Chemistry" -/obj/item/book/manual/wiki/engineering_construction - name = "Station Repairs and Construction" - icon_state ="bookEngineering" - author = "Engineering Encyclopedia" - title = "Station Repairs and Construction" - page_link = "Guide_to_Construction" - -/obj/item/book/manual/wiki/engineering_guide - name = "Engineering Textbook" - icon_state ="bookEngineering2" - author = "Engineering Encyclopedia" - title = "Engineering Textbook" +/obj/item/book/manual/wiki/command + name = "Command and Delegate" + icon_state = "book" + author = "Frontier Assistance Program" + title = "Command and Delegate: The Entreprising Captain's Guide" + page_link = "Guide_to_Command" + +/obj/item/book/manual/wiki/piloting + name = "You and Helm Consoles" + icon_state = "book" + author = "Frontier Assistance Program" + title = "You and Helm Consoles: The Bold Helmsman's Manual" + page_link = "Guide_to_the_Overmap" + +/obj/item/book/manual/wiki/ghetto_chemistry + name = "Ghetto Chemistry Textbook" + icon_state = "chemistrybook" + author = "GREMLIN" + title = "Less Legal Chemistry Textbook" + page_link = "Guide_to_Ghetto_Chemistry" + +/obj/item/book/manual/wiki/cooking + name = "Cookbook" + desc = "It's a cookbook!" + icon_state = "cooked_book" + author = "Frontier Assistance Program" + title = "To Serve Man" + page_link = "Guide_to_Food_and_Drinks" + +/obj/item/book/manual/wiki/construction + name = "Ship Repairs and Construction" + icon_state = "bookEngineering" + author = "Frontier Assistance Program" + title = "Ship Repairs and Construction" + page_link = "Construction" + +/obj/item/book/manual/wiki/engineering + name = "Engineering Guide" + icon_state = "bookEngineering2" + author = "Frontier Assistance Program" + title = "The Ship Engineer's Guide to Mechanical and Electrical Engineering" page_link = "Guide_to_Engineering" -/obj/item/book/manual/wiki/engineering_singulo_tesla - name = "Singularity and Tesla for Dummies" - icon_state ="bookEngineeringSingularitySafety" - author = "Engineering Encyclopedia" - title = "Singularity and Tesla for Dummies" - page_link = "Singularity_and_Tesla_engines" - -/obj/item/book/manual/wiki/security_space_law - name = "Space Law" - desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations." - icon_state = "bookSpaceLaw" - author = "Nanotrasen" - title = "Space Law" - page_link = "Space_Law" - -/obj/item/book/manual/wiki/infections - name = "Infections - Making your own pandemic!" - icon_state = "bookInfections" - author = "Infections Encyclopedia" - title = "Infections - Making your own pandemic!" - page_link = "Infections" - -/obj/item/book/manual/wiki/telescience - name = "Teleportation Science - Bluespace for dummies!" - icon_state = "book7" - author = "University of Bluespace" - title = "Teleportation Science - Bluespace for dummies!" - page_link = "Guide_to_telescience" - -/obj/item/book/manual/wiki/engineering_hacking +/obj/item/book/manual/wiki/hacking name = "Hacking" - icon_state ="bookHacking" - author = "Engineering Encyclopedia" + icon_state = "bookHacking" + author = "Frontier Assistance Program" title = "Hacking" page_link = "Hacking" -/obj/item/book/manual/wiki/detective - name = "The Film Noir: Proper Procedures for Investigations" - icon_state ="bookDetective" - author = "Nanotrasen" - title = "The Film Noir: Proper Procedures for Investigations" - page_link = "Detective" - -/obj/item/book/manual/wiki/barman_recipes +/obj/item/book/manual/wiki/drinks name = "Barman Recipes: Mixing Drinks and Changing Lives" icon_state = "barbook" author = "Sir John Rose" title = "Barman Recipes: Mixing Drinks and Changing Lives" - page_link = "Guide_to_food_and_drinks" - -/obj/item/book/manual/wiki/robotics_cyborgs - name = "Robotics for Dummies" - icon_state = "borgbook" - author = "XISC" - title = "Robotics for Dummies" - page_link = "Guide_to_robotics" - -/obj/item/book/manual/wiki/research_and_development - name = "Research and Development 101" - icon_state = "rdbook" - author = "Dr. L. Ight" - title = "Research and Development 101" - page_link = "Guide_to_Research_and_Development" - -/obj/item/book/manual/wiki/experimentor - name = "Mentoring your Experiments" - icon_state = "rdbook" - author = "Dr. H.P. Kritz" - title = "Mentoring your Experiments" - page_link = "E.X.P.E.R.I-MENTOR" - -/obj/item/book/manual/wiki/cooking_to_serve_man - name = "To Serve Man" - desc = "It's a cookbook!" - icon_state ="cooked_book" - author = "the Kanamitan Empire" - title = "To Serve Man" - page_link = "Guide_to_food_and_drinks" - -/obj/item/book/manual/wiki/tcomms - name = "Subspace Telecommunications And You" - icon_state = "book3" - author = "Engineering Encyclopedia" - title = "Subspace Telecommunications And You" - page_link = "Guide_to_Telecommunications" - -/obj/item/book/manual/wiki/atmospherics - name = "Lexica Atmosia" - icon_state = "book5" - author = "the City-state of Atmosia" - title = "Lexica Atmosia" - page_link = "Guide_to_Atmospherics" + page_link = "Guide_to_Food_and_Drinks" /obj/item/book/manual/wiki/medicine - name = "Medical Space Compendium, Volume 638" + name = "Guide to Medical Aid" icon_state = "book8" - author = "Medical Journal" - title = "Medical Space Compendium, Volume 638" - page_link = "Guide_to_medicine" + author = "Frontier Assistance Program" + title = "The Crewman's Guide to Medical Aid" + page_link = "Guide_to_Medical" /obj/item/book/manual/wiki/surgery - name = "Brain Surgery for Dummies" + name = "Guide to Surgery" icon_state = "book4" - author = "Dr. F. Fran" - title = "Brain Surgery for Dummies" - page_link = "Surgery" + author = "Frontier Assistance Program" + title = "Guide to Surgery: Scalpel, Hemostat, Wristwatch" + page_link = "Guide_to_Surgery" -/obj/item/book/manual/wiki/grenades - name = "DIY Chemical Grenades" - icon_state = "book2" - author = "W. Powell" - title = "DIY Chemical Grenades" - page_link = "Grenade" - -/obj/item/book/manual/wiki/toxins - name = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap" - icon_state = "book6" - author = "Cuban Pete" - title = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap" - page_link = "Guide_to_toxins" - -/obj/item/book/manual/wiki/plumbing - name = "Chemical Factories Without Narcotics" - icon_state ="plumbingbook" - author = "Nanotrasen" - title = "Chemical Factories Without Narcotics" - page_link = "Guide_to_plumbing" - -/obj/item/book/manual/wiki/medical_cloning - name = "Cloning techniques of the 26th century" - icon_state ="bookCloning" - author = "Medical Journal, volume 3" - title = "Cloning techniques of the 26th century" - page_link = "Guide_to_genetics#Cloning" +/obj/item/book/manual/wiki/robotics + name = "Robotics for Dummies" + icon_state = "borgbook" + author = "XISC" + title = "Robotics for Dummies" + page_link = "Guide_to_Robotics" + +// /obj/item/book/manual/wiki/engineering_singulo_tesla +// name = "Singularity and Tesla for Dummies" +// icon_state ="bookEngineeringSingularitySafety" +// author = "Engineering Encyclopedia" +// title = "Singularity and Tesla for Dummies" +// page_link = "Singularity_and_Tesla_engines" + +// /obj/item/book/manual/wiki/security_space_law +// name = "Space Law" +// desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations." +// icon_state = "bookSpaceLaw" +// author = "Nanotrasen" +// title = "Space Law" +// page_link = "Space_Law" + +// /obj/item/book/manual/wiki/infections +// name = "Infections - Making your own pandemic!" +// icon_state = "bookInfections" +// author = "Infections Encyclopedia" +// title = "Infections - Making your own pandemic!" +// page_link = "Infections" + +// /obj/item/book/manual/wiki/telescience +// name = "Teleportation Science - Bluespace for dummies!" +// icon_state = "book7" +// author = "University of Bluespace" +// title = "Teleportation Science - Bluespace for dummies!" +// page_link = "Guide_to_telescience" + +// /obj/item/book/manual/wiki/detective +// name = "The Film Noir: Proper Procedures for Investigations" +// icon_state ="bookDetective" +// author = "Nanotrasen" +// title = "The Film Noir: Proper Procedures for Investigations" +// page_link = "Detective" + +// /obj/item/book/manual/wiki/research_and_development +// name = "Research and Development 101" +// icon_state = "rdbook" +// author = "Dr. L. Ight" +// title = "Research and Development 101" +// page_link = "Guide_to_Research_and_Development" + +// /obj/item/book/manual/wiki/experimentor +// name = "Mentoring your Experiments" +// icon_state = "rdbook" +// author = "Dr. H.P. Kritz" +// title = "Mentoring your Experiments" +// page_link = "E.X.P.E.R.I-MENTOR" + +// /obj/item/book/manual/wiki/tcomms +// name = "Subspace Telecommunications And You" +// icon_state = "book3" +// author = "Engineering Encyclopedia" +// title = "Subspace Telecommunications And You" +// page_link = "Guide_to_Telecommunications" + +// /obj/item/book/manual/wiki/atmospherics +// name = "Lexica Atmosia" +// icon_state = "book5" +// author = "the City-state of Atmosia" +// title = "Lexica Atmosia" +// page_link = "Guide_to_Atmospherics" + +// /obj/item/book/manual/wiki/grenades +// name = "DIY Chemical Grenades" +// icon_state = "book2" +// author = "W. Powell" +// title = "DIY Chemical Grenades" +// page_link = "Grenade" + +// /obj/item/book/manual/wiki/toxins +// name = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap" +// icon_state = "book6" +// author = "Cuban Pete" +// title = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap" +// page_link = "Guide_to_toxins" + +// /obj/item/book/manual/wiki/plumbing +// name = "Chemical Factories Without Narcotics" +// icon_state ="plumbingbook" +// author = "Nanotrasen" +// title = "Chemical Factories Without Narcotics" +// page_link = "Guide_to_plumbing" + +// /obj/item/book/manual/wiki/medical_cloning +// name = "Cloning techniques of the 26th century" +// icon_state ="bookCloning" +// author = "Medical Journal, volume 3" +// title = "Cloning techniques of the 26th century" +// page_link = "Guide_to_genetics#Cloning" diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 2dbec7311bd1..f4fbd42be38b 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -85,6 +85,85 @@ icon_state = "sabresolgov" item_state = "sabresolgov" +/obj/item/melee/sabre/suns + name = "SUNS sabre" + desc = "A blade of Solarian origin given to SUNS followers." + icon_state = "suns-sabre" + item_state = "suns-sabre" + +/obj/item/melee/sabre/suns/captain + name = "SUNS captain sabre" + desc = "An elegant blade awarded to SUNS captains. Despite its higher craftmanship, it appears to be just as effective as a normal sabre." + icon_state = "suns-capsabre" + item_state = "suns-capsabre" + +/obj/item/melee/sabre/suns/cmo + name = "SUNS stick sabre" + desc = "A thin blade used by SUNS medical instructors." + icon_state = "suns-swordstick" + item_state = "suns-swordstick" + +/obj/item/melee/sabre/suns/telescopic + name = "telescopic sabre" + desc = "A telescopic and retractable blade given to SUNS peacekeepers for easy concealment and carry. It's design makes it slightly less effective than normal sabres sadly, however it is still excelent at piercing armor." + icon_state = "suns-tsword" + item_state = "suns-tsword" + force = 0 + throwforce = 0 + block_chance = 0 + + slot_flags = ITEM_SLOT_BELT + w_class = WEIGHT_CLASS_SMALL + attack_verb = list("smacked", "prodded") + + + var/extended = FALSE + var/extend_sound = 'sound/weapons/batonextend.ogg' + + + + var/on_icon_state = "suns-tsword_ext" + var/on_item_state = "suns-tsword_ext" + var/off_icon_state = "suns-tsword" + var/off_item_state = "suns-tsword" + + var/force_on = 10 + var/on_throwforce = 10 + var/on_blockchance = 40 + + var/force_off = 0 + var/off_throwforce = 0 + var/off_blockchance = 0 + + var/weight_class_on = WEIGHT_CLASS_BULKY + +/obj/item/melee/sabre/suns/telescopic/attack_self(mob/user) + extended = !extended + + if(extended) + to_chat(user, "You extend the [src].") + icon_state = on_icon_state + item_state = on_item_state + slot_flags = 0 + w_class = weight_class_on + force = force_on + throwforce = on_throwforce + block_chance = on_blockchance + attack_verb = list("slashed", "cut") + else + to_chat(user, "You collapse the [src].") + icon_state = off_icon_state + item_state = off_item_state + slot_flags = ITEM_SLOT_BELT + w_class = WEIGHT_CLASS_SMALL + force = force_off + throwforce = off_throwforce + block_chance = off_blockchance + attack_verb = list("smacked", "prodded") + + playsound(get_turf(src), extend_sound, 50, TRUE) + add_fingerprint(user) + /obj/item/melee/beesword name = "The Stinger" desc = "Taken from a giant bee and folded over one thousand times in pure honey. Can sting through anything." diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index f12137df7531..c5ebe82f90e9 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -692,7 +692,7 @@ /obj/item/borg/sight/xray name = "\proper X-ray vision" - icon = 'icons/obj/decals.dmi' + icon = 'icons/obj/structures/signs/sign.dmi' icon_state = "securearea" sight_mode = BORGXRAY diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 84b34bed9ea7..4cf963958022 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -785,7 +785,7 @@ AddElement(/datum/element/update_icon_updates_onmob) var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 1 - STR.use_sound = null + STR.use_sound = null //if youre wondering why this is null, its so you can look in your sheath to prepare to draw, without letting anyone know youre preparing to draw it STR.max_w_class = WEIGHT_CLASS_BULKY STR.set_holdable(list( /obj/item/melee/sabre @@ -842,6 +842,90 @@ new /obj/item/melee/sabre/solgov(src) update_appearance() +/obj/item/storage/belt/sabre/suns + name = "SUNS sabre sheath" + desc = "A leather sheath designed to hold a blade." + + icon = 'icons/obj/clothing/faction/suns/belt.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/belt.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + + base_icon_state = "suns-sheath" + icon_state = "suns-sheath" + item_state = "suns-sheath" + w_class = WEIGHT_CLASS_BULKY + +/obj/item/storage/belt/sabre/suns/ComponentInitialize() + AddComponent(component_type) + AddElement(/datum/element/update_icon_updates_onmob) + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 1 + STR.use_sound = null + STR.max_w_class = WEIGHT_CLASS_BULKY + STR.set_holdable(list( + /obj/item/melee/sabre/suns + )) + +/obj/item/storage/belt/sabre/suns/PopulateContents() + new /obj/item/melee/sabre/suns(src) + update_appearance() + + +/obj/item/storage/belt/sabre/suns/captain + name = "SUNS captain's sabre sheath" + desc = "An elegant and impressively made leather sheath designed to hold a captain's blade." + + base_icon_state = "suns-capsheath" + icon_state = "suns-capsheath" + item_state = "suns-capsheath" + w_class = WEIGHT_CLASS_BULKY + +/obj/item/storage/belt/sabre/suns/captain/ComponentInitialize() + AddComponent(component_type) + AddElement(/datum/element/update_icon_updates_onmob) + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 1 + STR.use_sound = null + STR.max_w_class = WEIGHT_CLASS_BULKY + STR.set_holdable(list( + /obj/item/melee/sabre/suns/captain + )) + +/obj/item/storage/belt/sabre/suns/captain/PopulateContents() + new /obj/item/melee/sabre/suns/captain(src) + update_appearance() + +/obj/item/storage/belt/sabre/suns/cmo + name = "SUNS cane sheath" + desc = "A walking cane modified to hold a thin stick sabre. It does not fit on belts, contrary to popular belief." + slot_flags = null + + icon = 'icons/obj/clothing/faction/suns/belt.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/belt.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + + base_icon_state = "suns-cane" + icon_state = "suns-cane" + item_state = "suns-cane" + w_class = WEIGHT_CLASS_BULKY + +/obj/item/storage/belt/sabre/suns/ComponentInitialize() + AddComponent(component_type) + AddElement(/datum/element/update_icon_updates_onmob) + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 1 + STR.use_sound = null + STR.max_w_class = WEIGHT_CLASS_BULKY + STR.set_holdable(list( + /obj/item/melee/sabre/suns/cmo + )) + +/obj/item/storage/belt/sabre/suns/PopulateContents() + new /obj/item/melee/sabre/suns/cmo(src) + update_appearance() + /obj/item/storage/belt/security/webbing/inteq name = "inteq webbing" desc = "A set of tactical webbing for operators of the IRMG, can hold security gear." diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 03cff6da3f82..3bf8d8bd0dbd 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -220,7 +220,7 @@ /obj/item/wallframe/painting name = "painting frame" desc = "The perfect showcase for your favorite deathtrap memories." - icon = 'icons/obj/decals.dmi' + icon = 'icons/obj/structures/signs/sign.dmi' custom_materials = null flags_1 = 0 icon_state = "frame-empty" @@ -229,7 +229,7 @@ /obj/structure/sign/painting name = "Painting" desc = "Art or \"Art\"? You decide." - icon = 'icons/obj/decals.dmi' + icon = 'icons/obj/structures/signs/sign.dmi' icon_state = "frame-empty" var/obj/item/canvas/C var/persistence_id = "general" diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index a20702886c24..5cbc09727246 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -19,7 +19,6 @@ GLOBAL_LIST_INIT(ore_probability, list( /obj/item/tank/jetpack/suit = 10, /obj/item/survivalcapsule = 15, /obj/item/reagent_containers/hypospray/medipen/survival = 15, - /obj/item/card/mining_point_card = 15, /obj/item/gps/mining = 10, /obj/item/extraction_pack = 10, /obj/item/reagent_containers/food/drinks/beer = 15, diff --git a/code/game/objects/structures/plaques/_plaques.dm b/code/game/objects/structures/plaques/_plaques.dm index eeb477484b3b..261cec2feda8 100644 --- a/code/game/objects/structures/plaques/_plaques.dm +++ b/code/game/objects/structures/plaques/_plaques.dm @@ -1,5 +1,5 @@ /obj/structure/plaque //This is a plaque you can craft with gold, then permanently engrave a title and description on, with a fountain pen. - icon = 'icons/obj/decals.dmi' + icon = 'icons/obj/structures/signs/sign.dmi' icon_state = "blankplaque" name = "blank plaque" desc = "A blank plaque, use a fancy pen to engrave it. It can be detatched from the wall with a wrench." @@ -15,7 +15,7 @@ var/engraved = FALSE /obj/item/plaque //The item version of the above. - icon = 'icons/obj/decals.dmi' + icon = 'icons/obj/structures/signs/sign.dmi' icon_state = "blankplaque" name = "blank plaque" desc = "A blank plaque, use a fancy pen to engrave it. It can be placed on a wall." diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm index 4a2a98192243..5b6c209190bb 100644 --- a/code/game/objects/structures/signs/_signs.dm +++ b/code/game/objects/structures/signs/_signs.dm @@ -1,5 +1,5 @@ /obj/structure/sign - icon = 'icons/obj/decals.dmi' + icon = 'icons/obj/structures/signs/sign.dmi' icon_state = "backing" name = "sign backing" desc = "A plastic sign backing, use a pen to change the decal. It can be detached from the wall with a wrench." @@ -22,7 +22,7 @@ /obj/item/sign name = "sign backing" desc = "A plastic sign backing, use a pen to change the decal. It can be placed on a wall." - icon = 'icons/obj/decals.dmi' + icon = 'icons/obj/structures/signs/sign.dmi' icon_state = "backing" w_class = WEIGHT_CLASS_NORMAL custom_materials = list(/datum/material/plastic = 2000) diff --git a/code/game/objects/structures/signs/signs_flags.dm b/code/game/objects/structures/signs/signs_flags.dm new file mode 100644 index 000000000000..7832c878642a --- /dev/null +++ b/code/game/objects/structures/signs/signs_flags.dm @@ -0,0 +1,53 @@ +/obj/structure/sign/flag + name = "missing wall flag" + desc = "You forgot something." + icon_state = "flag_none" + icon = 'icons/obj/structures/signs/wallflags.dmi' + buildable_sign = FALSE + custom_materials = null + + var/item_flag = /obj/item/sign/flag + +// Stops flags from rotating like other signs, because they do that +/obj/item/sign/flag/Initialize(mapload) + . = ..() + var/matrix/rotation_reset = matrix() + rotation_reset.Turn(0) + transform = rotation_reset + +/obj/structure/sign/flag/MouseDrop(over_object, src_location, over_location) + . = ..() + if(over_object == usr && Adjacent(usr)) + if(!item_flag || src.flags_1 & NODECONSTRUCT_1) + return + if(!usr.canUseTopic(src, BE_CLOSE, NO_DEXTERITY, FALSE, TRUE)) + return + usr.visible_message(span_notice("[usr] grabs and folds \the [src.name]."), span_notice("You grab and fold \the [src.name].")) + playsound(src, "rustle", 50, TRUE, -5) + var/obj/item/flag_item = new item_flag(loc) + TransferComponents(flag_item) + usr.put_in_hands(flag_item) + qdel(src) + +// STRUCTURE FLAGS - THE WALL MOUNTS + +/obj/structure/sign/flag/gezena + name = "\improper Gezenan flag" + desc = "lizards" + icon_state = "flag_gezena" + item_flag = /obj/item/sign/flag/gezena + +// ITEM FLAGS - THE THINGS YOU HOLD AND PLACE + +/obj/item/sign/flag + name = "missing flag" + desc = "You forgot something." + icon_state = "folded_none" + icon = 'icons/obj/structures/signs/wallflags.dmi' + sign_path = /obj/structure/sign/flag + +/obj/item/sign/flag/gezena + name = "folded Gezenan flag" + desc = "lizards but folded" + icon_state = "folded_gezena" + sign_path = /obj/structure/sign/flag/gezena diff --git a/code/game/objects/structures/signs/signs_maps.dm b/code/game/objects/structures/signs/signs_maps.dm index f2ab429803c1..d9e715e38ca6 100644 --- a/code/game/objects/structures/signs/signs_maps.dm +++ b/code/game/objects/structures/signs/signs_maps.dm @@ -3,6 +3,7 @@ /obj/structure/sign/map name = "station map" desc = "A navigational chart of the station." + icon = 'icons/obj/structures/signs/directions.dmi' max_integrity = 500 /obj/structure/sign/map/left @@ -11,6 +12,11 @@ /obj/structure/sign/map/right icon_state = "map-right" +/obj/structure/sign/directions + name = "You shouldn't see this" + icon_state = "direction" + icon = 'icons/obj/structures/signs/directions.dmi' + /obj/structure/sign/directions/science name = "science department sign" desc = "A direction sign, pointing out which way the Science department is." diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm index 572e150815c6..620f1cb6126d 100644 --- a/code/game/objects/structures/spawner.dm +++ b/code/game/objects/structures/spawner.dm @@ -19,7 +19,6 @@ GLOBAL_LIST_INIT(astroloot, list( /obj/item/tank/jetpack/suit = 10, /obj/item/survivalcapsule = 15, /obj/item/reagent_containers/hypospray/medipen/survival = 15, - /obj/item/card/mining_point_card = 15, /obj/item/gps/mining = 10, /obj/item/extraction_pack = 10, /obj/item/reagent_containers/food/drinks/beer = 15, diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index a853f66963af..986399d63299 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -766,7 +766,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) set name = "Debug Stat Panel" set category = "Debug" - src << output("", "statbrowser:create_debug") + src.stat_panel.send_message("create_debug") #ifdef SENDMAPS_PROFILE /client/proc/display_sendmaps() diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 6c303cddf060..e1f88a2626b2 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -323,7 +323,7 @@ ertemplate.random_names = prefs["random_names"]["value"] == "Yes" ertemplate.spawn_admin = prefs["spawn_admin"]["value"] == "Yes" ertemplate.use_custom_shuttle = prefs["use_custom_shuttle"]["value"] == "Yes" - ertemplate.spawn_at_outpost = prefs["use_custom_shuttle"]["value"] == "Yes" + ertemplate.spawn_at_outpost = prefs["spawn_at_outpost"]["value"] == "Yes" var/list/spawnpoints = GLOB.emergencyresponseteamspawn var/index = 0 @@ -341,11 +341,6 @@ to_chat(usr, span_warning("No applicants for ERT. Aborting spawn.")) return FALSE - if(ertemplate.spawn_at_outpost && !ertemplate.use_custom_shuttle) - if(!length(GLOB.emergencyresponseteam_outpostspawn)) - message_admins("No outpost spawns found!") - spawnpoints = GLOB.emergencyresponseteam_outpostspawn - if(ertemplate.use_custom_shuttle && ertemplate.ert_template) to_chat(usr, span_boldnotice("Attempting to spawn ERT custom shuttle, this may take a few seconds...")) @@ -356,7 +351,7 @@ if(length(SSovermap.outposts) > 1) var/temp_loc = input(usr, "Select outpost to spawn at") as null|anything in SSovermap.outposts if(!temp_loc) - message_admins("ERT Shuttle found no outpost to spawn at!") + message_admins("ERT found no outpost to spawn at!") return spawn_location = temp_loc else @@ -377,7 +372,7 @@ spawn_turfs += get_turf(spawner) if(!brief_spawn) - brief_spawn = locate(/obj/effect/landmark/ert_shuttle_brief_spawn) in shuttle_turfs + brief_spawn = locate(/obj/effect/landmark/ert_shuttle_brief_spawn) in ship_turfs if(!length(spawn_turfs)) stack_trace("ERT shuttle loaded but found no spawnpoints, placing the ERT at wherever inside the shuttle instead.") @@ -386,9 +381,14 @@ continue spawn_turfs += open_turf + if(!ertemplate.use_custom_shuttle && ertemplate.spawn_at_outpost) + if(!length(GLOB.emergencyresponseteam_outpostspawn)) + message_admins("No outpost spawns found!") + spawn_turfs = GLOB.emergencyresponseteam_outpostspawn + if(ertemplate.spawn_admin) if(isobserver(usr)) - var/mob/living/carbon/human/admin_officer = new (brief_spawn || spawn_turfs || spawnpoints[1]) + var/mob/living/carbon/human/admin_officer = new (brief_spawn || spawnpoints[1]) var/chosen_outfit = usr.client?.prefs?.brief_outfit usr.client.prefs.copy_to(admin_officer) admin_officer.equipOutfit(chosen_outfit) diff --git a/code/modules/antagonists/borer/borer.dm b/code/modules/antagonists/borer/borer.dm index 41e8b644fa53..d4af47670412 100644 --- a/code/modules/antagonists/borer/borer.dm +++ b/code/modules/antagonists/borer/borer.dm @@ -52,7 +52,7 @@ B.victim.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(5, 10)) to_chat(src, "With an immense exertion of will, you regain control of your body!") to_chat(B, "You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.") - B.detatch() + B.detach() GLOBAL_LIST_EMPTY(borers) GLOBAL_VAR_INIT(total_borer_hosts_needed, 3) @@ -568,7 +568,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3) return if(controlling) - detatch() + detach() if(src.mind.language_holder) var/datum/language_holder/language_holder = src.mind.language_holder @@ -721,6 +721,8 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3) victim.med_hud_set_status() + RegisterSignal(victim, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_borer_stat_panel)) + /mob/living/simple_animal/borer/verb/punish() set category = "Borer" set name = "Punish" @@ -756,7 +758,6 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3) /mob/living/carbon/proc/release_control() - set category = "Borer" set name = "Release Control" set desc = "Release control of your host's body." @@ -764,8 +765,12 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3) var/mob/living/simple_animal/borer/B = has_brain_worms() if(B && B.host_brain) to_chat(B, "You withdraw your probosci, releasing control of [B.host_brain]") + B.detach() - B.detatch() +/mob/living/simple_animal/borer/proc/get_borer_stat_panel(mob/living/source, list/items) + SIGNAL_HANDLER + items += "Borer Body Health: [health]" + items += "Chemicals: [chemicals]" //Check for brain worms in head. /mob/proc/has_brain_worms() @@ -801,7 +806,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3) to_chat(src, "You need 200 chemicals stored to reproduce.") return -/mob/living/simple_animal/borer/proc/detatch() +/mob/living/simple_animal/borer/proc/detach() if(!victim || !controlling) return @@ -829,6 +834,8 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3) log_game("[src]/([src.ckey]) released control of [victim]/([victim.ckey]") + UnregisterSignal(victim, COMSIG_MOB_GET_STATUS_TAB_ITEMS) + qdel(host_brain) /mob/living/simple_animal/borer/proc/toggle_leap() diff --git a/code/modules/antagonists/changeling/powers/panacea.dm b/code/modules/antagonists/changeling/powers/panacea.dm index 5c1010aaf69a..573ebd127fde 100644 --- a/code/modules/antagonists/changeling/powers/panacea.dm +++ b/code/modules/antagonists/changeling/powers/panacea.dm @@ -29,7 +29,7 @@ var/mob/living/simple_animal/borer/B = user.has_brain_worms() //WS Begin - Borers if(B) if(B.controlling) - B.detatch() + B.detach() B.leave_victim() if(iscarbon(user)) var/mob/living/carbon/C = user diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index 2a07737e2c63..7bc5adc33de2 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -14,6 +14,13 @@ . += "Use it in hand to turn it off/on and Alt-click to swap between \"detect death\" mode and \"detect critical state\" mode." . += "[src.scanning ? "The sensor is on and you can see [health_scan] displayed on the screen" : "The sensor is off"]." +/obj/item/assembly/health/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change) + . = ..() + if(iscarbon(old_loc)) + UnregisterSignal(old_loc, COMSIG_MOB_GET_STATUS_TAB_ITEMS) + if(iscarbon(loc)) + RegisterSignal(loc, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item)) + /obj/item/assembly/health/activate() if(!..()) return FALSE//Cooldown check @@ -73,3 +80,7 @@ . = ..() to_chat(user, "You toggle [src] [src.scanning ? "off" : "on"].") toggle_scan() + +/obj/item/assembly/health/proc/get_status_tab_item(mob/living/carbon/source, list/items) + SIGNAL_HANDLER + items += "Health: [round((source.health / source.maxHealth) * 100)]%" diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 47ce167c7680..4095c31841b3 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -75,17 +75,15 @@ /datum/supply_pack/ammo/buckshot name = "Buckshot Crate" - desc = "Contains two boxes of buckshot for use in lethal persuasion." - cost = 2000 - contains = list(/obj/item/ammo_box/a12g, - /obj/item/ammo_box/a12g) + desc = "Contains a box of twenty-five buckshot shells for use in lethal persuasion." + cost = 500 + contains = list(/obj/item/ammo_box/a12g) /datum/supply_pack/ammo/slugs name = "Shotgun Slug Crate" - desc = "Contains two boxes of slug shells for use in lethal persuasion." - cost = 2000 - contains = list(/obj/item/ammo_box/a12g/slug, - /obj/item/ammo_box/a12g/slug) + desc = "Contains a box of twenty-five slug shells for use in lethal persuasion." + cost = 500 + contains = list(/obj/item/ammo_box/a12g/slug) /* .38 ammo @@ -94,7 +92,7 @@ /datum/supply_pack/ammo/winchester_ammo name = "Flaming Arrow and Detective Special .38 Ammo Boxes" desc = "Contains two 30 round ammo boxes for refilling .38 weapons." - cost = 1000 + cost = 500 contains = list(/obj/item/ammo_box/c38_box, /obj/item/ammo_box/c38_box) crate_name = "ammo crate" @@ -167,8 +165,8 @@ cost = 2000 /datum/supply_pack/ammo/ak47_ammo - name = "AKM 7.62x39mm FMJ Magazine Crate" - desc = "Contains two 7.62x39mm FMJ magazines for the AKM rifle, each containing twenty rounds." + name = "SVG 7.62x39mm FMJ Magazine Crate" + desc = "Contains two 7.62x39mm FMJ magazines for the SVG rifle, each containing twenty rounds." contains = list(/obj/item/ammo_box/magazine/ak47, /obj/item/ammo_box/magazine/ak47) cost = 2000 @@ -188,3 +186,98 @@ /obj/item/ammo_box/magazine/illestren_a850r, /obj/item/ammo_box/magazine/illestren_a850r) cost = 1000 + +/datum/supply_pack/ammo/a762_ammo_box + name = "7.62x39mm Ammo Box Crate" + desc = "Contains a sixty-round 7.62x39mm box for rifles like the SVG-67." + contains = list(/obj/item/ammo_box/a762_39) + cost = 500 + +/datum/supply_pack/ammo/c556mmHITP_ammo_box + name = "5.56 Caseless Ammo Box Crate" + desc = "Contains two fifty-round 5.56mm caseless boxes for SolGov sidearms like the Pistole C, for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c556mmHITP, + /obj/item/ammo_box/c556mmHITP) + cost = 500 + +/datum/supply_pack/ammo/c45_ammo_box + name = ".45 Ammo Box Crate" + desc = "Contains two fifty-round .45 boxes for pistols and SMGs like the M1911 or the C-20r, for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c45, + /obj/item/ammo_box/c45) + cost = 500 + +/datum/supply_pack/ammo/c10mm_ammo_box + name = "10mm Ammo Box Crate" + desc = "Contains two fifty-round 10mm boxes for pistols and SMGs like the Stechkin or the SkM-44(k), for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c10mm, + /obj/item/ammo_box/c10mm) + cost = 500 + +/datum/supply_pack/ammo/c9mm_ammo_box + name = "9mm Ammo Box Crate" + desc = "Contains two fifty-round 9mm boxes for pistols and SMGs such as the Commander or Saber, for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c9mm, + /obj/item/ammo_box/c9mm) + cost = 500 + +/datum/supply_pack/ammo/a308_ammo_box + name = "308 Ammo Box Crate" + desc = "Contains one thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S." + contains = list(/obj/item/ammo_box/a308) + cost = 500 + +/datum/supply_pack/ammo/c9mmap_ammo_box + name = "9mm AP Ammo Box Crate" + desc = "Contains two fifty-round 9mm boxes loaded with armor piercing ammo, for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c9mm/ap, + /obj/item/ammo_box/c9mm/ap) + cost = 1000 + +/datum/supply_pack/ammo/c556mmHITPap_ammo_box + name = "5.56 caseless AP Ammo Box Crate" + desc = "Contains two fifty-round 5.56mm caseless boxes loaded with armor piercing ammo, for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c556mmHITP/ap, + /obj/item/ammo_box/c556mmHITP/ap) + cost = 1000 + +/datum/supply_pack/ammo/c45ap_ammo_box + name = ".45 AP Ammo Box Crate" + desc = "Contains two fifty-round .45 boxes loaded with armor piercing ammo, for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c45/ap, + /obj/item/ammo_box/c45/ap) + cost = 1000 + +/datum/supply_pack/ammo/c10mmap_ammo_box + name = "10mm AP Ammo Box Crate" + desc = "Contains two fifty-round 10mm boxes loaded with armor piercing ammo, for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c10mm/ap, + /obj/item/ammo_box/c10mm/ap) + cost = 1000 + +/datum/supply_pack/ammo/c9mmhp_ammo_box + name = "9mm HP Ammo Box Crate" + desc = "Contains two fifty-round 9mm boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c9mm/hp, + /obj/item/ammo_box/c9mm/hp) + cost = 1000 + +/datum/supply_pack/ammo/c10mmhp_ammo_box + name = "10mm HP Ammo Box Crate" + desc = "Contains two fifty-round 10mm boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c10mm/hp, + /obj/item/ammo_box/c10mm/hp) + cost = 1000 +/datum/supply_pack/ammo/c45hp_ammo_box + name = ".45 HP Ammo Box Crate" + desc = "Contains two fifty-round 10mm boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c45/hp, + /obj/item/ammo_box/c45/hp) + cost = 1000 + +/datum/supply_pack/ammo/c556mmhitphp_ammo_box + name = "5.56 caseless Ammo Box Crate" + desc = "Contains two fifty-round 5.56mm caseless boxes loaded with hollow point ammo, great against unarmored targets, for a total of 100 rounds." + contains = list(/obj/item/ammo_box/c556mmHITP/hp, + /obj/item/ammo_box/c556mmHITP/hp) + cost = 1000 diff --git a/code/modules/cargo/packs/spacesuit_armor.dm b/code/modules/cargo/packs/spacesuit_armor.dm index b677cb88bc3b..c873a7e2dac4 100644 --- a/code/modules/cargo/packs/spacesuit_armor.dm +++ b/code/modules/cargo/packs/spacesuit_armor.dm @@ -136,7 +136,7 @@ /datum/supply_pack/spacesuit_armor/bullet_armor name = "Bulletproof Armor Crate" - desc = "Contains three full sets of bulletproof armor, guaranteed to reduce a bullet's stopping power by half but with limited protection against melee weaponry." + desc = "Contains two full sets of bulletproof armor, guaranteed to reduce a bullet's stopping power by half but with limited protection against melee weaponry." cost = 3500 contains = list(/obj/item/clothing/suit/armor/vest/bulletproof, /obj/item/clothing/suit/armor/vest/bulletproof, diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index de655ece5f1a..64e2476b400f 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -150,15 +150,14 @@ /// our current tab var/stat_tab - /// whether our browser is ready or not yet - var/statbrowser_ready = FALSE - /// list of all tabs var/list/panel_tabs = list() /// list of tabs containing spells and abilities var/list/spell_tabs = list() ///A lazy list of atoms we've examined in the last EXAMINE_MORE_TIME (default 1.5) seconds, so that we will call [atom/proc/examine_more()] instead of [atom/proc/examine()] on them when examining var/list/recent_examines + ///Our object window datum. It stores info about and handles behavior for the object tab + var/datum/object_window_info/obj_window var/list/parallax_layers var/list/parallax_layers_cached diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 8db2e8454828..711af230fd9d 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -80,7 +80,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(tgui_Topic(href_list)) return if(href_list["reload_statbrowser"]) - src << browse(file('html/statbrowser.html'), "window=statbrowser") + stat_panel.reinitialize() // Log all hrefs log_href("[src] (usr:[usr]\[[COORD(usr)]\]) : [hsrc ? "[hsrc] " : ""][href]") @@ -226,8 +226,12 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( GLOB.clients += src GLOB.directory[ckey] = src + // Instantiate stat panel + stat_panel = new(src, "statbrowser") + stat_panel.subscribe(src, PROC_REF(on_stat_panel_message)) + // Instantiate tgui panel - tgui_panel = new(src) + tgui_panel = new(src, "browseroutput") GLOB.ahelp_tickets.client_login(src) GLOB.interviews.client_login(src) @@ -346,9 +350,15 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(SSinput.initialized) set_macros() - // Initialize tgui panel - src << browse(file('html/statbrowser.html'), "window=statbrowser") + // Initialize stat panel + stat_panel.initialize( + inline_html = file2text('html/statbrowser.html'), + inline_js = file2text('html/statbrowser.js'), + inline_css = file2text('html/statbrowser.css'), + ) addtimer(CALLBACK(src, PROC_REF(check_panel_loaded)), 30 SECONDS) + + // Initialize tgui panel tgui_panel.initialize() if(alert_mob_dupe_login) @@ -506,6 +516,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( SSserver_maint.UpdateHubStatus() if(credits) QDEL_LIST(credits) + if(obj_window) + QDEL_NULL(obj_window) if(holder) adminGreet(1) holder.owner = null @@ -1082,12 +1094,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( var/list/verbstoprocess = verbs.Copy() if(mob?.client?.prefs.broadcast_login_logout) verbstoprocess += mob.verbs - for(var/AM in mob.contents) - var/atom/movable/thing = AM + for(var/atom/movable/thing as anything in mob.contents) verbstoprocess += thing.verbs panel_tabs.Cut() // panel_tabs get reset in init_verbs on JS side anyway - for(var/thing in verbstoprocess) - var/procpath/verb_to_init = thing + for(var/procpath/verb_to_init as anything in verbstoprocess) if(!verb_to_init) continue if(verb_to_init.hidden) @@ -1096,10 +1106,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( continue panel_tabs |= verb_to_init.category verblist[++verblist.len] = list(verb_to_init.category, verb_to_init.name) - src << output("[url_encode(json_encode(panel_tabs))];[url_encode(json_encode(verblist))]", "statbrowser:init_verbs") + src.stat_panel.send_message("init_verbs", list(panel_tabs = panel_tabs, verblist = verblist)) /client/proc/check_panel_loaded() - if(statbrowser_ready) + if(stat_panel.is_ready()) return to_chat(src, "Statpanel failed to load, click here to reload the panel ") @@ -1140,3 +1150,20 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( SSambience.ambience_listening_clients[src] = world.time + 10 SECONDS //Just wait 10 seconds before the next one aight mate? cheers. else SSambience.ambience_listening_clients -= src + +/** + * Handles incoming messages from the stat-panel TGUI. + */ +/client/proc/on_stat_panel_message(type, payload) + switch(type) + if("Update-Verbs") + init_verbs() + if("Remove-Tabs") + panel_tabs -= payload["tab"] + if("Send-Tabs") + panel_tabs |= payload["tab"] + if("Reset-Tabs") + panel_tabs = list() + if("Set-Tab") + stat_tab = payload["tab"] + SSstatpanels.immediate_send_stat_data(src) diff --git a/code/modules/client/loadout/loadout_eyewear.dm b/code/modules/client/loadout/loadout_eyewear.dm index 8da667f8819e..99e868ad0854 100644 --- a/code/modules/client/loadout/loadout_eyewear.dm +++ b/code/modules/client/loadout/loadout_eyewear.dm @@ -8,6 +8,10 @@ display_name = "glasses, prescription" path = /obj/item/clothing/glasses/regular +/datum/gear/eyewear/glasses/thin + display_name ="glasses, thin prescription" + path = /obj/item/clothing/glasses/regular/thin + /datum/gear/eyewear/glasses/large display_name = "glasses, large prescription" path = /obj/item/clothing/glasses/regular/circle @@ -16,6 +20,10 @@ display_name = "glasses, jamjar prescription" path = /obj/item/clothing/glasses/regular/jamjar +/datum/gear/eyewear/hipster_glasses + display_name = "glasses, hipster prescription" + path = /obj/item/clothing/glasses/regular/hipster + //Misc /datum/gear/eyewear/eyepatch display_name = "eyepatch" @@ -38,9 +46,7 @@ description = "A blindfold you can still see through." path = /obj/item/clothing/glasses/trickblindfold -/datum/gear/eyewear/hipster_glasses - display_name = "Hipster Glasses" - path = /obj/item/clothing/glasses/regular/hipster + /datum/gear/eyewear/glasses/cold display_name = "cold goggles" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index e73a186087f3..b52052cd15ec 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -48,7 +48,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/tgui_fancy = TRUE var/tgui_lock = FALSE var/windowflashing = TRUE - var/crew_objectives = TRUE var/toggles = TOGGLES_DEFAULT var/db_flags var/chat_toggles = TOGGLES_DEFAULT_CHAT @@ -112,6 +111,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) "squid_face" = "Squidward", "ipc_screen" = "Blue", "ipc_antenna" = "None", + "ipc_tail" = "None", "ipc_chassis" = "Morpheus Cyberkinetics (Custom)", "ipc_brain" = "Posibrain", "kepori_feathers" = "Plain", @@ -675,6 +675,19 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" mutant_category = 0 + if("ipc_tail" in pref_species.default_features) + if(!mutant_category) + dat += APPEARANCE_CATEGORY_COLUMN + + dat += "

Tail Style

" + + dat += "[features["ipc_tail"]]
" + + mutant_category++ + if(mutant_category >= MAX_MUTANT_ROWS) + dat += "" + mutant_category = 0 + if("ipc_chassis" in pref_species.default_features) if(!mutant_category) dat += APPEARANCE_CATEGORY_COLUMN @@ -1098,6 +1111,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Hide Radio Messages: [(chat_toggles & CHAT_RADIO)?"Shown":"Hidden"]
" dat += "Hide Prayers: [(chat_toggles & CHAT_PRAYER)?"Shown":"Hidden"]
" dat += "Split Admin Tabs: [(toggles & SPLIT_ADMIN_TABS)?"Enabled":"Disabled"]
" + dat += "Fast MC Refresh: [(toggles & FAST_MC_REFRESH)?"Enabled":"Disabled"]
" dat += "Ignore Being Summoned as Cult Ghost: [(toggles & ADMIN_IGNORE_CULT_GHOST)?"Don't Allow Being Summoned":"Allow Being Summoned"]
" dat += "Briefing Officer Outfit: [brief_outfit]
" if(CONFIG_GET(flag/allow_admin_asaycolor)) @@ -1913,6 +1927,14 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(new_ipc_antenna) features["ipc_antenna"] = new_ipc_antenna + if("ipc_tail") + var/new_ipc_tail + + new_ipc_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in GLOB.ipc_tail_list + + if(new_ipc_tail) + features["ipc_tail"] = new_ipc_tail + if("ipc_chassis") var/new_ipc_chassis @@ -2193,6 +2215,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) user.client.toggle_hear_radio() if("toggle_split_admin_tabs") toggles ^= SPLIT_ADMIN_TABS + if("toggle_fast_mc_refresh") + toggles ^= FAST_MC_REFRESH if("toggle_prayers") user.client.toggleprayers() if("toggle_deadmin_always") diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 7800a7b57f33..0b95e291b794 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -431,6 +431,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car READ_FILE(S["feature_squid_face"], features["squid_face"]) READ_FILE(S["feature_ipc_screen"], features["ipc_screen"]) READ_FILE(S["feature_ipc_antenna"], features["ipc_antenna"]) + READ_FILE(S["feature_ipc_tail"], features["ipc_tail"]) READ_FILE(S["feature_ipc_chassis"], features["ipc_chassis"]) READ_FILE(S["feature_ipc_brain"], features["ipc_brain"]) READ_FILE(S["feature_kepori_feathers"], features["kepori_feathers"]) @@ -541,6 +542,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car features["squid_face"] = sanitize_inlist(features["squid_face"], GLOB.squid_face_list, "Squidward") features["ipc_screen"] = sanitize_inlist(features["ipc_screen"], GLOB.ipc_screens_list) features["ipc_antenna"] = sanitize_inlist(features["ipc_antenna"], GLOB.ipc_antennas_list) + features["ipc_tail"] = sanitize_inlist(features["ipc_tail"], GLOB.ipc_tail_list) features["ipc_chassis"] = sanitize_inlist(features["ipc_chassis"], GLOB.ipc_chassis_list) features["ipc_brain"] = sanitize_inlist(features["ipc_brain"], GLOB.ipc_brain_list) features["kepori_feathers"] = sanitize_inlist(features["kepori_feathers"], GLOB.kepori_feathers_list, "Plain") @@ -618,6 +620,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["feature_squid_face"] , features["squid_face"]) WRITE_FILE(S["feature_ipc_screen"] , features["ipc_screen"]) WRITE_FILE(S["feature_ipc_antenna"] , features["ipc_antenna"]) + WRITE_FILE(S["feature_ipc_tail"] , features["ipc_tail"]) WRITE_FILE(S["feature_ipc_chassis"] , features["ipc_chassis"]) WRITE_FILE(S["feature_ipc_brain"] , features["ipc_brain"]) WRITE_FILE(S["feature_kepori_feathers"] , features["kepori_feathers"]) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 9a5ad91cef0e..b1e1cc1f2105 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -35,13 +35,6 @@ var/pocket_storage_component_path - //These allow head/mask items to dynamically alter the user's hair - // and facial hair, checking hair_extensions.dmi and facialhair_extensions.dmi - // for a state matching hair_state+dynamic_hair_suffix - // THESE OVERRIDE THE HIDEHAIR FLAGS - var/dynamic_hair_suffix = ""//head > mask for head hair - var/dynamic_fhair_suffix = ""//mask > head for facial hair - ///These are armor values that protect the wearer, taken from the clothing's armor datum. List updates on examine because it's currently only used to print armor ratings to chat in Topic(). var/list/armor_list = list() ///These are armor values that protect the clothing, taken from its armor datum. List updates on examine because it's currently only used to print armor ratings to chat in Topic(). diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm index 6d2e11ea0010..5dd227a4d323 100644 --- a/code/modules/clothing/factions/gezena.dm +++ b/code/modules/clothing/factions/gezena.dm @@ -13,13 +13,13 @@ armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) /obj/item/clothing/under/gezena/captain - name = "gezenan captain's navywear" + name = "\improper Gezenan captain's navywear" desc = "A refined variation of the basic navywear, sporting sleek silver trim." icon_state = "captain" item_state = "bluejump" /obj/item/clothing/under/gezena/marine - name = "gezenan marine fatigue" + name = "\improper Gezenan marine fatigue" desc = "Rough inside and out, these fatigues have seen their fair share." icon_state = "marine" item_state = "marinejump" @@ -77,7 +77,7 @@ /obj/item/clothing/suit/armor/gezena/captain name = "captain's navywear coat" - desc = "Blood resistant, with silver trim to denote status. Lined with softer material." + desc = "Sleek, blood-resisting silver lines the inside and out of this coat, with a luxurious, soft internal lining." icon_state = "captaincoat" item_state = "captaincoat" @@ -245,7 +245,7 @@ icon_state = "medpouches" item_state = "whitecloth" -//Capes +//Cloaks /obj/item/clothing/neck/cloak/gezena name = "\improper Aziulhauz" @@ -270,7 +270,7 @@ item_state = "blackcloth" /obj/item/clothing/neck/cloak/gezena/captain - name = "captain's Azuilhauz" + name = "officer's Azuilhauz" desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a high ranking officer." icon_state = "captaincape" item_state = "blackcloth" diff --git a/code/modules/clothing/factions/suns.dm b/code/modules/clothing/factions/suns.dm index 019cb82224d9..df6d831e479b 100644 --- a/code/modules/clothing/factions/suns.dm +++ b/code/modules/clothing/factions/suns.dm @@ -171,6 +171,9 @@ mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi' lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + body_parts_covered = CHEST|GROIN|ARMS|LEGS + cold_protection = CHEST|GROIN|LEGS|ARMS + heat_protection = CHEST|GROIN|LEGS|ARMS /obj/item/clothing/suit/armor/vest/bulletproof/suns/hos name = "gilded peacekeeper plating" @@ -192,6 +195,9 @@ armor = list("melee" = 15, "bullet" = 30, "laser" = 10, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 25) lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + body_parts_covered = CHEST|GROIN|ARMS|LEGS + cold_protection = CHEST|GROIN|LEGS|ARMS + heat_protection = CHEST|GROIN|LEGS|ARMS /obj/item/clothing/suit/armor/vest/bulletproof/suns/captain name = "decorated academic coat" @@ -337,6 +343,7 @@ icon_state = "sunsvisor" item_state = "suns_pkhelmet" tint = 0 + armor = list("melee" = 15, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) // identical stats to bulletproof helmet, as chest matches bulletproof vest clothing_flags = BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //Why? Because I'm not giving PK's sec masks nor hud sunglasses. icon = 'icons/obj/clothing/faction/suns/head.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi' diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 8245a3333e4c..6b289f944b8b 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -85,6 +85,7 @@ attack_verb = list("sliced") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = IS_SHARP + custom_price = 500 /obj/item/clothing/glasses/science name = "science goggles" @@ -213,6 +214,11 @@ icon_state = "circle_glasses" item_state = "circle_glasses" +/obj/item/clothing/glasses/regular/thin + name = "thin glasses" + desc = "More expensive, more fragile and much less practical, but oh so fashionable." + icon_state = "thin_glasses" + //Here lies green glasses, so ugly they died. RIP /obj/item/clothing/glasses/sunglasses diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index 69646a100668..11deb4ac8b53 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -7,17 +7,10 @@ slot_flags = ITEM_SLOT_HEAD var/blockTracking = 0 //For AI tracking var/can_toggle = null - dynamic_hair_suffix = "+generic" greyscale_icon_state = "hat" greyscale_colors = list(list(16,26)) supports_variations = VOX_VARIATION -/obj/item/clothing/head/Initialize() - . = ..() - if(ishuman(loc) && dynamic_hair_suffix) - var/mob/living/carbon/human/H = loc - H.update_hair() - ///Special throw_impact for hats to frisbee hats at people to place them on their heads/attempt to de-hat them. /obj/item/clothing/head/throw_impact(atom/hit_atom, datum/thrownthing/thrownthing) . = ..() diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index f058049d7d3e..68c840d4f8fc 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -4,8 +4,6 @@ desc = "A red beret." icon_state = "beret" dog_fashion = /datum/dog_fashion/head/beret - dynamic_hair_suffix = "+generic" - dynamic_fhair_suffix = "+generic" /obj/item/clothing/head/beret/vintage name = "vintage beret" diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 55b2a117dccf..7dbe408eb39a 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -21,7 +21,6 @@ desc = "A rare chef's hat meant for hat collectors!" icon_state = "chef" item_state = "chef" - dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/chef @@ -50,7 +49,6 @@ name = "collectable police officer's hat" desc = "A collectable police officer's Hat. This hat emphasizes that you are THE LAW." icon_state = "policehelm" - dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/warden @@ -74,7 +72,6 @@ icon_state = "headslime" item_state = "headslime" clothing_flags = SNUG_FIT - dynamic_hair_suffix = "" /obj/item/clothing/head/collectable/flatcap name = "collectable flat cap" @@ -95,7 +92,6 @@ desc = "The fur feels... a bit too realistic." icon_state = "kitty" item_state = "kitty" - dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/kitty @@ -104,7 +100,6 @@ desc = "Not as lucky as the feet!" icon_state = "bunny" item_state = "bunny" - dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/rabbit @@ -128,7 +123,6 @@ name = "collectable HoS hat" desc = "Now you too can beat prisoners, set silly sentences, and arrest for no reason!" icon_state = "hoscap" - dynamic_hair_suffix = "" /obj/item/clothing/head/collectable/HoP name = "collectable HoP hat" diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 7885e4636823..0eba8a277915 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -20,7 +20,6 @@ actions_types = list(/datum/action/item_action/toggle_helmet_light) clothing_flags = SNUG_FIT resistance_flags = FIRE_PROOF - dynamic_hair_suffix = "+generic" light_system = MOVABLE_LIGHT_DIRECTIONAL light_range = 4 light_power = 0.8 diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index e6400198864e..1b3b5b3f8137 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -332,7 +332,6 @@ name = "police officer's hat" desc = "A police officer's Hat. This hat emphasizes that you are THE LAW." icon_state = "policehelm" - dynamic_hair_suffix = "" /obj/item/clothing/head/helmet/constable name = "constable helmet" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 0bc61bebed49..a9617c167ddb 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -12,7 +12,6 @@ desc = "The commander in chef's head wear." strip_delay = 10 equip_delay_other = 10 - dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/chef //Captain diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 00ece5eeeb1f..f7eaea40ee56 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -65,7 +65,6 @@ name = "nurse's hat" desc = "It allows quick identification of trained medical personnel." icon_state = "nursehat" - dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/nurse @@ -124,7 +123,6 @@ name = "rabbit ears" desc = "A headband with a pair of faux rabbit ears." icon_state = "bunny" - dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/rabbit @@ -165,14 +163,12 @@ desc = "Yarr." icon_state = "bandana" item_state = "bandana" - dynamic_hair_suffix = "" /obj/item/clothing/head/bowler name = "bowler-hat" desc = "Gentleman, elite aboard!" icon_state = "bowler" item_state = "bowler" - dynamic_hair_suffix = "" /obj/item/clothing/head/witchwig name = "witch costume wig" @@ -287,7 +283,6 @@ w_class = WEIGHT_CLASS_SMALL attack_verb = list("warned", "cautioned", "smashed") resistance_flags = NONE - dynamic_hair_suffix = "" /obj/item/clothing/head/santa name = "santa hat" @@ -302,7 +297,6 @@ name = "jester hat" desc = "A hat with bells, to add some merriness to the suit." icon_state = "jester_hat" - dynamic_hair_suffix = "" /obj/item/clothing/head/jester/alt icon_state = "jester2" @@ -329,7 +323,6 @@ desc = "A crown fit for a king, a petty king maybe." icon_state = "crown" resistance_flags = FIRE_PROOF - dynamic_hair_suffix = "" /obj/item/clothing/head/crown/fancy name = "magnificent crown" @@ -374,7 +367,6 @@ name = "french beret" desc = "A quality beret, infused with the aroma of chain-smoking, wine-swilling Parisians. You feel less inclined to engage in military conflict, for some reason." icon_state = "beret" - dynamic_hair_suffix = "" /obj/item/clothing/head/frenchberet/equipped(mob/M, slot) . = ..() @@ -437,7 +429,6 @@ item_state = "shrine_wig" worn_x_dimension = 64 worn_y_dimension = 64 - dynamic_hair_suffix = "" /obj/item/clothing/head/intern name = "\improper CentCom Head Intern beancap" @@ -484,8 +475,6 @@ name = "cowboy hat" desc = "A classic stetson hat, made from real imitation leather! Wearing it gives you a strong urge to yeehaw." icon_state = "cowboy" - dynamic_fhair_suffix = "+generic" - dynamic_fhair_suffix = "+generic" dog_fashion = /datum/dog_fashion/head/cowboy diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index eeea7622b4d9..b9e828ab3974 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -167,7 +167,6 @@ desc = "A pair of kitty ears. Meow!" icon_state = "kitty" color = "#999999" - dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/kitty @@ -190,7 +189,6 @@ flags_inv = 0 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) light_range = 1 //luminosity when on - dynamic_hair_suffix = "" dog_fashion = /datum/dog_fashion/head/reindeer diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 9d1bdc939fd3..34e77816c941 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -80,6 +80,7 @@ strip_delay = 60 /obj/item/clothing/mask/gas/syndicate/voicechanger + desc = "A close-fitting tactical mask that can be connected to an air supply. This one has an integrated voice changer." var/voice_change = 1 /obj/item/clothing/mask/gas/clown_hat diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm index ab256d094a38..99d4f2e5d129 100644 --- a/code/modules/clothing/outfits/ert/syndicate_ert.dm +++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm @@ -160,7 +160,7 @@ jobtype = /datum/job/head_of_personnel job_icon = "syndicate" - uniform = /obj/item/clothing/under/syndicate/officer + uniform = /obj/item/clothing/under/syndicate/ngr/officer head = /obj/item/clothing/head/HoS/beret/syndicate mask = null belt = /obj/item/clipboard diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm index b5b077fa63f7..f34353c0e2df 100644 --- a/code/modules/clothing/outfits/factions/gezena.dm +++ b/code/modules/clothing/outfits/factions/gezena.dm @@ -8,13 +8,151 @@ return H.faction |= list(FACTION_PLAYER_GEZENA) +//Playable Roles (put in ships): /datum/outfit/job/gezena/assistant - name = "PGF - Deckhand" + name = "PGF - Crewman" jobtype = /datum/job/assistant job_icon = "assistant" + uniform = /obj/item/clothing/under/gezena + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena + +/datum/outfit/job/gezena/engineer + name = "PGF - Navy Engineer" + jobtype = /datum/job/engineer + job_icon = "stationengineer" + + uniform = /obj/item/clothing/under/gezena + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena/engi + +/datum/outfit/job/gezena/doctor + name = "PGF - Navy Doctor" + jobtype = /datum/job/doctor + job_icon = "medicaldoctor" + + uniform = /obj/item/clothing/under/gezena + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena/med + +/datum/outfit/job/gezena/security + name = "PGF - Marine" + jobtype = /datum/job/officer + job_icon = "securityofficer" + + uniform = /obj/item/clothing/under/gezena/marine + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena + +/datum/outfit/job/gezena/hos + name = "PGF - Marine Sergeant" + jobtype = /datum/job/hos + job_icon = "headofsecurity" + + uniform = /obj/item/clothing/under/gezena/marine + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena/captain + +/datum/outfit/job/gezena/captain + name = "PGF - Captain" + jobtype = /datum/job/captain + job_icon = "captain" + + uniform = /obj/item/clothing/under/gezena/captain + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena/captain + +//Adminspawn Roles (for events): + +/datum/outfit/job/gezena/assistant/geared + name = "PGF - Crewman - Equipped" + jobtype = /datum/job/assistant + job_icon = "assistant" + + uniform = /obj/item/clothing/under/gezena + suit = /obj/item/clothing/suit/armor/gezena + head = /obj/item/clothing/head/gezena + gloves = /obj/item/clothing/gloves/gezena + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena + +/datum/outfit/job/gezena/engineer/geared + name = "PGF - Navy Engineer - Equipped" + jobtype = /datum/job/engineer + job_icon = "stationengineer" + + uniform = /obj/item/clothing/under/gezena + suit = /obj/item/clothing/suit/armor/gezena/engi head = /obj/item/clothing/head/gezena + belt = /obj/item/storage/belt/utility/full/engi + gloves = /obj/item/clothing/gloves/gezena/engi + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena/engi + +/datum/outfit/job/gezena/doctor/geared + name = "PGF - Navy Doctor - Equipped" + jobtype = /datum/job/doctor + job_icon = "medicaldoctor" + uniform = /obj/item/clothing/under/gezena - suit = /obj/item/clothing/suit/toggle/gezena + suit = /obj/item/clothing/suit/armor/gezena + head = /obj/item/clothing/head/gezena/medic gloves = /obj/item/clothing/gloves/gezena shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena/med + +/datum/outfit/job/gezena/security/geared + name = "PGF - Marine - Equipped" + jobtype = /datum/job/officer + job_icon = "securityofficer" + + uniform = /obj/item/clothing/under/gezena/marine + suit = /obj/item/clothing/suit/armor/gezena/marine + head = /obj/item/clothing/head/helmet/gezena + belt = /obj/item/storage/belt/military/gezena + gloves = /obj/item/clothing/gloves/gezena/marine + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena + r_hand = /obj/item/gun/energy/kalix/pgf/heavy + +/datum/outfit/job/gezena/hos/geared + name = "PGF - Marine Sergeant - Equipped" + jobtype = /datum/job/hos + job_icon = "headofsecurity" + + uniform = /obj/item/clothing/under/gezena/marine + suit = /obj/item/clothing/suit/armor/gezena/marine + head = /obj/item/clothing/head/helmet/gezena + belt = /obj/item/storage/belt/military/gezena + gloves = /obj/item/clothing/gloves/gezena/marine + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena/captain + r_hand = /obj/item/gun/energy/kalix/pgf + +/datum/outfit/job/gezena/paramedic + name = "PGF - Marine Medic - Equipped" + jobtype = /datum/job/paramedic + job_icon = "paramedic" + + uniform = /obj/item/clothing/under/gezena/marine + suit = /obj/item/clothing/suit/armor/gezena/marine + head = /obj/item/clothing/head/helmet/gezena + belt = /obj/item/storage/belt/medical/gezena + gloves = /obj/item/clothing/gloves/gezena/marine + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena/med + r_hand = /obj/item/gun/energy/kalix/pgf + + +/datum/outfit/job/gezena/captain/geared + name = "PGF - Captain - Equipped" + jobtype = /datum/job/captain + job_icon = "captain" + + uniform = /obj/item/clothing/under/gezena/captain + suit = /obj/item/clothing/suit/armor/gezena/captain + head = /obj/item/clothing/head/gezena/captain + gloves = /obj/item/clothing/gloves/gezena/captain + shoes = /obj/item/clothing/shoes/combat/gezena + neck = /obj/item/clothing/neck/cloak/gezena/captain diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 45b2d4a59920..384a50c75db4 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -77,16 +77,15 @@ /datum/outfit/job/syndicate/assistant/twink name = "Syndicate - Deck Assistant (Twinkleshine)" - uniform = /obj/item/clothing/under/syndicate/intern + uniform = /obj/item/clothing/under/syndicate + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + id = /obj/item/card/id/syndicate_command/crew_id + belt = null shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - ears = /obj/item/radio/headset/syndicate/alt - mask = /obj/item/clothing/mask/chameleon - r_pocket = /obj/item/kitchen/knife/combat/survival - back = /obj/item/storage/backpack - belt = /obj/item/storage/belt/military/assault + gloves = null + ears = null implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id/syndicate_command/crew_id + backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -181,7 +180,6 @@ backpack_contents = list(/obj/item/storage/box/beanbag=1) shoes = /obj/item/clothing/shoes/laceup - /datum/outfit/job/syndicate/bartender/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() @@ -190,18 +188,19 @@ W.registered_age = AGE_MINOR to_chat(H, "You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!") - /datum/outfit/job/syndicate/bartender/twink - name = "Syndicate - Bartender (Twinkleshine)" + name = "Syndicate - Bartender (Twinkleshine, Donk)" uniform = /obj/item/clothing/under/syndicate/donk - shoes = /obj/item/clothing/shoes/laceup - gloves = /obj/item/clothing/gloves/color/white - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/chameleon - belt = /obj/item/storage/belt/bandolier - implants = list(/obj/item/implant/weapons_auth) id = /obj/item/card/id/syndicate_command/crew_id + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + suit = null + belt = null + head = null + shoes = /obj/item/clothing/shoes/laceup + gloves = null + ears = null + backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -241,7 +240,7 @@ duffelbag = /obj/item/storage/backpack/duffelbag courierbag = /obj/item/storage/backpack/messenger -//Capitan +//Captain /datum/outfit/job/syndicate/captain name = "Syndicate - Captain" @@ -250,7 +249,7 @@ id = /obj/item/card/id/syndicate_command/captain_id ears = /obj/item/radio/headset/syndicate/alt/captain - uniform = /obj/item/clothing/under/syndicate/officer + uniform = /obj/item/clothing/under/syndicate/ngr/officer shoes = /obj/item/clothing/shoes/jackboots head = /obj/item/clothing/head/HoS/syndicate gloves = /obj/item/clothing/gloves/combat @@ -265,22 +264,21 @@ box = /obj/item/storage/box/survival/syndie /datum/outfit/job/syndicate/captain/aclf - name = "Syndicate - Captain (ACLF)" + name = "Captain (ACLF)" + /datum/outfit/job/syndicate/captain/twink - name = "Syndicate - Captain (Twinkleshine)" + name = "Flotilla Admiral (Twinkleshine, ACLF)" - uniform = /obj/item/clothing/under/syndicate/officer - gloves = /obj/item/clothing/gloves/combat + uniform = /obj/item/clothing/under/syndicate/ngr/officer + head = null + gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/combat ears = /obj/item/radio/headset/syndicate/alt/captain - mask = /obj/item/clothing/mask/chameleon - l_pocket = /obj/item/melee/transforming/energy/sword/saber/red - suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate - suit_store = /obj/item/gun/ballistic/revolver/mateba - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/military/assault - glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + suit = null + belt = null + backpack_contents = null implants = list(/obj/item/implant/weapons_auth) @@ -291,10 +289,10 @@ /datum/outfit/job/syndicate/captain/gorlex name = "Syndicate - Captain (Gorlex Marauders)" - uniform = /obj/item/clothing/under/syndicate/officer + uniform = /obj/item/clothing/under/syndicate/ngr/officer head = /obj/item/clothing/head/caphat/gorlexcap - suit = /obj/item/clothing/suit/gorlex + suit = /obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain /datum/outfit/job/syndicate/captain/cybersun name = "Syndicate - Captain (Cybersun)" @@ -312,6 +310,7 @@ head = /obj/item/clothing/head/suns/captain gloves = /obj/item/clothing/gloves/suns/captain suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/captain + belt = /obj/item/storage/belt/sabre/suns/captain mask = /obj/item/clothing/mask/breath/suns neck = /obj/item/clothing/neck/cloak/suns/cap @@ -441,6 +440,7 @@ l_pocket = /obj/item/pinpointer/crew suit = /obj/item/clothing/suit/toggle/labcoat/suns/cmo l_hand = /obj/item/storage/firstaid/medical + r_hand = /obj/item/storage/belt/sabre/suns/cmo suit_store = /obj/item/flashlight/pen backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) gloves = /obj/item/clothing/gloves/color/latex/nitrile/suns @@ -460,7 +460,7 @@ job_icon = "headofpersonnel" ears = /obj/item/radio/headset/syndicate/alt - uniform = /obj/item/clothing/under/syndicate/aclfgrunt + uniform = /obj/item/clothing/under/syndicate/ngr shoes = /obj/item/clothing/shoes/jackboots head = /obj/item/clothing/head/HoS/beret/syndicate gloves = /obj/item/clothing/gloves/color/white @@ -488,6 +488,7 @@ uniform = /obj/item/clothing/under/syndicate/suns/xo suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/xo + belt = /obj/item/storage/belt/sabre/suns shoes = /obj/item/clothing/shoes/combat/suns head = /obj/item/clothing/head/suns gloves = /obj/item/clothing/gloves/suns/xo @@ -523,22 +524,25 @@ name = "Syndicate - Sergeant (Gorlex)" /datum/outfit/job/syndicate/hos/twink - name = "Syndicate - Lieutenant (Twinkleshine)" + name = "Syndicate - Lieutenant (Twinkleshine, NGR)" + job_icon = "lieutenant" - uniform = /obj/item/clothing/under/syndicate/officer - head = /obj/item/clothing/head/HoS/beret/syndicate - ears = /obj/item/radio/headset/syndicate/alt - mask = /obj/item/clothing/mask/chameleon + uniform = /obj/item/clothing/under/syndicate/ngr/officer + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + id = /obj/item/card/id/syndicate_command/lieutenant + head = null + ears = null gloves = /obj/item/clothing/gloves/combat - l_pocket = /obj/item/gun/ballistic/automatic/pistol - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/military/assault + l_pocket = null + r_pocket = null + belt = null shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/armor/vest - alt_suit = /obj/item/clothing/suit/gorlex - id = /obj/item/card/id/syndicate_command/lieutenant + suit = null + suit_store = null + alt_suit = null implants = list(/obj/item/implant/weapons_auth) - backpack_contents = list(/obj/item/melee/baton) + + backpack_contents = null backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -551,15 +555,16 @@ . = ..() assign_codename(H) -/datum/outfit/job/syndicate/hos/suns/ +/datum/outfit/job/syndicate/hos/suns name = "Syndicate - Senior Peacekeeper (SUNS)" uniform = /obj/item/clothing/under/syndicate/suns/pkuniform suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/hos + belt = /obj/item/melee/sabre/suns/telescopic gloves = /obj/item/clothing/gloves/tackler/dolphin/suns shoes = /obj/item/clothing/shoes/combat/suns head = /obj/item/clothing/head/welding/suns/hos glasses = /obj/item/clothing/glasses/hud/security/suns - suit_store = /obj/item/gun/ballistic/automatic/powered/gauss/modelh + suit_store = /obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns backpack = /obj/item/storage/backpack satchel = /obj/item/storage/backpack/satchel @@ -571,6 +576,20 @@ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos head = /obj/item/clothing/head/HoS/syndicate/suns +/datum/outfit/job/syndicate/hos/suns/twink + name = "Syndicate - Redshield Officer (Twinkleshine, SUNS)" + + suit = null + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + ears = null + head = null + suit_store = null + glasses = null + +/datum/outfit/job/syndicate/hos/suns/twink/post_equip(mob/living/carbon/human/H) + . = ..() + assign_codename(H) + //medical doctors (assorted) /datum/outfit/job/syndicate/doctor @@ -653,22 +672,25 @@ suit = /obj/item/clothing/suit/toggle/labcoat/raincoat /datum/outfit/job/syndicate/paramedic/twink - name = "Syndicate - Medic (Twinkleshine)" + name = "Syndicate - Medic (Twinkleshine, Cybersun)" + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + uniform = /obj/item/clothing/under/rank/medical/doctor/red + id = /obj/item/card/id/syndicate_command/crew_id/med + belt = null + head = null gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil - uniform = /obj/item/clothing/under/syndicate/medic - glasses = /obj/item/clothing/glasses/hud/health - belt = /obj/item/storage/belt/medical - back = /obj/item/storage/backpack/duffelbag/syndie/med shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/longcoat/roboblack - alt_suit = /obj/item/clothing/suit/toggle/labcoat + suit = null + alt_suit = null suit_store = null - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/chameleon - id = /obj/item/card/id/syndicate_command/crew_id/med + ears = null + l_pocket = null + r_pocket = null implants = list(/obj/item/implant/weapons_auth) + backpack_contents = null + backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med @@ -805,19 +827,22 @@ /datum/outfit/job/syndicate/security/twink name = "Syndicate - Operative (Twinkleshine)" + uniform = /obj/item/clothing/under/syndicate/combat - ears = /obj/item/radio/headset/syndicate/alt - mask = /obj/item/clothing/mask/chameleon - gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat - l_pocket = /obj/item/gun/ballistic/automatic/pistol - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/military/assault + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger id = /obj/item/card/id/syndicate_command/crew_id + head = null + ears = null + suit = null + belt = null + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/combat + l_pocket = null + r_pocket = null implants = list(/obj/item/implant/weapons_auth) - backpack_contents = list(/obj/item/gun_voucher/syndicate=1) - head = null + backpack_contents = null + backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec duffelbag = /obj/item/storage/backpack/duffelbag/syndie @@ -834,7 +859,7 @@ uniform = /obj/item/clothing/under/syndicate/suns/pkuniform suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns alt_suit = /obj/item/clothing/suit/toggle/suns/pkcoat - belt = null + belt = /obj/item/melee/sabre/suns/telescopic gloves = /obj/item/clothing/gloves/tackler/dolphin/suns shoes = /obj/item/clothing/shoes/jackboots/suns/long head = /obj/item/clothing/head/welding/suns @@ -872,18 +897,18 @@ ears = /obj/item/radio/headset/alt /datum/outfit/job/syndicate/miner/twink - name = "Syndicate - Miner (Twinkleshine)" + name = "Syndicate - Miner (Twinkleshine, SUNS)" - uniform = /obj/item/clothing/under/syndicate/gorlex - shoes = /obj/item/clothing/shoes/workboots - glasses = /obj/item/clothing/glasses/meson/night - gloves = /obj/item/clothing/gloves/explorer - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/chameleon - r_pocket = /obj/item/kitchen/knife/combat/survival - belt = /obj/item/storage/belt/mining/alt - implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id/syndicate_command/crew_id/engi + uniform = /obj/item/clothing/under/syndicate/suns/workerjumpsuit + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + id = /obj/item/card/id/syndicate_command/crew_id + shoes = /obj/item/clothing/shoes/jackboots/suns + glasses = null + gloves = null + ears = null + r_pocket = null + l_pocket = null + belt = null backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec @@ -928,7 +953,7 @@ job_icon = "stationengineer" id = /obj/item/card/id/syndicate_command/crew_id - uniform = /obj/item/clothing/under/syndicate/aclfgrunt + uniform = /obj/item/clothing/under/syndicate/ngr accessory = /obj/item/clothing/accessory/armband/engine glasses = /obj/item/clothing/glasses/sunglasses shoes = /obj/item/clothing/shoes/jackboots @@ -958,23 +983,23 @@ glasses = null /datum/outfit/job/syndicate/engineer/twink - name = "Syndicate - Ship Engineer (Twinkleshine)" + name = "Syndicate - Ship Engineer (Twinkleshine, GEC)" uniform = /obj/item/clothing/under/syndicate/gec + id = /obj/item/card/id/syndicate_command/crew_id/engi + mask = /obj/item/clothing/mask/gas/syndicate/voicechanger + ears = null accessory = null - glasses = /obj/item/clothing/glasses/meson/night - head = /obj/item/clothing/head/hardhat/orange - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - ears = /obj/item/radio/headset/syndicate - mask = /obj/item/clothing/mask/chameleon - back = /obj/item/storage/backpack/industrial - belt = /obj/item/storage/belt/utility/syndicate + glasses = null + head = null + gloves = /obj/item/clothing/gloves/tackler/combat + belt = null shoes = /obj/item/clothing/shoes/combat - suit = /obj/item/clothing/suit/hazardvest - alt_suit = /obj/item/clothing/suit/toggle/hazard + suit = null + alt_suit = null + l_pocket = null + r_pocket = null implants = list(/obj/item/implant/weapons_auth) - id = /obj/item/card/id/syndicate_command/crew_id/engi - backpack_contents = list(/obj/item/construction/rcd/combat, /obj/item/rcd_ammo/large) box = /obj/item/storage/box/survival/syndie diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 7448dc8cbcbe..4b19735b5f62 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -9,8 +9,6 @@ permeability_coefficient = 0.01 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 70) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR - dynamic_hair_suffix = "" - dynamic_fhair_suffix = "" cold_protection = HEAD min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT heat_protection = HEAD diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 8a74e555469a..aa0367f12ead 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -60,8 +60,6 @@ Contains: desc = "An armored beret commonly used by special operations officers. Uses advanced force field technology to protect the head from space." icon_state = "beret_badge" greyscale_colors = "#397F3F#FFCE5B" - dynamic_hair_suffix = "+generic" - dynamic_fhair_suffix = "+generic" flags_inv = 0 armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 60, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) strip_delay = 130 @@ -317,7 +315,7 @@ Contains: light_system = NO_LIGHT_SUPPORT light_range = 0 //luminosity when on actions_types = list() - flags_inv = HIDEEARS|HIDEHAIR|HIDEFACIALHAIR //facial hair will clip with the helm, this'll need a dynamic_fhair_suffix at some point. + flags_inv = HIDEEARS|HIDEHAIR|HIDEFACIALHAIR /obj/item/clothing/head/helmet/space/hardsuit/carp/Initialize() . = ..() diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 1987a16501bd..5042511d14d3 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -150,7 +150,16 @@ /obj/item/clothing/suit/armor/vest/capcarapace/cybersun name = "Cybersun captain's haori" desc = "An extraordinarily fashionable haori, utilized by Cybersun captains. Weaved with armored fabric to protect the user from gunshots." - icon_state = "cybersunhaori" + icon_state = "carapace_cybersun" + +/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain + name = "\improper 2nd Battlegroup jacket" + desc = "An armored jacket worn by the New Gorlex Republic's 2nd Battlegroup." + body_parts_covered = CHEST|GROIN|ARMS|HANDS + icon_state = "carapace_ngr" + item_state = "carapace_ngr" + blood_overlay_type = "coat" + armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) /obj/item/clothing/suit/armor/vest/capcarapace/alt name = "captain's parade jacket" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 59b252a9836a..51bf34b57732 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -310,7 +310,6 @@ body_parts_covered = HEAD clothing_flags = THICKMATERIAL flags_inv = HIDEHAIR|HIDEEARS - dynamic_hair_suffix = "" /obj/item/clothing/suit/hooded/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!? name = "bloated human suit" @@ -685,12 +684,3 @@ icon_state = "DutchJacket" item_state = "DutchJacket" body_parts_covered = ARMS - -/obj/item/clothing/suit/gorlex - name = "\improper 2nd Battlegroup jacket" - desc = "An armored jacket worn by the 2nd Battlegroup." - body_parts_covered = CHEST|GROIN|ARMS|HANDS - icon_state = "gorlexjacket" - item_state = "gorlexjacket" - blood_overlay_type = "coat" - armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 4255335cda74..0eb5a90676c6 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -75,7 +75,6 @@ /obj/item/clothing/head/hooded var/obj/item/clothing/suit/hooded/suit - dynamic_hair_suffix = "" /obj/item/clothing/head/hooded/Destroy() suit = null diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 5a1810e1fba1..ac91351c2324 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -61,8 +61,6 @@ clothing_flags = THICKMATERIAL | SNUG_FIT armor = list("melee" = 20, "bullet" = 0, "laser" = 20,"energy" = 30, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) flags_inv = HIDEFACE|HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR - dynamic_hair_suffix = "" - dynamic_fhair_suffix = "" cold_protection = HEAD min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT heat_protection = HEAD diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 01ed8b5a082a..36cc7c96220e 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -93,18 +93,18 @@ armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) alt_covers_chest = TRUE -/obj/item/clothing/under/syndicate/officer - name = "syndicate officer uniform" - desc = "A black uniform worn by officers of many branches of the Syndicate." - icon_state = "officer" +/obj/item/clothing/under/syndicate/ngr/officer + name = "NGR officer uniform" + desc = "A black uniform worn by officers of the New Gorlex Republic." + icon_state = "ngr_officer" can_adjust = FALSE armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) alt_covers_chest = TRUE -/obj/item/clothing/under/syndicate/aclfgrunt - name = "ACLF uniform" - desc = "A button-up in a tasteful shade of gray with red pants, used as the uniform of the Anti-Corporate Liberation front on the rim." - icon_state = "aclfgrunt" +/obj/item/clothing/under/syndicate/ngr + name = "NGR uniform" + desc = "A button-up in a tasteful shade of gray with red pants, used as the basic uniform of the New Gorlex Republic." + icon_state = "ngr_grunt" can_adjust = FALSE armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) alt_covers_chest = TRUE diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 08a87b6f9193..64bb4fdae667 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -254,13 +254,26 @@ list_reagents = list(/datum/reagent/consumable/tea = 30) /obj/item/reagent_containers/food/drinks/mug/coco - name = "Dutch hot coco" - desc = "Made in Space South America." + name = "Pearl Hot Chocolate" + desc = "A rich delicacy from the humid regions of Terra." list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5) foodtype = SUGAR resistance_flags = FREEZE_PROOF custom_price = 120 +/obj/item/reagent_containers/food/drinks/cafelatte + name = "cafe latte" + desc = "A nice, strong and refreshing beverage while you're reading." + icon_state = "cafe_latte" + list_reagents = list(/datum/reagent/consumable/cafe_latte = 30) + custom_price = 200 + +/obj/item/reagent_containers/food/drinks/soylatte + name = "soy latte" + desc = "A nice and refreshing beverage while you're reading." + icon_state = "soy_latte" + list_reagents = list(/datum/reagent/consumable/soy_latte = 30) + custom_price = 200 /obj/item/reagent_containers/food/drinks/dry_ramen name = "cup ramen" diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 2bd5c2fd4667..f46d7768b1f7 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -172,7 +172,7 @@ return max(0, minimal_player_age - C.player_age) /datum/job/proc/radio_help_message(mob/M) - to_chat(M, "Prefix your message with :h to speak on your department's radio. To see other prefixes, look closely at your headset.") + to_chat(M, "Your ship most likely does not have telecomms. Prefix your message with :L or :R, depending on the hand you're holding the radio with, to speak with a handheld radio. Otherwise, you can speak with your headset by prefixing your message with :h.") /datum/outfit/job name = "Standard Gear" diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index dd664843ed41..55d33ee80d20 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -181,22 +181,28 @@ /obj/structure/bookcase/manuals/engineering/Initialize() . = ..() - new /obj/item/book/manual/wiki/engineering_construction(src) - new /obj/item/book/manual/wiki/engineering_hacking(src) - new /obj/item/book/manual/wiki/engineering_guide(src) - new /obj/item/book/manual/wiki/engineering_singulo_tesla(src) - new /obj/item/book/manual/wiki/robotics_cyborgs(src) + new /obj/item/book/manual/wiki/construction(src) + new /obj/item/book/manual/wiki/hacking(src) + new /obj/item/book/manual/wiki/engineering(src) + new /obj/item/book/manual/wiki/robotics(src) update_appearance() -/obj/structure/bookcase/manuals/research_and_development - name = "\improper R&D manuals bookcase" +// /obj/structure/bookcase/manuals/research_and_development +// name = "\improper R&D manuals bookcase" -/obj/structure/bookcase/manuals/research_and_development/Initialize() - . = ..() - new /obj/item/book/manual/wiki/research_and_development(src) - update_appearance() +// /obj/structure/bookcase/manuals/research_and_development/Initialize() +// . = ..() +// new /obj/item/book/manual/wiki/research_and_development(src) +// update_appearance() +/obj/structure/bookcase/manuals/chemistry + name = "chemistry manuals bookcase" + +/obj/structure/bookcase/manuals/chemistry/Initialize() + . = ..() + new /obj/item/book/manual/wiki/chemistry(src) + new /obj/item/book/manual/wiki/ghetto_chemistry(src) /* * Book @@ -378,7 +384,8 @@ /obj/structure/bookcase/manuals/medical/Initialize() . = ..() - new /obj/item/book/manual/wiki/medical_cloning(src) + new /obj/item/book/manual/wiki/medicine(src) + new /obj/item/book/manual/wiki/surgery(src) update_appearance() #undef BOOKCASE_UNANCHORED diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index 87ed99c0d45b..add30b7d467f 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -10,6 +10,7 @@ w_class = WEIGHT_CLASS_SMALL flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT + custom_price = 200 var/cooldown = 35 var/current_cooldown = 0 var/speaker = TRUE // Speaker that plays a sound when pulsed. diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index ba2a1c6984a4..2af7db0f4b6c 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -19,58 +19,25 @@ all_items_free = FALSE // Mining products are handled differently, because I am too lazy to convert this list stolen from the old vendor. products = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces. - /obj/item/stack/marker_beacon/thirty = 6, - /obj/item/reagent_containers/food/drinks/bottle/whiskey = 3, - /obj/item/storage/box/gum/bubblegum = 5, - /obj/item/clothing/mask/cigarette/cigar/havana = 3, - /obj/item/soap/nanotrasen = 1, - /obj/item/hivelordstabilizer = 6, - /obj/item/fulton_core = 1, - /obj/item/survivalcapsule = 3, - /obj/item/storage/belt/mining = 3, - /obj/item/card/mining_point_card = 5, - /obj/item/reagent_containers/hypospray/medipen/survival = 6, - /obj/item/storage/firstaid/brute = 3, - /obj/item/storage/box/minertracker = 5, - /obj/item/wormhole_jaunter = 3, - /obj/item/kinetic_crusher = 1, - /obj/item/gun/energy/kinetic_accelerator = 3, - /obj/item/mining_scanner = 5, + /obj/item/stack/marker_beacon/thirty = 3, + /obj/item/mining_scanner = 2, /obj/item/t_scanner/adv_mining_scanner = 2, - /obj/item/resonator = 3, - /obj/item/extraction_pack = 3, - /obj/item/lazarus_injector = 1, - /obj/item/pickaxe/silver = 3, - /obj/item/storage/backpack/duffelbag/mining_conscript = 3, - /obj/item/tank/jetpack/suit = 3, - /obj/item/spacecash/bundle/c1000 = 5, - /obj/item/clothing/suit/space/hardsuit/mining/independent = 3, - /obj/item/resonator/upgraded = 1, - /obj/item/clothing/shoes/bhop = 3, - /obj/item/survivalcapsule/luxury = 3, - /mob/living/simple_animal/hostile/mining_drone = 3, - /obj/item/mine_bot_upgrade = 3, - /obj/item/mine_bot_upgrade/health = 3, - /obj/item/borg/upgrade/modkit/cooldown/minebot = 3, - /obj/item/slimepotion/slime/sentience/mining = 1, - /obj/item/borg/upgrade/modkit/minebot_passthrough = 3, - /obj/item/borg/upgrade/modkit/tracer = 3, - /obj/item/borg/upgrade/modkit/tracer/adjustable = 3, - /obj/item/borg/upgrade/modkit/chassis_mod = 3, - /obj/item/borg/upgrade/modkit/range = 3, - /obj/item/borg/upgrade/modkit/damage = 3, - /obj/item/borg/upgrade/modkit/cooldown = 3, - /obj/item/borg/upgrade/modkit/aoe/mobs = 2 - ) - premium = list( - /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium = 3, - /obj/item/laser_pointer = 1, - /obj/item/pickaxe/diamond = 1, - /mob/living/simple_animal/hostile/facehugger/toy = 1, + /obj/item/hivelordstabilizer = 3, /obj/item/clothing/glasses/meson/gar = 2, - /obj/item/survivalcapsule/luxuryelite = 1, + /obj/item/kinetic_crusher = 1, + /obj/item/gun/energy/kinetic_accelerator = 2, + /obj/item/pickaxe/silver = 1, + /obj/item/borg/upgrade/modkit/range = 2, + /obj/item/borg/upgrade/modkit/damage = 2, + /obj/item/borg/upgrade/modkit/cooldown = 2, + /obj/item/borg/upgrade/modkit/aoe/mobs = 1, + /obj/item/lazarus_injector = 1, + /obj/item/survivalcapsule = 2, + /obj/item/survivalcapsule/luxury = 1, + /obj/item/survivalcapsule/luxuryelite = 1 ) + var/voucher_items = list( "Survival Capsule and Explorer's Webbing" = /obj/item/storage/belt/mining/vendor, "Resonator Kit" = /obj/item/resonator, @@ -140,47 +107,8 @@ icon_state = "mining_voucher" w_class = WEIGHT_CLASS_TINY -/**********************Mining Point Card**********************/ - -/obj/item/card/mining_point_card - name = "mining points card" - desc = "A small card preloaded with mining points. Swipe your ID card over it to transfer the points, then discard." - icon_state = "data_1" - custom_price = 500 - var/points = 500 - -/obj/item/card/mining_point_card/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/card/id)) - if(points) - var/obj/item/card/id/C = I - C.mining_points += points - to_chat(user, "You transfer [points] points to [C].") - points = 0 - else - to_chat(user, "There's no points left on [src].") - ..() - -/obj/item/card/mining_point_card/examine(mob/user) - . = ..() - . += "There's [points] point\s on the card." ///Conscript kit -/obj/item/card/mining_access_card - name = "mining access card" - desc = "A small card, that when used on any ID, will add mining access." - icon_state = "data_1" - -/obj/item/card/mining_access_card/afterattack(atom/movable/AM, mob/user, proximity) - . = ..() - if(istype(AM, /obj/item/card/id) && proximity) - var/obj/item/card/id/I = AM - I.access |= ACCESS_MINING - I.access |= ACCESS_MINING_STATION - I.access |= ACCESS_MECH_MINING - I.access |= ACCESS_MINERAL_STOREROOM - I.access |= ACCESS_CARGO - to_chat(user, "You upgrade [I] with mining access.") - qdel(src) /obj/item/storage/backpack/duffelbag/mining_conscript name = "EXOCOM rapid deployment kit" @@ -193,7 +121,6 @@ new /obj/item/storage/bag/ore(src) new /obj/item/clothing/suit/hooded/explorer(src) new /obj/item/clothing/mask/gas/explorer(src) - new /obj/item/card/mining_access_card(src) new /obj/item/gun/energy/kinetic_accelerator(src) new /obj/item/kitchen/knife/combat/survival(src) new /obj/item/flashlight/seclite(src) diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index ee74d0475a34..c09a3c8bd4c8 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -37,12 +37,8 @@ INITIALIZE_IMMEDIATE(/mob/dead) /mob/dead/get_status_tab_items() . = ..() - . += "" - . += "Game Mode: [SSticker.hide_mode ? "Secret" : "[GLOB.master_mode]"]" - if(SSticker.HasRoundStarted()) return - var/time_remaining = SSticker.GetTimeLeft() if(time_remaining > 0) . += "Time To Start: [round(time_remaining/10)]s" diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index d7865c9d2276..9baa46f526b5 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -493,8 +493,13 @@ /mob/dead/new_player/proc/register_for_interview() // First we detain them by removing all the verbs they have on client for (var/procpath/client_verb as anything in client.verbs) - if(!(client_verb in GLOB.client_verbs_required)) - remove_verb(client, client_verb) + if(client_verb in GLOB.client_verbs_required) + continue + remove_verb(client, client_verb) + + // Then remove those on their mob as well + for (var/procpath/verb_path as anything in verbs) + remove_verb(src, verb_path) // Then we create the interview form and show it to the client var/datum/interview/I = GLOB.interviews.interview_for_client(client) diff --git a/code/modules/mob/dead/new_player/ship_select.dm b/code/modules/mob/dead/new_player/ship_select.dm index 1515aa82f799..fe88abdf3399 100644 --- a/code/modules/mob/dead/new_player/ship_select.dm +++ b/code/modules/mob/dead/new_player/ship_select.dm @@ -146,7 +146,7 @@ var/list/ship_data = list( "name" = S.name, - "faction" = ship_prefix_to_faction(S.source_template.prefix), + "faction" = S.source_template.faction_name, "class" = S.source_template.short_name, "desc" = S.source_template.description, "tags" = S.source_template.tags, diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair.dm index af774d9b055b..34d8dd274668 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/hair.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/hair.dm @@ -1,6 +1,6 @@ // Hair for use on mobs // Keep the names alphabetical, and capitalized. -// You do not need to define _s or _l sub-states, game automatically does this for you +// You do not need to define _s or _l sub-states, game automatically does this for you //what is this /datum/sprite_accessory/hair icon = 'icons/mob/human_face.dmi' // default icon for all hairs @@ -302,6 +302,14 @@ name = "Gentle" icon_state = "hair_gentle" +/datum/sprite_accessory/hair/gloomy + name = "Gloomy" + icon_state = "hair_gloomy" + +/datum/sprite_accessory/hair/gloomy_long + name = "Gloomy (Long)" + icon_state = "hair_gloomylong" + /datum/sprite_accessory/hair/halfbang name = "Half-banged Hair" icon_state = "hair_halfbang" @@ -310,9 +318,9 @@ name = "Half-banged Hair 2" icon_state = "hair_halfbang2" -/datum/sprite_accessory/hair/halfshaved - name = "Half-shaved" - icon_state = "hair_halfshaved" +/datum/sprite_accessory/hair/halfshave + name = "Half-shave" + icon_state = "hair_halfshave" /datum/sprite_accessory/hair/harley name = "Harley" @@ -694,6 +702,10 @@ name = "Tress Shoulder" icon_state = "hair_tressshoulder" +/datum/sprite_accessory/hair/tribun + name = "Tri-bun" + icon_state = "hair_tribun" + /datum/sprite_accessory/hair/trimmed name = "Trimmed" icon_state = "hair_trimmed" @@ -706,6 +718,10 @@ name = "Twintails" icon_state = "hair_twintail" +/datum/sprite_accessory/hair/ruby + name = "Ruby" + icon_state = "hair_ruby" + /datum/sprite_accessory/hair/undercut name = "Undercut" icon_state = "hair_undercut" diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm b/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm index 20f2fe732d31..b13b8f96a51e 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm @@ -236,12 +236,71 @@ name = "Right Angle" icon_state = "rangle" +/datum/sprite_accessory/ipc_antennas/sprinter + name = "Sprinter Tail" + icon_state = "sprinter" + +/datum/sprite_accessory/ipc_antennas/simple + name = "Synth Simple" + icon_state = "simple_synth" + +/datum/sprite_accessory/ipc_antennas/short + name = "Synth Short" + icon_state = "short_synth" + +/datum/sprite_accessory/ipc_antennas/curled + name = "Synth Curled" + icon_state = "curled_synth" + +/datum/sprite_accessory/ipc_antennas/ram //remade + name = "Synth Ram" + icon_state = "ram_synth" + +// Start tails + +/datum/sprite_accessory/ipc_tail + icon = 'icons/mob/ipc_accessories.dmi' + color_src = MUTCOLORS + +/datum/sprite_accessory/ipc_tail/none + name = "None" + icon_state = "none" + +/datum/sprite_accessory/ipc_tail/lizard + name = "Synthetic Sarathi" + icon_state = "synth" + +/datum/sprite_accessory/ipc_tail/lizard_big + name = "Synthetic Sarathi Large" + icon_state = "large" + +/datum/sprite_accessory/ipc_tail/plug + name = "Power Plug" + icon_state = "plug" + secondary_color = TRUE + +/datum/sprite_accessory/ipc_tail/cat + name = "Pawsitrons Cat" + icon_state = "cat" + +/datum/sprite_accessory/ipc_tail/fox + name = "Pawsitrons Fox" + icon_state = "fox" + +/datum/sprite_accessory/ipc_tail/fox_alt + name = "Pawsitrons Fox 2" + icon_state = "fox2" + // Start chassis - the worst thing ever please rework this /datum/sprite_accessory/ipc_chassis // Used for changing limb icons, doesn't need to hold the actual icon. That's handled in ipc.dm icon = null icon_state = "who cares fuck you" // In order to pull the chassis correctly, we need AN icon_state(see line 36-39). It doesn't have to be useful, because it isn't used. color_src = 0 + var/use_eyes = FALSE //do we use normal robotic eyes? used when we dont want a screen but still want visible eyes + var/has_screen = TRUE //do we have a screen to toggle + var/has_overlay = FALSE //does this chasis have a overlay icon? + var/is_digi = FALSE //does this chasis use digitigrade /datum/sprite_accessory/ipc_chassis/mcgreyscale name = "Morpheus Cyberkinetics (Custom)" @@ -287,3 +346,25 @@ /datum/sprite_accessory/ipc_chassis/zenghupharmaceuticals name = "Zeng-Hu Pharmaceuticals" limbs_id = "zhpipc" + +/datum/sprite_accessory/ipc_chassis/pgfmechanicsplantigrade + name = "PGF MECHANICS TYPE-P" + limbs_id = "pgfipc-p" + has_screen = FALSE + color_src = MUTCOLORS + has_overlay = TRUE + use_eyes = TRUE + +/datum/sprite_accessory/ipc_chassis/pgfmechanicsdigigrade + name = "PGF MECHANICS TYPE-D" + limbs_id = "pgfipc-p" //the digigrade var makes it so we use digi leg variant instead + has_screen = FALSE + color_src = MUTCOLORS + has_overlay = TRUE + use_eyes = TRUE + is_digi = TRUE + +/datum/sprite_accessory/ipc_chassis/inteqsprinter + name = "Inteq Mothership 'Sprinter'" + limbs_id = "inteqsprinter" + has_screen = FALSE diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 9dfd2484402e..23e937acf102 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -86,10 +86,6 @@ /mob/living/carbon/alien/IsAdvancedToolUser() return has_fine_manipulation -/mob/living/carbon/alien/get_status_tab_items() - . = ..() - . += "Intent: [a_intent]" - /mob/living/carbon/alien/getTrail() if(getBruteLoss() < 200) return pick (list("xltrails_1", "xltrails2")) diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index 8faa15b83929..cb7c7adafc4b 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -83,17 +83,23 @@ else owner.adjustPlasma(plasma_rate * 0.1) -/obj/item/organ/alien/plasmavessel/Insert(mob/living/carbon/M, special = 0) +/obj/item/organ/alien/plasmavessel/Insert(mob/living/carbon/organ_owner, special = 0) ..() - if(isalien(M)) - var/mob/living/carbon/alien/A = M - A.updatePlasmaDisplay() + if(isalien(organ_owner)) + var/mob/living/carbon/alien/target_alien = organ_owner + target_alien.updatePlasmaDisplay() + RegisterSignal(organ_owner, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item)) -/obj/item/organ/alien/plasmavessel/Remove(mob/living/carbon/M, special = 0) +/obj/item/organ/alien/plasmavessel/Remove(mob/living/carbon/organ_owner, special = 0) ..() - if(isalien(M)) - var/mob/living/carbon/alien/A = M - A.updatePlasmaDisplay() + if(isalien(organ_owner)) + var/mob/living/carbon/alien/organ_owner_alien = organ_owner + organ_owner_alien.updatePlasmaDisplay() + UnregisterSignal(organ_owner, COMSIG_MOB_GET_STATUS_TAB_ITEMS) + +/obj/item/organ/alien/plasmavessel/proc/get_status_tab_item(mob/living/carbon/source, list/items) + SIGNAL_HANDLER + items += "Plasma Stored: [storedPlasma]/[max_plasma]" #define QUEEN_DEATH_DEBUFF_DURATION 2400 diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 82c27e95174b..5b316dad9cb6 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -28,6 +28,9 @@ if(!held_index) held_index = (active_hand_index % held_items.len)+1 + if(!isnum(held_index)) + CRASH("You passed [held_index] into swap_hand instead of a number. WTF man") + var/oindex = active_hand_index active_hand_index = held_index if(hud_used) @@ -415,14 +418,6 @@ var/turf/target = get_turf(loc) I.safe_throw_at(target,I.throw_range,I.throw_speed,src, force = move_force) -/mob/living/carbon/get_status_tab_items() - . = ..() - var/obj/item/organ/alien/plasmavessel/vessel = getorgan(/obj/item/organ/alien/plasmavessel) - if(vessel) - . += "Plasma Stored: [vessel.storedPlasma]/[vessel.max_plasma]" - if(locate(/obj/item/assembly/health) in src) - . += "Health: [health]" - /mob/living/carbon/get_proc_holders() . = ..() . += add_abilities_to_panel() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4bfe35b47060..cd80b13bcda6 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -61,7 +61,8 @@ . = ..() . += "Intent: [a_intent]" . += "Move Mode: [m_intent]" - if (internal) + + if (internal) //TODO: Refactor this to use the signal on tanks if (!internal.air_contents) qdel(internal) else @@ -69,32 +70,6 @@ . += "Internal Atmosphere Info: [internal.name]" . += "Tank Pressure: [internal.air_contents.return_pressure()]" . += "Distribution Pressure: [internal.distribute_pressure]" - /*WS begin - no cells in suits - if(istype(wear_suit, /obj/item/clothing/suit/space)) - var/obj/item/clothing/suit/space/S = wear_suit - . += "Thermal Regulator: [S.thermal_on ? "on" : "off"]" - . += "Cell Charge: [S.cell ? "[round(S.cell.percent(), 0.1)]%" : "!invalid!"]" - */ - var/mob/living/simple_animal/borer/B = has_brain_worms() //WS Begin - Borers - if(B && B.controlling) - . += "Borer Body Health: [B.health]" - . += "Chemicals: [B.chemicals]" //WS End - - if(mind) - var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling) - if(changeling) - . += "" - . += "Chemical Storage: [changeling.chem_charges]/[changeling.chem_storage]" - . += "Absorbed DNA: [changeling.absorbedcount]" - - //WS Begin - Display Ethereal Charge - if(istype(src)) - var/datum/species/ethereal/eth_species = src.dna?.species - if(istype(eth_species)) - var/obj/item/organ/stomach/ethereal/stomach = src.getorganslot(ORGAN_SLOT_STOMACH) - if(istype(stomach)) - . += "Crystal Charge: [round((stomach.crystal_charge / ETHEREAL_CHARGE_SCALING_MULTIPLIER), 0.1)]%" - //WS End //NINJACODE if(istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)) //Only display if actually a ninja. diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm index 551e60501940..039141bb5fd5 100644 --- a/code/modules/mob/living/carbon/human/human_say.dm +++ b/code/modules/mob/living/carbon/human/human_say.dm @@ -16,6 +16,14 @@ return idcard.registered_name else return real_name + if(istype(wear_mask, /obj/item/clothing/mask/gas/syndicate/voicechanger)) + var/obj/item/clothing/mask/gas/syndicate/voicechanger/V = wear_mask + if(V.voice_change && wear_id) + var/obj/item/card/id/idcard = wear_id.GetID() + if(istype(idcard)) + return idcard.registered_name + else + return real_name else return real_name if(istype(wear_mask, /obj/item/clothing/mask/infiltrator)) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 0317631206bc..756af00f1839 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -284,10 +284,6 @@ /mob/living/carbon/human/head_update(obj/item/I, forced) if((I.flags_inv & (HIDEHAIR|HIDEFACIALHAIR)) || forced) update_hair() - else - var/obj/item/clothing/C = I - if(istype(C) && C.dynamic_hair_suffix) - update_hair() if(I.flags_inv & HIDEEYES || forced) update_inv_glasses() if(I.flags_inv & HIDEEARS || forced) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index fee2b6f0957d..fbe020099ee8 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -560,9 +560,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/hair_hidden = FALSE //ignored if the matching dynamic_X_suffix is non-empty var/facialhair_hidden = FALSE // ^ - var/dynamic_hair_suffix = "" //if this is non-null, and hair+suffix matches an iconstate, then we render that hair instead - var/dynamic_fhair_suffix = "" - //for augmented heads if(!IS_ORGANIC_LIMB(HD)) return @@ -570,41 +567,19 @@ GLOBAL_LIST_EMPTY(roundstart_races) //we check if our hat or helmet hides our facial hair. if(H.head) var/obj/item/I = H.head - if(isclothing(I)) - var/obj/item/clothing/C = I - dynamic_fhair_suffix = C.dynamic_fhair_suffix if(I.flags_inv & HIDEFACIALHAIR) facialhair_hidden = TRUE if(H.wear_mask) var/obj/item/I = H.wear_mask - if(isclothing(I)) - var/obj/item/clothing/C = I - dynamic_fhair_suffix = C.dynamic_fhair_suffix //mask > head in terms of facial hair if(I.flags_inv & HIDEFACIALHAIR) facialhair_hidden = TRUE - if(H.facial_hairstyle && (FACEHAIR in species_traits) && (!facialhair_hidden || dynamic_fhair_suffix)) + if(H.facial_hairstyle && (FACEHAIR in species_traits) && !facialhair_hidden) S = GLOB.facial_hairstyles_list[H.facial_hairstyle] if(S) - //List of all valid dynamic_fhair_suffixes - var/static/list/fextensions - if(!fextensions) - var/icon/fhair_extensions = icon('icons/mob/facialhair_extensions.dmi') - fextensions = list() - for(var/s in fhair_extensions.IconStates(1)) - fextensions[s] = TRUE - qdel(fhair_extensions) - - //Is hair+dynamic_fhair_suffix a valid iconstate? - var/fhair_state = S.icon_state - var/fhair_file = S.icon - if(fextensions[fhair_state+dynamic_fhair_suffix]) - fhair_state += dynamic_fhair_suffix - fhair_file = 'icons/mob/facialhair_extensions.dmi' - - var/mutable_appearance/facial_overlay = mutable_appearance(fhair_file, fhair_state, -HAIR_LAYER) + var/mutable_appearance/facial_overlay = mutable_appearance(S.icon, S.icon_state, -HAIR_LAYER) if(!forced_colour) if(hair_color) @@ -625,21 +600,15 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(H.head) var/obj/item/I = H.head - if(isclothing(I)) - var/obj/item/clothing/C = I - dynamic_hair_suffix = C.dynamic_hair_suffix if(I.flags_inv & HIDEHAIR) hair_hidden = TRUE if(H.wear_mask) var/obj/item/I = H.wear_mask - if(!dynamic_hair_suffix && isclothing(I)) //head > mask in terms of head hair - var/obj/item/clothing/C = I - dynamic_hair_suffix = C.dynamic_hair_suffix if(I.flags_inv & HIDEHAIR) hair_hidden = TRUE - if(!hair_hidden || dynamic_hair_suffix) + if(!hair_hidden) var/mutable_appearance/hair_overlay = mutable_appearance(layer = -HAIR_LAYER) var/mutable_appearance/gradient_overlay = mutable_appearance(layer = -HAIR_LAYER) if(!hair_hidden && !H.getorgan(/obj/item/organ/brain)) //Applies the debrained overlay if there is no brain @@ -651,21 +620,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) S = GLOB.hairstyles_list[H.hairstyle] if(S) - //List of all valid dynamic_hair_suffixes - var/static/list/extensions - if(!extensions) - var/icon/hair_extensions = icon('icons/mob/hair_extensions.dmi') //hehe - extensions = list() - for(var/s in hair_extensions.IconStates(1)) - extensions[s] = TRUE - qdel(hair_extensions) - - //Is hair+dynamic_hair_suffix a valid iconstate? var/hair_state = S.icon_state var/hair_file = S.icon - if(extensions[hair_state+dynamic_hair_suffix]) - hair_state += dynamic_hair_suffix - hair_file = 'icons/mob/hair_extensions.dmi' hair_overlay.icon = hair_file hair_overlay.icon_state = hair_state @@ -971,6 +927,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) S = GLOB.ipc_screens_list[H.dna.features["ipc_screen"]] if("ipc_antenna") S = GLOB.ipc_antennas_list[H.dna.features["ipc_antenna"]] + if("ipc_tail") + S = GLOB.ipc_tail_list[H.dna.features["ipc_tail"]] if("ipc_chassis") S = GLOB.ipc_chassis_list[H.dna.features["ipc_chassis"]] if("ipc_brain") diff --git a/code/modules/mob/living/carbon/human/species_types/IPC.dm b/code/modules/mob/living/carbon/human/species_types/IPC.dm index dfa12f329054..381708757fd1 100644 --- a/code/modules/mob/living/carbon/human/species_types/IPC.dm +++ b/code/modules/mob/living/carbon/human/species_types/IPC.dm @@ -17,8 +17,8 @@ mutantlungs = null //no more collecting change for you mutantappendix = null mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord) - mutant_bodyparts = list("ipc_screen", "ipc_antenna", "ipc_chassis", "ipc_brain") - default_features = list("mcolor" = "#7D7D7D", "ipc_screen" = "Static", "ipc_antenna" = "None", "ipc_chassis" = "Morpheus Cyberkinetics (Custom)", "ipc_brain" = "Posibrain", "body_size" = "Normal") + mutant_bodyparts = list("ipc_screen", "ipc_antenna", "ipc_chassis", "ipc_tail", "ipc_brain") + default_features = list("mcolor" = "#7D7D7D", "ipc_screen" = "Static", "ipc_antenna" = "None", "ipc_chassis" = "Morpheus Cyberkinetics (Custom)", "ipc_tail" = "None", "ipc_brain" = "Posibrain", "body_size" = "Normal") meat = /obj/item/stack/sheet/plasteel{amount = 5} skinned_type = /obj/item/stack/sheet/metal{amount = 10} exotic_bloodtype = "Coolant" @@ -49,13 +49,14 @@ /// The last screen used when the IPC died. var/saved_screen var/datum/action/innate/change_screen/change_screen + var/has_screen = TRUE //do we have a screen. Used to determine if we mess with the screen or not /datum/species/ipc/random_name(unique) var/ipc_name = "[pick(GLOB.posibrain_names)]-[rand(100, 999)]" return ipc_name /datum/species/ipc/New() - . = ..() + // This is in new because "[HEAD_LAYER]" etc. is NOT a constant compile-time value. For some reason. // Why not just use HEAD_LAYER? Well, because HEAD_LAYER is a number, and if you try to use numbers as indexes, // BYOND will try to make it an ordered list. So, we have to use a string. This is annoying, but it's the only way to do it smoothly. @@ -64,17 +65,19 @@ ) /datum/species/ipc/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) // Let's make that IPC actually robotic. + . = ..() if(ishuman(C)) var/mob/living/carbon/human/H = C if(!change_screen) - change_screen = new - change_screen.Grant(H) + var/datum/species/ipc/species_datum = H.dna.species + if(species_datum?.has_screen) + change_screen = new + change_screen.Grant(H) if(H.dna.features["ipc_brain"] == "Man-Machine Interface") mutantbrain = /obj/item/organ/brain/mmi_holder else mutantbrain = /obj/item/organ/brain/mmi_holder/posibrain C.RegisterSignal(C, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, TYPE_PROC_REF(/mob/living/carbon, charge)) - return ..() /datum/species/ipc/on_species_loss(mob/living/carbon/C) . = ..() @@ -83,6 +86,8 @@ C.UnregisterSignal(C, COMSIG_PROCESS_BORGCHARGER_OCCUPANT) /datum/species/ipc/spec_death(gibbed, mob/living/carbon/C) + if(!has_screen) + return saved_screen = C.dna.features["ipc_screen"] C.dna.features["ipc_screen"] = "BSOD" C.update_body() @@ -91,6 +96,8 @@ /datum/species/ipc/proc/post_death(mob/living/carbon/C) if(C.stat < DEAD) return + if(!has_screen) + return C.dna.features["ipc_screen"] = null // Turns off their monitor on death. C.update_body() @@ -110,6 +117,11 @@ if(!ishuman(owner)) return var/mob/living/carbon/human/H = owner + var/datum/species/ipc/species_datum = H.dna.species + if(!species_datum) + return + if(!species_datum.has_screen) + return H.dna.features["ipc_screen"] = screen_choice H.eye_color = sanitize_hexcolor(color_choice) H.update_body() @@ -215,14 +227,17 @@ /datum/species/ipc/spec_revival(mob/living/carbon/human/H) - H.dna.features["ipc_screen"] = "BSOD" - H.update_body() + if(has_screen) + H.dna.features["ipc_screen"] = "BSOD" + H.update_body() H.say("Reactivating [pick("core systems", "central subroutines", "key functions")]...") addtimer(CALLBACK(src, PROC_REF(post_revival), H), 6 SECONDS) /datum/species/ipc/proc/post_revival(mob/living/carbon/human/H) if(H.stat == DEAD) return + if(!has_screen) + return H.dna.features["ipc_screen"] = saved_screen H.update_body() @@ -231,12 +246,39 @@ var/datum/sprite_accessory/ipc_chassis/chassis_of_choice = GLOB.ipc_chassis_list[C.dna.features["ipc_chassis"]] + if(chassis_of_choice.use_eyes) + LAZYREMOVE(species_traits, NOEYESPRITES) + LAZYADD(species_traits, EYECOLOR) + C.update_body() + + if(!chassis_of_choice.has_screen) + has_screen = FALSE + C.dna.features["ipc_screen"] = null + C.update_body() + + if(chassis_of_choice.is_digi) + digitigrade_customization = DIGITIGRADE_FORCED + bodytype = BODYTYPE_DIGITIGRADE + for(var/obj/item/bodypart/BP as anything in C.bodyparts) //Override bodypart data as necessary if(BP.limb_id=="synth") BP.uses_mutcolor = chassis_of_choice.color_src ? TRUE : FALSE + + if(chassis_of_choice.icon) + BP.static_icon = chassis_of_choice.icon + BP.icon = chassis_of_choice.icon + + if(chassis_of_choice.has_overlay) + BP.overlay_icon_state = TRUE + + if(chassis_of_choice.is_digi) + if(istype(BP,/obj/item/bodypart/leg)) + BP.bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_DIGITIGRADE //i hate this so much + if(BP.uses_mutcolor) BP.should_draw_greyscale = TRUE BP.species_color = C.dna?.features["mcolor"] + BP.species_secondary_color = C.dna?.features["mcolor2"] BP.limb_id = chassis_of_choice.limbs_id BP.name = "\improper[chassis_of_choice.name] [parse_zone(BP.body_zone)]" diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index ebc923c01075..070894a92bee 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -132,3 +132,15 @@ charge_max = 50 cooldown_min = 50 shapeshift_type = /mob/living/simple_animal/hostile/retaliate/bat + +/obj/item/organ/internal/heart/vampire/Insert(mob/living/carbon/receiver, special, drop_if_replaced) + . = ..() + RegisterSignal(receiver, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item)) + +/obj/item/organ/internal/heart/vampire/Remove(mob/living/carbon/heartless, special) + . = ..() + UnregisterSignal(heartless, COMSIG_MOB_GET_STATUS_TAB_ITEMS) + +/obj/item/organ/internal/heart/vampire/proc/get_status_tab_item(mob/living/carbon/source, list/items) + SIGNAL_HANDLER + items += "Blood Level: [source.blood_volume]/[BLOOD_VOLUME_MAXIMUM]" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 44bfe5626754..4164844c0d8e 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -323,7 +323,6 @@ /mob/living/silicon/robot/get_status_tab_items() . = ..() - . += "" if(cell) . += "Charge Left: [cell.charge]/[cell.maxcharge]" else diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index d63c300e8ba6..bc22f78ae7a3 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -155,9 +155,7 @@ /mob/living/simple_animal/parrot/get_status_tab_items() . = ..() - . += "" . += "Held Item: [held_item]" - . += "Mode: [a_intent]" /mob/living/simple_animal/parrot/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, list/message_mods = list()) . = ..() diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index c21a2a6f365d..e4ead25880f9 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -374,8 +374,8 @@ /mob/living/simple_animal/get_status_tab_items() . = ..() - . += "" . += "Health: [round((health / maxHealth) * 100)]%" + . += "Intent: [a_intent]" /mob/living/simple_animal/proc/drop_loot() if(loot.len) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 9af72b034998..5a2e3731a703 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -843,7 +843,8 @@ /// Adds this list to the output to the stat browser /mob/proc/get_status_tab_items() - . = list() + . = list("") //we want to offset unique stuff from standard stuff + SEND_SIGNAL(src, COMSIG_MOB_GET_STATUS_TAB_ITEMS, .) /// Gets all relevant proc holders for the browser statpenl /mob/proc/get_proc_holders() @@ -990,7 +991,7 @@ mob_spell_list -= S qdel(S) if(client) - client << output(null, "statbrowser:check_spells") + client.stat_panel.send_message("check_spells") ///Return any anti magic atom on this mob that matches the magic type /mob/proc/anti_magic_check(magic = TRUE, holy = FALSE, tinfoil = FALSE, chargecost = 1, self = FALSE) diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm index 9b41f9f6236d..30b1cfcde3de 100644 --- a/code/modules/photography/photos/frame.dm +++ b/code/modules/photography/photos/frame.dm @@ -3,7 +3,7 @@ /obj/item/wallframe/picture name = "picture frame" desc = "The perfect showcase for your favorite deathtrap memories." - icon = 'icons/obj/decals.dmi' + icon = 'icons/obj/structures/signs/sign.dmi' custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 0.5) flags_1 = 0 icon_state = "frame-empty" @@ -62,7 +62,7 @@ /obj/structure/sign/picture_frame name = "picture frame" desc = "Every time you look it makes you laugh." - icon = 'icons/obj/decals.dmi' + icon = 'icons/obj/structures/signs/sign.dmi' icon_state = "frame-empty" var/obj/item/photo/framed var/persistence_id diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm index e946d4c3287d..980272313c1a 100644 --- a/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -64,7 +64,7 @@ icon_state = "ak47_mag" ammo_type = /obj/item/ammo_casing/a762_39 caliber = "7.62x39mm" - max_ammo = 30 + max_ammo = 20 /obj/item/ammo_box/magazine/ak47/update_icon_state() . = ..() diff --git a/code/modules/projectiles/guns/ballistic/gauss.dm b/code/modules/projectiles/guns/ballistic/gauss.dm index 400633520129..8fce353d8b22 100644 --- a/code/modules/projectiles/guns/ballistic/gauss.dm +++ b/code/modules/projectiles/guns/ballistic/gauss.dm @@ -28,7 +28,7 @@ /obj/item/gun/ballistic/automatic/powered/gauss/modelh name = "Model H" - desc = "Standard-issue pistol of the Solarian Confederation. Fires slow ferromagnetic slugs at a high energy cost, though they rend flesh with ease." + desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor." mag_type = /obj/item/ammo_box/magazine/modelh icon_state = "model-h" item_state = "model-h" @@ -46,6 +46,11 @@ spread = 3 spread_unwielded = 12 +/obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns + desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor. It is painted in the colors of SUNS." + mag_type = /obj/item/ammo_box/magazine/modelh + icon_state = "model-h_suns" + item_state = "model-h_suns" /obj/item/gun/ballistic/automatic/powered/gauss/claris name = "Claris" @@ -65,6 +70,11 @@ empty_indicator = FALSE manufacturer = MANUFACTURER_SOLARARMORIES +/obj/item/gun/ballistic/automatic/powered/gauss/claris/suns + desc = "An antiquated Solarian rifle. Chambered in ferromagnetic pellets, just as the founding Solarians intended. Evidently, SUNS' founders echo the sentiment, as it appears to be painted in their colors." + icon_state = "claris_suns" + item_state = "claris_suns" + /obj/item/gun/ballistic/automatic/powered/gauss/gar name = "Solar 'GAR' Carbine" desc = "A Solarian carbine, unusually modern for its producers. Launches ferromagnetic lances at alarming speeds." @@ -86,3 +96,8 @@ /obj/item/gun/ballistic/automatic/powered/gauss/gar/ComponentInitialize() . = ..() AddComponent(/datum/component/automatic_fire, 0.2 SECONDS) + +/obj/item/gun/ballistic/automatic/powered/gauss/gar/suns + desc = "A Solarian carbine, unusually modern for its producers. It's just modern enough for SUNS, however, who have painted the weapon in their colors. Launches ferromagnetic lances at alarming speeds." + icon_state = "gar_suns" + item_state = "gar_suns" diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 964151a8a665..1cb86fec256d 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -42,6 +42,10 @@ var/obj/item/suppressor/S = new(src) install_suppressor(S) +/obj/item/gun/ballistic/automatic/pistol/suns + desc = "A small, easily concealable 10mm handgun that bears Scarborough Arms stamps. It is painted in the colors of SUNS." + icon_state = "pistol_suns" + /obj/item/gun/ballistic/automatic/pistol/candor name = "\improper Candor" desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of Hunter's Pride. Chambered in .45." diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index ab404b1261d5..e4f925ac4d35 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -205,7 +205,6 @@ can_suppress = FALSE burst_size = 1 fire_delay = 0 - pin = /obj/item/firing_pin/implant/pindicate fire_sound = 'sound/weapons/gun/shotgun/bulldog.ogg' actions_types = list() mag_display = TRUE @@ -238,7 +237,13 @@ pin = /obj/item/firing_pin manufacturer = MANUFACTURER_INTEQ -/obj/item/gun/ballistic/shotgun/bulldog/minutemen +/obj/item/gun/ballistic/shotgun/bulldog/suns + name = "\improper Bulldog-C Shotgun" + desc = "A variation of the Bulldog manufactured by Scarborough Arms for SUNS. Its shorter barrel is intended to provide additional maneuverability in personal defense scenarios." + icon_state = "bulldog_suns" + item_state = "bulldog_suns" + +/obj/item/gun/ballistic/shotgun/bulldog/minutemen //TODO: REPATH name = "\improper CM-15" desc = "A standard-issue shotgun of the Colonial Minutemen, most often used by boarding crews. Only compatible with specialized 8-round magazines." icon = 'icons/obj/guns/48x32guns.dmi' @@ -637,6 +642,7 @@ /obj/item/gun/ballistic/shotgun/flamingarrow/bolt name = "HP Flaming Bolt" desc = "A sturdy, excellently-made lever-action rifle. This one appears to be a genuine antique, kept in incredibly good condition despite its advanced age. Chambered in .38." + base_icon_state = "flamingbolt" icon_state = "flamingbolt" item_state = "flamingbolt" diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm index 8644534e3117..23d853753f9b 100644 --- a/code/modules/projectiles/guns/ballistic/smg.dm +++ b/code/modules/projectiles/guns/ballistic/smg.dm @@ -32,7 +32,7 @@ /obj/item/gun/ballistic/automatic/smg/c20r name = "\improper C-20r SMG" - desc = "A bullpup .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp." + desc = "A bullpup .45 SMG designated 'C-20r.' Its buttstamp reads 'Scarborough Arms - Per falcis, per pravitas.'" icon_state = "c20r" item_state = "c20r" mag_type = /obj/item/ammo_box/magazine/smgm45 @@ -63,6 +63,11 @@ icon_state = "cobra20" item_state = "cobra20" +/obj/item/gun/ballistic/automatic/smg/c20r/suns + desc = "A bullpup .45 SMG designated 'C-20r.' Its buttstamp reads 'Scarborough Arms - Per falcis, per pravitas.' This one is painted in SUNS' colors." + icon_state = "c20r_suns" + item_state = "c20r_suns" + /obj/item/gun/ballistic/automatic/smg/inteq name = "\improper SkM-44(k)" desc = "An extreme modification of an obsolete assault rifle, converted into a compact submachine gun by IRMG. Chambered in 10mm." diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm index 0af67016116f..cab30f0219ef 100644 --- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm +++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm @@ -102,7 +102,6 @@ Slimecrossing Armor item_state = "peaceflower" slot_flags = ITEM_SLOT_HEAD body_parts_covered = NONE - dynamic_hair_suffix = "" force = 0 throwforce = 0 w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm index dc95ab97cece..2cbdf9823eb6 100644 --- a/code/modules/surgery/organs/augments_chest.dm +++ b/code/modules/surgery/organs/augments_chest.dm @@ -214,9 +214,8 @@ return TRUE // Priority 3: use internals tank. - var/obj/item/tank/I = owner.internal - if(I && I.air_contents && I.air_contents.total_moles() >= num) - T.assume_air_moles(I.air_contents, num) + if(owner.internal?.air_contents?.total_moles() >= num) + T.assume_air_moles(owner.internal.air_contents, num) toggle(silent = TRUE) return FALSE diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index de0ebac6eddb..0c200df9f6b1 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -141,6 +141,7 @@ /obj/item/organ/eyes/robotic name = "robotic eyes" icon_state = "robotic_eyes" + eye_icon_state = "eyes_synth" // i feel like this should be here desc = "A very basic set of optical sensors with no extra vision modes or functions." status = ORGAN_ROBOTIC organ_flags = ORGAN_SYNTHETIC diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 2e2403db14c6..bf9346b5dcd9 100644 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -107,16 +107,22 @@ ..() adjust_charge(-ETHEREAL_CHARGE_FACTOR) -/obj/item/organ/stomach/ethereal/Insert(mob/living/carbon/M, special = 0) +/obj/item/organ/stomach/ethereal/Insert(mob/living/carbon/organ_owner, special = 0) ..() - RegisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge)) - RegisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_electrocute)) - -/obj/item/organ/stomach/ethereal/Remove(mob/living/carbon/M, special = 0) - UnregisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT) - UnregisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT) + RegisterSignal(organ_owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge)) + RegisterSignal(organ_owner, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_electrocute)) + RegisterSignal(organ_owner, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item)) + +/obj/item/organ/stomach/ethereal/Remove(mob/living/carbon/organ_owner, special = 0) + UnregisterSignal(organ_owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT) + UnregisterSignal(organ_owner, COMSIG_LIVING_ELECTROCUTE_ACT) + UnregisterSignal(organ_owner, COMSIG_MOB_GET_STATUS_TAB_ITEMS) ..() +/obj/item/organ/stomach/ethereal/proc/get_status_tab_item(mob/living/carbon/source, list/items) + SIGNAL_HANDLER + items += "Crystal Charge: [round((crystal_charge / ETHEREAL_CHARGE_SCALING_MULTIPLIER), 0.1)]%" + /obj/item/organ/stomach/ethereal/proc/charge(datum/source, amount, repairs) adjust_charge((amount * ETHEREAL_CHARGE_SCALING_MULTIPLIER) / 70) //WS Edit -- Ethereal Charge Scaling diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index a79966f69ba1..95875473133b 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -92,8 +92,9 @@ window.acquire_lock(src) if(!window.is_ready()) window.initialize( + strict_mode = TRUE, fancy = user.client.prefs.tgui_fancy, - inline_assets = list( + assets = list( get_asset_datum(/datum/asset/simple/tgui_common), get_asset_datum(/datum/asset/simple/tgui), )) diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm index 62574cb1aacd..844ba6239a0f 100644 --- a/code/modules/tgui/tgui_window.dm +++ b/code/modules/tgui/tgui_window.dm @@ -18,8 +18,12 @@ var/message_queue var/sent_assets = list() // Vars passed to initialize proc (and saved for later) - var/inline_assets - var/fancy + var/initial_strict_mode + var/initial_fancy + var/initial_assets + var/initial_inline_html + var/initial_inline_js + var/initial_inline_css var/mouse_event_macro_set = FALSE /** @@ -45,21 +49,30 @@ * state. You can begin sending messages right after initializing. Messages * will be put into the queue until the window finishes loading. * - * optional inline_assets list List of assets to inline into the html. - * optional inline_html string Custom HTML to inject. - * optional fancy bool If TRUE, will hide the window titlebar. + * optional strict_mode bool - Enables strict error handling and BSOD. + * optional fancy bool - If TRUE and if this is NOT a panel, will hide the window titlebar. + * optional assets list - List of assets to load during initialization. + * optional inline_html string - Custom HTML to inject. + * optional inline_js string - Custom JS to inject. + * optional inline_css string - Custom CSS to inject. */ /datum/tgui_window/proc/initialize( - inline_assets = list(), + strict_mode = FALSE, + fancy = FALSE, + assets = list(), inline_html = "", - fancy = FALSE) + inline_js = "", + inline_css = "") log_tgui(client, context = "[id]/initialize", window = src) if(!client) return - src.inline_assets = inline_assets - src.fancy = fancy + src.initial_fancy = fancy + src.initial_assets = assets + src.initial_inline_html = inline_html + src.initial_inline_js = inline_js + src.initial_inline_css = inline_css status = TGUI_WINDOW_LOADING fatally_errored = FALSE // Build window options @@ -72,9 +85,10 @@ // Generate page html var/html = SStgui.basehtml html = replacetextEx(html, "\[tgui:windowId]", id) - // Inject inline assets + html = replacetextEx(html, "\[tgui:strictMode]", strict_mode) + // Inject assets var/inline_assets_str = "" - for(var/datum/asset/asset in inline_assets) + for(var/datum/asset/asset in assets) var/mappings = asset.get_url_mappings() for(var/name in mappings) var/url = mappings[name] @@ -87,8 +101,17 @@ if(length(inline_assets_str)) inline_assets_str = "\n" html = replacetextEx(html, "\n", inline_assets_str) - // Inject custom HTML - html = replacetextEx(html, "\n", inline_html) + // Inject inline HTML + if (inline_html) + html = replacetextEx(html, "", inline_html) + // Inject inline JS + if (inline_js) + inline_js = "" + html = replacetextEx(html, "", inline_js) + // Inject inline CSS + if (inline_css) + inline_css = "" + html = replacetextEx(html, "", inline_css) // Open the window client << browse(html, "window=[id];[options]") // Detect whether the control is a browser @@ -97,6 +120,20 @@ if(!is_browser) winset(client, id, "on-close=\"uiclose [id]\"") +/** + * public + * + * Reinitializes the panel with previous data used for initialization. + */ +/datum/tgui_window/proc/reinitialize() + initialize( + strict_mode = initial_strict_mode, + fancy = initial_fancy, + assets = initial_assets, + inline_html = initial_inline_html, + inline_js = initial_inline_js, + inline_css = initial_inline_css) + /** * public * @@ -320,7 +357,7 @@ client << link(href_list["url"]) if("cacheReloaded") // Reinitialize - initialize(inline_assets = inline_assets, fancy = fancy) + reinitialize() // Resend the assets for(var/asset in sent_assets) send_asset(asset) diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index fdd74389c837..44fbffd917ce 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -13,9 +13,9 @@ var/broken = FALSE var/initialized_at -/datum/tgui_panel/New(client/client) +/datum/tgui_panel/New(client/client, id) src.client = client - window = new(client, "browseroutput") + window = new(client, id) window.subscribe(src, PROC_REF(on_message)) /datum/tgui_panel/Del() @@ -42,10 +42,12 @@ sleep(1) initialized_at = world.time // Perform a clean initialization - window.initialize(inline_assets = list( - get_asset_datum(/datum/asset/simple/tgui_common), - get_asset_datum(/datum/asset/simple/tgui_panel), - )) + window.initialize( + strict_mode = TRUE, + assets = list( + get_asset_datum(/datum/asset/simple/tgui_common), + get_asset_datum(/datum/asset/simple/tgui_panel), + )) window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/fontawesome)) window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat)) request_telemetry() diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 6a9b3627dfb7..9c7b8622d536 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -67,28 +67,6 @@ desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This model appears to have no access restrictions." req_access = null -/obj/machinery/vending/boozeomat/pubby_maint //abandoned bar on Pubbystation - products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1, - /obj/item/reagent_containers/food/drinks/bottle/absinthe = 1, - /obj/item/reagent_containers/food/drinks/bottle/limejuice = 1, - /obj/item/reagent_containers/food/drinks/bottle/cream = 1, - /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 1, - /obj/item/reagent_containers/food/drinks/drinkingglass = 10, - /obj/item/reagent_containers/food/drinks/ice = 3, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6, - /obj/item/reagent_containers/food/drinks/flask = 1) - req_access = null - age_restrictions = FALSE - -/obj/machinery/vending/boozeomat/pubby_captain //Captain's quarters on Pubbystation - products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1, - /obj/item/reagent_containers/food/drinks/bottle/wine = 1, - /obj/item/reagent_containers/food/drinks/ale = 1, - /obj/item/reagent_containers/food/drinks/drinkingglass = 6, - /obj/item/reagent_containers/food/drinks/ice = 1, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4); - req_access = list(ACCESS_CAPTAIN) - /obj/machinery/vending/boozeomat/syndicate_access req_access = list(ACCESS_SYNDICATE) age_restrictions = FALSE diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm index d67a41d54aee..67b9878744be 100644 --- a/code/modules/vending/coffee.dm +++ b/code/modules/vending/coffee.dm @@ -8,6 +8,9 @@ /obj/item/reagent_containers/food/drinks/coffee = 6, /obj/item/reagent_containers/food/drinks/mug/tea = 6, /obj/item/reagent_containers/food/drinks/mug/coco = 3) + premium = list( + /obj/item/reagent_containers/food/drinks/cafelatte = 3, + /obj/item/reagent_containers/food/drinks/soylatte = 3) contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12) refill_canister = /obj/item/vending_refill/coffee default_price = 45 diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm deleted file mode 100644 index 49fec066b703..000000000000 --- a/code/modules/vending/magivend.dm +++ /dev/null @@ -1,23 +0,0 @@ -/obj/machinery/vending/magivend - name = "\improper MagiVend" - desc = "A magic vending machine." - icon_state = "MagiVend" - product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!" - vend_reply = "Have an enchanted evening!" - product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Burn it all!;Admin conspiracies since forever!;Space-time bending hardware!" - products = list( - /obj/item/clothing/head/wizard = 1, - /obj/item/clothing/suit/wizrobe = 1, - /obj/item/clothing/head/wizard/red = 1, - /obj/item/clothing/suit/wizrobe/red = 1, - /obj/item/clothing/head/wizard/yellow = 1, - /obj/item/clothing/suit/wizrobe/yellow = 1, - /obj/item/clothing/shoes/sandal/magic = 1, - /obj/item/staff = 2) - contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave - armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) - resistance_flags = FIRE_PROOF - default_price = 250 - extra_price = 500 - payment_department = ACCOUNT_SRV - light_mask = "magivend-light-mask" diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm index 21d2fa18badb..e4489b0a23d8 100644 --- a/code/modules/vending/medical.dm +++ b/code/modules/vending/medical.dm @@ -6,46 +6,36 @@ product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!" req_access = list(ACCESS_MEDICAL) products = list( - /obj/item/stack/medical/gauze = 8, - /obj/item/reagent_containers/syringe = 12, - /obj/item/reagent_containers/dropper = 3, - /obj/item/healthanalyzer = 4, + /obj/item/stack/medical/gauze = 5, + /obj/item/stack/medical/splint = 5, + /obj/item/reagent_containers/syringe = 5, + /obj/item/reagent_containers/dropper = 2, + /obj/item/healthanalyzer = 2, /obj/item/reagent_containers/pill/patch/styptic = 5, /obj/item/reagent_containers/pill/patch/silver_sulf = 5, + /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/syringe/perfluorodecalin = 2, - /obj/item/reagent_containers/pill/insulin = 5, - /obj/item/reagent_containers/glass/bottle/charcoal = 4, + /obj/item/reagent_containers/syringe/antiviral = 1, + /obj/item/reagent_containers/glass/bottle/charcoal = 3, /obj/item/reagent_containers/glass/bottle/epinephrine = 3, - /obj/item/reagent_containers/glass/bottle/morphine = 4, + /obj/item/reagent_containers/glass/bottle/morphine = 1, /obj/item/reagent_containers/glass/bottle/potass_iodide = 1, /obj/item/reagent_containers/glass/bottle/salglu_solution = 3, - /obj/item/reagent_containers/glass/bottle/toxin = 3, - /obj/item/reagent_containers/syringe/antiviral = 6, - /obj/item/reagent_containers/medigel/styptic = 2, - /obj/item/reagent_containers/medigel/silver_sulf = 2, + /obj/item/reagent_containers/medigel/styptic = 1, + /obj/item/reagent_containers/medigel/silver_sulf = 1, + /obj/item/reagent_containers/medigel/synthflesh = 1, /obj/item/reagent_containers/medigel/sterilizine = 1, - /obj/item/reagent_containers/pill/morphine = 4, - /obj/item/storage/box/gum/happiness = 3, - /obj/item/sensor_device = 2, - /obj/item/pinpointer/crew = 2, - /obj/item/reagent_containers/glass/bottle/vial/small = 5, - /obj/item/stack/medical/splint = 10) + /obj/item/sensor_device = 1, + /obj/item/pinpointer/crew = 1) contraband = list( - /obj/item/reagent_containers/pill/tox = 3, - /obj/item/reagent_containers/pill/morphine = 4, - /obj/item/reagent_containers/pill/charcoal = 6, + /obj/item/reagent_containers/pill/tox = 2, + /obj/item/reagent_containers/pill/morphine = 2, + /obj/item/reagent_containers/pill/charcoal = 4, /obj/item/storage/box/hug/medical = 1) premium = list( - /obj/item/reagent_containers/medigel/synthflesh = 2, - /obj/item/storage/pill_bottle/psicodine = 2, - /obj/item/reagent_containers/hypospray/medipen = 3, - /obj/item/clothing/glasses/hud/health = 2, + /obj/item/clothing/glasses/hud/health = 1, /obj/item/clothing/glasses/hud/health/prescription = 1, - /obj/item/hypospray/mkii = 1, - /obj/item/storage/belt/medical = 3, - /obj/item/storage/firstaid/advanced = 2, - /obj/item/shears = 1, - /obj/item/plunger/reinforced = 2) + /obj/item/shears = 1) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/medical diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index 3378a1d0deca..7ba19c75d617 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -5,17 +5,17 @@ icon_deny = "wallmed-deny" density = FALSE products = list( - /obj/item/reagent_containers/syringe = 3, - /obj/item/reagent_containers/pill/patch/styptic = 5, - /obj/item/reagent_containers/pill/patch/silver_sulf = 5, - /obj/item/reagent_containers/pill/charcoal = 2, - /obj/item/reagent_containers/medigel/styptic = 2, - /obj/item/reagent_containers/medigel/silver_sulf = 2, + /obj/item/reagent_containers/syringe = 1, + /obj/item/reagent_containers/pill/patch/styptic = 3, + /obj/item/reagent_containers/pill/patch/silver_sulf = 3, + /obj/item/reagent_containers/pill/charcoal = 1, + /obj/item/reagent_containers/medigel/styptic = 1, + /obj/item/reagent_containers/medigel/silver_sulf = 1, /obj/item/reagent_containers/medigel/sterilizine = 1 ) contraband = list( - /obj/item/reagent_containers/pill/tox = 2, - /obj/item/reagent_containers/pill/morphine = 2, + /obj/item/reagent_containers/pill/tox = 1, + /obj/item/reagent_containers/pill/morphine = 1, /obj/item/storage/box/gum/happiness = 1 ) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) @@ -30,11 +30,3 @@ /obj/item/vending_refill/wallmed machine_name = "NanoMed" icon_state = "refill_medical" - -/obj/machinery/vending/wallmed/pubby - products = list( - /obj/item/reagent_containers/syringe = 3, - /obj/item/reagent_containers/pill/patch/styptic = 1, - /obj/item/reagent_containers/pill/patch/silver_sulf = 1, - /obj/item/reagent_containers/medigel/sterilizine = 1 - ) diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index d71dcae5ab41..e4e9d303ae0e 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -93,7 +93,7 @@ light_mask = "marine-mask" req_access = list(ACCESS_SYNDICATE) products = list( - /obj/item/screwdriver/nuke = 5, + /obj/item/screwdriver = 5, /obj/item/restraints/handcuffs = 10, /obj/item/assembly/flash/handheld = 10, /obj/item/flashlight/seclite = 10, @@ -104,7 +104,6 @@ /obj/item/grenade/c4 = 5, /obj/item/grenade/frag = 5, - /obj/item/melee/transforming/energy/sword/saber/green = 1, ) contraband = list() premium = list() @@ -131,7 +130,6 @@ /obj/item/ammo_box/magazine/ebr = 5, /obj/item/grenade/c4 = 1, /obj/item/grenade/frag = 1, - /obj/item/melee/transforming/energy/sword/saber/red = 1, ) voucher_items = list( "M-90gl Carbine" = /obj/item/gun/ballistic/automatic/smg/m90/unrestricted, @@ -150,19 +148,21 @@ /obj/item/assembly/flash/handheld = 10, /obj/item/flashlight/seclite = 10, - /obj/item/ammo_box/magazine/aknt = 10, - /obj/item/storage/box/lethalshot = 5, + /obj/item/screwdriver = 5, + /obj/item/stock_parts/cell/gun = 10, + /obj/item/stock_parts/cell/gun/upgraded = 5, /obj/item/grenade/c4 = 5, /obj/item/grenade/frag = 5, /obj/item/grenade/flashbang = 5, /obj/item/grenade/barrier = 10, - /obj/item/melee/transforming/energy/sword/saber/blue = 1 ) voucher_items = list( - "NT-AK" = /obj/item/gun/ballistic/automatic/assault/ak47/nt) //if im being honest, theres no point in addiing other options when this is clearly the best - + "SL AL-655 Energy Rifle" = /obj/item/gun/energy/e_gun/hades, + "NT-E-Rifle" = /obj/item/gun/energy/e_gun, + "E-TAR SMG" = /obj/item/gun/energy/e_gun/smg, + "E-SG 500" = /obj/item/gun/energy/e_gun/iot) /obj/item/gun_voucher name = "security weapon voucher" desc = "A token used to redeem guns from the SecTech vendor." diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm index 25097cab76a8..aadb3c6a5b37 100644 --- a/code/modules/vending/youtool.dm +++ b/code/modules/vending/youtool.dm @@ -4,23 +4,23 @@ icon_state = "tool" icon_deny = "tool-deny" light_mask = "tool-light-mask" - products = list(/obj/item/stack/cable_coil/random = 10, //WS Edit - Random added from Smartwire Revert - /obj/item/crowbar = 5, + products = list(/obj/item/stack/cable_coil/random = 5, //WS Edit - Random added from Smartwire Revert + /obj/item/crowbar = 3, /obj/item/weldingtool = 3, - /obj/item/wirecutters = 5, - /obj/item/wrench = 5, - /obj/item/analyzer = 5, - /obj/item/t_scanner = 5, - /obj/item/screwdriver = 5, + /obj/item/wirecutters = 3, + /obj/item/wrench = 3, + /obj/item/analyzer = 3, + /obj/item/t_scanner = 3, + /obj/item/screwdriver = 3, /obj/item/flashlight/glowstick = 3, /obj/item/flashlight/glowstick/red = 3, - /obj/item/flashlight = 5, + /obj/item/flashlight = 3, /obj/item/clothing/ears/earmuffs = 1) contraband = list(/obj/item/clothing/gloves/color/fyellow = 2) premium = list(/obj/item/storage/belt/utility = 2, /obj/item/multitool = 2, - /obj/item/weldingtool/hugetank = 2, - /obj/item/clothing/head/welding = 2, + /obj/item/weldingtool/hugetank = 1, + /obj/item/clothing/head/welding = 1, /obj/item/clothing/gloves/color/yellow = 1) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70) resistance_flags = FIRE_PROOF diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml index 4dc8e8e2807b..dc2573b3225f 100644 --- a/html/changelogs/archive/2024-02.yml +++ b/html/changelogs/archive/2024-02.yml @@ -83,3 +83,98 @@ is they are now chambered in 22lr, the worst caliber in the game - balance: Shotguns have been nerfed to not do an insane amount of damage point blank and in general +2024-02-10: + Apogee-dev: + - rscdel: Removed the Luxembourg. + Martinpachu: + - rscadd: Ammo boxes to the outpost market. + - spellcheck: Changed AK mentions to SVG. + - tweak: Changed shotgun ammo boxes bought from the outpost to the ammo_box version. + - bugfix: Changed SVG mag size to 20. + - rscadd: IRMG Vanguard peaked caps to IRMVs. + Skies-Of-Blue: + - rscadd: new pair of prescription glasses, now available in loadouts! + - imageadd: new transparent sprites for all prescription glasses + - imageadd: new transparent sprites for all prescription HUDs + - imageadd: new transparent sprite for the orange sunglasses + Skrem7: + - balance: Peacekeeper visors have real armor now (especially against bullet) + - balance: SUNS armored coats now cover all body parts instead of just chest + SomeguyManperson: + - bugfix: bulletproof armor crates are no longer stated to carry one more armor + set than they actually do +2024-02-11: + BarteG44: + - tweak: resprited the medical and utility belts + Couls, Kylerace, Magatsuchi, LemonInTheDark, Fikou, Mothblocks, Stylemistake, Mark Suckerberg: + - admin: Reduces MC tab update time, this can be adjusted with a preference in OOC + settings + GenericDM: + - code_imp: params var is now passed to mousedrop_t() from mousedrop() + Halcyon, retlaw34, thgvr: + - rscadd: Added the Sprinter IPC Chassis + - rscadd: Added the PGF MECHANICS IPC Chassis + - rscadd: Adds IPC tails + - tweak: Robotic eyes now use the synth eye sprite. + Luftkommando: + - bugfix: Fixed the accidental wall-window combination on the Talos-class burn chamber + view window. + Zevotech: + - rscadd: Reworked the paracelsus kitchen layout to be more user friendly and have + more ingredients to cook with. + - rscadd: Adds two bookcases and two extra shark plushies to the dorms. + - rscadd: Adds ship viewscreens to the paracelsus + - rscadd: Moves the autolathe on the paracelsus to the ghettochem room + - bugfix: The firearms locker on the paracelsus no longer lacks a lock to prevent + patients from accessing the firearms + - rscdel: Some vendors now have far less stock and a smaller variety of items to + compensate for being free and not on a station + - rscdel: Removed Magivend vendor + - rscdel: Removed Mining points cards and mining access cards + - rscdel: Removed Unused Pubbystation vendors + - rscdel: Removed eswords from marine vendors + - rscadd: NT marine vendor now gives energy guns for coupons and stocks energy gun + cells + - rscadd: Cafe and Soy Lattes are now available in the coffee vendor + - bugfix: Dutch Hot Coco is now Pearl Hot Chocolate to be lore compliant + meemofcourse: + - tweak: Changed the content and details of a few Wikibooks + - bugfix: Certain wikibooks not working + retlaw34: + - rscadd: SUNS's swords! Now you can duel over petty matters and potentially die, + just like your forefathers! + - rscadd: SUNS's guns! Now you can fight over serious matters and potentially die, + just like your syndicate comrades! +2024-02-12: + Apogee-dev: + - tweak: Tweaked Syndicate Grunt/Captain clothing descriptions for lore compliance + - refactor: changed paths for ACLF Grunt and 2nd Battlegroup outfit parts + - bugfix: 2nd Battlegroup captain jacket can now hold firearms + MarkSuckerberg: + - admin: Ships should now be categorised by faction in the shuttle manipulator + meemofcourse: + - rscadd: Syndicate Cryopod. + - tweak: The Twinkleshine has gotten a facelift. + - tweak: The Syndicate has started assigning Flotilla Admirals and Redshield Officers + to Twinkleshines. + - tweak: Crew on the Twinkleshine now have to get their stuff from their lockers. + - tweak: Modified the starting text to reflect the lack of telecomms on most ships. + - bugfix: Access on the Twinkleshine. + - bugfix: Syndicate jobs should show up properly on SecHUDs. + - rscadd: Crux-Class Dropship + - rscadd: Ancon-Class Internship Ship + - rscadd: Runner-Class Ambulance + - rscadd: Anvil-Class Dropship + - bugfix: ERTs can now actually spawn at outposts + phoaly: + - rscadd: Added the Elder-class + - rscdel: Removed the Glaive-class + retlaw34: + - tweak: all CMM ships are aspawn now + - rscdel: Corvus-Class +2024-02-13: + ryerice, thgvr: + - imageadd: 'New hair sprites, including: Tribun, Half-shave, Ruby, Sidecut, Very + Long Fringe, Long Hair 2, Gloomy, Gloomy (Long)' + thgvr: + - rscadd: PGF flag wall mount and item diff --git a/html/statbrowser.css b/html/statbrowser.css new file mode 100644 index 000000000000..dc693f42f756 --- /dev/null +++ b/html/statbrowser.css @@ -0,0 +1,227 @@ +body { + font-family: Verdana, Geneva, Tahoma, sans-serif; + font-size: 12px !important; + margin: 0 !important; + padding: 0 !important; + overflow-x: hidden; + overflow-y: scroll; +} + +body.dark { + background-color: #131313; + color: #b2c4dd; + scrollbar-base-color: #1c1c1c; + scrollbar-face-color: #3b3b3b; + scrollbar-3dlight-color: #252525; + scrollbar-highlight-color: #252525; + scrollbar-track-color: #1c1c1c; + scrollbar-arrow-color: #929292; + scrollbar-shadow-color: #3b3b3b; +} + +#menu { + background-color: #F0F0F0; + position: fixed; + width: 100%; + z-index: 100; +} + +.dark #menu { + background-color: #202020; +} + +#statcontent { + padding: 7px 7px 7px 7px; +} + +a { + color: black; + text-decoration: none +} + +.dark a { + color: #b2c4dd; +} + +a:hover, +.dark a:hover { + text-decoration: underline; +} + +ul { + list-style-type: none; + margin: 0; + padding: 0; + background-color: #333; +} + +li { + float: left; +} + +li a { + display: block; + color: white; + text-align: center; + padding: 14px 16px; + text-decoration: none; +} + +li a:hover:not(.active) { + background-color: #111; +} + +.button-container { + display: inline-flex; + flex-wrap: wrap-reverse; + flex-direction: row; + align-items: flex-start; + overflow-x: hidden; + white-space: pre-wrap; + padding: 0 4px; +} + +.button { + background-color: #dfdfdf; + border: 1px solid #cecece; + border-bottom-width: 2px; + color: rgba(0, 0, 0, 0.7); + padding: 6px 4px 4px; + text-align: center; + text-decoration: none; + font-size: 12px; + margin: 0; + cursor: pointer; + transition-duration: 100ms; + order: 3; + min-width: 40px; +} + +.dark button { + background-color: #222222; + border-color: #343434; + color: rgba(255, 255, 255, 0.5); +} + +.button:hover { + background-color: #ececec; + transition-duration: 0; +} + +.dark button:hover { + background-color: #2e2e2e; +} + +.button:active, +.button.active { + background-color: #ffffff; + color: black; + border-top-color: #cecece; + border-left-color: #cecece; + border-right-color: #cecece; + border-bottom-color: #ffffff; +} + +.dark .button:active, +.dark .button.active { + background-color: #444444; + color: white; + border-top-color: #343434; + border-left-color: #343434; + border-right-color: #343434; + border-bottom-color: #ffffff; +} + +.grid-container { + margin: -2px; + margin-right: -15px; +} + +.grid-item { + position: relative; + display: inline-block; + width: 100%; + box-sizing: border-box; + overflow: visible; + padding: 3px 2px; + text-decoration: none; +} + +@media only screen and (min-width: 300px) { + .grid-item { + width: 50%; + } +} + +@media only screen and (min-width: 430px) { + .grid-item { + width: 33%; + } +} + +@media only screen and (min-width: 560px) { + .grid-item { + width: 25%; + } +} + +@media only screen and (min-width: 770px) { + .grid-item { + width: 20%; + } +} + +.grid-item:hover { + z-index: 1; +} + +.grid-item:hover .grid-item-text { + width: auto; + text-decoration: underline; +} + +.grid-item-text { + display: inline-block; + width: 100%; + background-color: #ffffff; + margin: 0 -6px; + padding: 0 6px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + pointer-events: none; +} + +.dark .grid-item-text { + background-color: #131313; +} + +.link { + display: inline; + background: none; + border: none; + padding: 7px 14px; + color: black; + text-decoration: none; + cursor: pointer; + font-size: 13px; + margin: 2px 2px; +} + +.dark .link { + color: #abc6ec; +} + +.link:hover { + text-decoration: underline; +} + +img { + -ms-interpolation-mode: nearest-neighbor; + image-rendering: pixelated; +} + +.interview_panel_controls, +.interview_panel_stats { + margin-bottom: 10px; +} diff --git a/html/statbrowser.html b/html/statbrowser.html index 2bb7f8259afb..1aea8811d58a 100644 --- a/html/statbrowser.html +++ b/html/statbrowser.html @@ -1,1280 +1,3 @@ - - - - Stat Browser - - - - - - - - -
-
- - - + +
+
diff --git a/html/statbrowser.js b/html/statbrowser.js new file mode 100644 index 000000000000..d024d50b8c3d --- /dev/null +++ b/html/statbrowser.js @@ -0,0 +1,1003 @@ +// Polyfills and compatibility ------------------------------------------------ +var decoder = decodeURIComponent || unescape; +if (!Array.prototype.includes) { + Array.prototype.includes = function (thing) { + for (var i = 0; i < this.length; i++) { + if (this[i] == thing) return true; + } + return false; + } +} +if (!String.prototype.trim) { + String.prototype.trim = function () { + return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, ''); + }; +} + +// Status panel implementation ------------------------------------------------ +var status_tab_parts = ["Loading..."]; +var current_tab = null; +var mc_tab_parts = [["Loading...", ""]]; +var href_token = null; +var spells = []; +var spell_tabs = []; +var verb_tabs = []; +var verbs = [["", ""]]; // list with a list inside +var tickets = []; +var interviewManager = { status: "", interviews: [] }; +var sdql2 = []; +var permanent_tabs = []; // tabs that won't be cleared by wipes +var turfcontents = []; +var turfname = ""; +var imageRetryDelay = 500; +var imageRetryLimit = 50; +var menu = document.getElementById('menu'); +var under_menu = document.getElementById('under_menu'); +var statcontentdiv = document.getElementById('statcontent'); +var storedimages = []; +var split_admin_tabs = false; + +// Any BYOND commands that could result in the client's focus changing go through this +// to ensure that when we relinquish our focus, we don't do it after the result of +// a command has already taken focus for itself. +function run_after_focus(callback) { + setTimeout(callback, 0); +} + +function createStatusTab(name) { + if (name.indexOf(".") != -1) { + var splitName = name.split("."); + if (split_admin_tabs && splitName[0] === "Admin") + name = splitName[1]; + else + name = splitName[0]; + } + if (document.getElementById(name) || name.trim() == "") { + return; + } + if (!verb_tabs.includes(name) && !permanent_tabs.includes(name)) { + return; + } + var B = document.createElement("BUTTON"); + B.onclick = function () { + tab_change(name); + this.blur(); + }; + B.id = name; + B.textContent = name; + B.className = "button"; + //ORDERING ALPHABETICALLY + B.style.order = name.charCodeAt(0); + if (name == "Status" || name == "MC") { + B.style.order = name == "Status" ? 1 : 2; + } + //END ORDERING + menu.appendChild(B); + SendTabToByond(name); + under_menu.style.height = menu.clientHeight + 'px'; +} + +function removeStatusTab(name) { + if (!document.getElementById(name) || permanent_tabs.includes(name)) { + return; + } + for (var i = verb_tabs.length - 1; i >= 0; --i) { + if (verb_tabs[i] == name) { + verb_tabs.splice(i, 1); + } + } + menu.removeChild(document.getElementById(name)); + TakeTabFromByond(name); + under_menu.style.height = menu.clientHeight + 'px'; +} + +function sortVerbs() { + verbs.sort(function (a, b) { + var selector = a[0] == b[0] ? 1 : 0; + if (a[selector].toUpperCase() < b[selector].toUpperCase()) { + return 1; + } + else if (a[selector].toUpperCase() > b[selector].toUpperCase()) { + return -1; + } + return 0; + }) +} + +window.onresize = function () { + under_menu.style.height = menu.clientHeight + 'px'; +} + +function addPermanentTab(name) { + if (!permanent_tabs.includes(name)) { + permanent_tabs.push(name); + } + createStatusTab(name); +} + +function removePermanentTab(name) { + for (var i = permanent_tabs.length - 1; i >= 0; --i) { + if (permanent_tabs[i] == name) { + permanent_tabs.splice(i, 1); + } + } + removeStatusTab(name); +} + +function checkStatusTab() { + for (var i = 0; i < menu.children.length; i++) { + if (!verb_tabs.includes(menu.children[i].id) && !permanent_tabs.includes(menu.children[i].id)) { + menu.removeChild(menu.children[i]); + } + } +} + +function remove_verb(v) { + var verb_to_remove = v; // to_remove = [verb:category, verb:name] + for (var i = verbs.length - 1; i >= 0; i--) { + var part_to_remove = verbs[i]; + if (part_to_remove[1] == verb_to_remove[1]) { + verbs.splice(i, 1) + } + } +} + +function check_verbs() { + for (var v = verb_tabs.length - 1; v >= 0; v--) { + verbs_cat_check(verb_tabs[v]); + } +} + +function verbs_cat_check(cat) { + var tabCat = cat; + if (cat.indexOf(".") != -1) { + var splitName = cat.split("."); + if (split_admin_tabs && splitName[0] === "Admin") + tabCat = splitName[1]; + else + tabCat = splitName[0]; + } + var verbs_in_cat = 0; + var verbcat = ""; + if (!verb_tabs.includes(tabCat)) { + removeStatusTab(tabCat); + return; + } + for (var v = 0; v < verbs.length; v++) { + var part = verbs[v]; + verbcat = part[0]; + if (verbcat.indexOf(".") != -1) { + var splitName = verbcat.split("."); + if (split_admin_tabs && splitName[0] === "Admin") + verbcat = splitName[1]; + else + verbcat = splitName[0]; + } + if (verbcat != tabCat || verbcat.trim() == "") { + continue; + } + else { + verbs_in_cat = 1; + break; // we only need one + } + } + if (verbs_in_cat != 1) { + removeStatusTab(tabCat); + if (current_tab == tabCat) + tab_change("Status"); + } +} + +function findVerbindex(name, verblist) { + for (var i = 0; i < verblist.length; i++) { + var part = verblist[i]; + if (part[1] == name) + return i; + } +} +function wipe_verbs() { + verbs = [["", ""]]; + verb_tabs = []; + checkStatusTab(); // remove all empty verb tabs +} + +function update_verbs() { + wipe_verbs(); + Byond.sendMessage("Update-Verbs"); +} + +function SendTabsToByond() { + var tabstosend = []; + tabstosend = tabstosend.concat(permanent_tabs, verb_tabs); + for (var i = 0; i < tabstosend.length; i++) { + SendTabToByond(tabstosend[i]); + } +} + +function SendTabToByond(tab) { + Byond.sendMessage("Send-Tabs", {tab: tab}); +} + +//Byond can't have this tab anymore since we're removing it +function TakeTabFromByond(tab) { + Byond.sendMessage("Remove-Tabs", {tab: tab}); +} + +function spell_cat_check(cat) { + var spells_in_cat = 0; + var spellcat = ""; + for (var s = 0; s < spells.length; s++) { + var spell = spells[s]; + spellcat = spell[0]; + if (spellcat == cat) { + spells_in_cat++; + } + } + if (spells_in_cat < 1) { + removeStatusTab(cat); + } +} + +function tab_change(tab) { + if (tab == current_tab) return; + if (document.getElementById(current_tab)) + document.getElementById(current_tab).className = "button"; // disable active on last button + current_tab = tab; + set_byond_tab(tab); + if (document.getElementById(tab)) + document.getElementById(tab).className = "button active"; // make current button active + var spell_tabs_thingy = (spell_tabs.includes(tab)); + var verb_tabs_thingy = (verb_tabs.includes(tab)); + if (tab == "Status") { + draw_status(); + } else if (tab == "MC") { + draw_mc(); + } else if (spell_tabs_thingy) { + draw_spells(tab); + } else if (verb_tabs_thingy) { + draw_verbs(tab); + } else if (tab == "Debug Stat Panel") { + draw_debug(); + } else if (tab == "Tickets") { + draw_tickets(); + draw_interviews(); + } else if (tab == "SDQL2") { + draw_sdql2(); + } else if (tab == turfname) { + draw_listedturf(); + } else { + statcontentdiv.textContext = "Loading..."; + } + Byond.winset(Byond.windowId, { + 'is-visible': true, + }); +} + +function set_byond_tab(tab) { + Byond.sendMessage("Set-Tab", {tab: tab}); +} + +function draw_debug() { + statcontentdiv.textContent = ""; + var wipeverbstabs = document.createElement("div"); + var link = document.createElement("a"); + link.onclick = function () { wipe_verbs() }; + link.textContent = "Wipe All Verbs"; + wipeverbstabs.appendChild(link); + document.getElementById("statcontent").appendChild(wipeverbstabs); + var wipeUpdateVerbsTabs = document.createElement("div"); + var updateLink = document.createElement("a"); + updateLink.onclick = function () { update_verbs() }; + updateLink.textContent = "Wipe and Update All Verbs"; + wipeUpdateVerbsTabs.appendChild(updateLink); + document.getElementById("statcontent").appendChild(wipeUpdateVerbsTabs); + var text = document.createElement("div"); + text.textContent = "Verb Tabs:"; + document.getElementById("statcontent").appendChild(text); + var table1 = document.createElement("table"); + for (var i = 0; i < verb_tabs.length; i++) { + var part = verb_tabs[i]; + // Hide subgroups except admin subgroups if they are split + if (verb_tabs[i].lastIndexOf(".") != -1) { + var splitName = verb_tabs[i].split("."); + if (split_admin_tabs && splitName[0] === "Admin") + part = splitName[1]; + else + continue; + } + var tr = document.createElement("tr"); + var td1 = document.createElement("td"); + td1.textContent = part; + var a = document.createElement("a"); + a.onclick = function (part) { + return function () { removeStatusTab(part) }; + }(part); + a.textContent = " Delete Tab " + part; + td1.appendChild(a); + tr.appendChild(td1); + table1.appendChild(tr); + } + document.getElementById("statcontent").appendChild(table1); + var header2 = document.createElement("div"); + header2.textContent = "Verbs:"; + document.getElementById("statcontent").appendChild(header2); + var table2 = document.createElement("table"); + for (var v = 0; v < verbs.length; v++) { + var part2 = verbs[v]; + var trr = document.createElement("tr"); + var tdd1 = document.createElement("td"); + tdd1.textContent = part2[0]; + var tdd2 = document.createElement("td"); + tdd2.textContent = part2[1]; + trr.appendChild(tdd1); + trr.appendChild(tdd2); + table2.appendChild(trr); + } + document.getElementById("statcontent").appendChild(table2); + var text3 = document.createElement("div"); + text3.textContent = "Permanent Tabs:"; + document.getElementById("statcontent").appendChild(text3); + var table3 = document.createElement("table"); + for (var i = 0; i < permanent_tabs.length; i++) { + var part3 = permanent_tabs[i]; + var trrr = document.createElement("tr"); + var tddd1 = document.createElement("td"); + tddd1.textContent = part3; + trrr.appendChild(tddd1); + table3.appendChild(trrr); + } + document.getElementById("statcontent").appendChild(table3); + +} +function draw_status() { + if (!document.getElementById("Status")) { + createStatusTab("Status"); + current_tab = "Status"; + } + statcontentdiv.textContent = ''; + for (var i = 0; i < status_tab_parts.length; i++) { + if (status_tab_parts[i].trim() == "") { + document.getElementById("statcontent").appendChild(document.createElement("br")); + } else { + var div = document.createElement("div"); + div.textContent = status_tab_parts[i]; + document.getElementById("statcontent").appendChild(div); + } + } + if (verb_tabs.length == 0 || !verbs) { + Byond.command("Fix-Stat-Panel"); + } +} + +function draw_mc() { + statcontentdiv.textContent = ""; + var table = document.createElement("table"); + for (var i = 0; i < mc_tab_parts.length; i++) { + var part = mc_tab_parts[i]; + var tr = document.createElement("tr"); + var td1 = document.createElement("td"); + td1.textContent = part[0]; + var td2 = document.createElement("td"); + if (part[2]) { + var a = document.createElement("a"); + a.href = "?_src_=vars;admin_token=" + href_token + ";Vars=" + part[2]; + a.textContent = part[1]; + td2.appendChild(a); + } else { + td2.textContent = part[1]; + } + tr.appendChild(td1); + tr.appendChild(td2); + table.appendChild(tr); + } + document.getElementById("statcontent").appendChild(table); +} + +function remove_tickets() { + if (tickets) { + tickets = []; + removePermanentTab("Tickets"); + if (current_tab == "Tickets") + tab_change("Status"); + } + checkStatusTab(); +} + +function remove_sdql2() { + if (sdql2) { + sdql2 = []; + removePermanentTab("SDQL2"); + if (current_tab == "SDQL2") + tab_change("Status"); + } + checkStatusTab(); +} + +function remove_interviews() { + if (tickets) { + tickets = []; + } + checkStatusTab(); +} + +function iconError(e) { + if(current_tab != turfname) { + return; + } + setTimeout(function () { + var node = e.target; + var current_attempts = Number(node.getAttribute("data-attempts")) || 0 + if (current_attempts > imageRetryLimit) { + return; + } + var src = node.src; + node.src = null; + node.src = src + '#' + current_attempts; + node.setAttribute("data-attempts", current_attempts + 1) + draw_listedturf(); + }, imageRetryDelay); +} + +function draw_listedturf() { + statcontentdiv.textContent = ""; + var table = document.createElement("table"); + for (var i = 0; i < turfcontents.length; i++) { + var part = turfcontents[i]; + if (storedimages[part[1]] == null && part[2]) { + var img = document.createElement("img"); + img.src = part[2]; + img.id = part[1]; + storedimages[part[1]] = part[2]; + img.onerror = iconError; + table.appendChild(img); + } else { + var img = document.createElement("img"); + img.onerror = iconError; + img.src = storedimages[part[1]]; + img.id = part[1]; + table.appendChild(img); + } + var b = document.createElement("div"); + var clickcatcher = ""; + b.className = "link"; + b.onmousedown = function (part) { + // The outer function is used to close over a fresh "part" variable, + // rather than every onmousedown getting the "part" of the last entry. + return function (e) { + e.preventDefault(); + clickcatcher = "?src=" + part[1]; + switch (e.button) { + case 1: + clickcatcher += ";statpanel_item_click=middle" + break; + case 2: + clickcatcher += ";statpanel_item_click=right" + break; + default: + clickcatcher += ";statpanel_item_click=left" + } + if (e.shiftKey) { + clickcatcher += ";statpanel_item_shiftclick=1"; + } + if (e.ctrlKey) { + clickcatcher += ";statpanel_item_ctrlclick=1"; + } + if (e.altKey) { + clickcatcher += ";statpanel_item_altclick=1"; + } + window.location.href = clickcatcher; + } + }(part); + b.textContent = part[0]; + table.appendChild(b); + table.appendChild(document.createElement("br")); + } + document.getElementById("statcontent").appendChild(table); +} + +function remove_listedturf() { + removePermanentTab(turfname); + checkStatusTab(); + if (current_tab == turfname) { + tab_change("Status"); + } +} + +function remove_mc() { + removeStatusTab("MC"); + if (current_tab == "MC") { + tab_change("Status"); + } +}; + +function draw_sdql2() { + statcontentdiv.textContent = ""; + var table = document.createElement("table"); + for (var i = 0; i < sdql2.length; i++) { + var part = sdql2[i]; + var tr = document.createElement("tr"); + var td1 = document.createElement("td"); + td1.textContent = part[0]; + var td2 = document.createElement("td"); + if (part[2]) { + var a = document.createElement("a"); + a.href = "?src=" + part[2] + ";statpanel_item_click=left"; + a.textContent = part[1]; + td2.appendChild(a); + } else { + td2.textContent = part[1]; + } + tr.appendChild(td1); + tr.appendChild(td2); + table.appendChild(tr); + } + document.getElementById("statcontent").appendChild(table); +} + +function draw_tickets() { + statcontentdiv.textContent = ""; + var table = document.createElement("table"); + if (!tickets) { + return; + } + for (var i = 0; i < tickets.length; i++) { + var part = tickets[i]; + var tr = document.createElement("tr"); + var td1 = document.createElement("td"); + td1.textContent = part[0]; + var td2 = document.createElement("td"); + if (part[2]) { + var a = document.createElement("a"); + a.href = "?_src_=holder;admin_token=" + href_token + ";ahelp=" + part[2] + ";ahelp_action=ticket;statpanel_item_click=left;action=ticket"; + a.textContent = part[1]; + td2.appendChild(a); + } else if (part[3]) { + var a = document.createElement("a"); + a.href = "?src=" + part[3] + ";statpanel_item_click=left"; + a.textContent = part[1]; + td2.appendChild(a); + } else { + td2.textContent = part[1]; + } + tr.appendChild(td1); + tr.appendChild(td2); + table.appendChild(tr); + } + document.getElementById("statcontent").appendChild(table); +} + +function draw_interviews() { + var body = document.createElement("div"); + var header = document.createElement("h3"); + header.textContent = "Interviews"; + body.appendChild(header); + var manDiv = document.createElement("div"); + manDiv.className = "interview_panel_controls" + var manLink = document.createElement("a"); + manLink.textContent = "Open Interview Manager Panel"; + manLink.href = "?_src_=holder;admin_token=" + href_token + ";interview_man=1;statpanel_item_click=left"; + manDiv.appendChild(manLink); + body.appendChild(manDiv); + + // List interview stats + var statsDiv = document.createElement("table"); + statsDiv.className = "interview_panel_stats"; + for (var key in interviewManager.status) { + var d = document.createElement("div"); + var tr = document.createElement("tr"); + var stat_name = document.createElement("td"); + var stat_text = document.createElement("td"); + stat_name.textContent = key; + stat_text.textContent = interviewManager.status[key]; + tr.appendChild(stat_name); + tr.appendChild(stat_text); + statsDiv.appendChild(tr); + } + body.appendChild(statsDiv); + document.getElementById("statcontent").appendChild(body); + + // List interviews if any are open + var table = document.createElement("table"); + table.className = "interview_panel_table"; + if (!interviewManager) { + return; + } + for (var i = 0; i < interviewManager.interviews.length; i++) { + var part = interviewManager.interviews[i]; + var tr = document.createElement("tr"); + var td = document.createElement("td"); + var a = document.createElement("a"); + a.textContent = part["status"]; + a.href = "?_src_=holder;admin_token=" + href_token + ";interview=" + part["ref"] + ";statpanel_item_click=left"; + td.appendChild(a); + tr.appendChild(td); + table.appendChild(tr); + } + document.getElementById("statcontent").appendChild(table); +} + +function draw_spells(cat) { + statcontentdiv.textContent = ""; + var table = document.createElement("table"); + for (var i = 0; i < spells.length; i++) { + var part = spells[i]; + if (part[0] != cat) continue; + var tr = document.createElement("tr"); + var td1 = document.createElement("td"); + td1.textContent = part[1]; + var td2 = document.createElement("td"); + if (part[3]) { + var a = document.createElement("a"); + a.href = "?src=" + part[3] + ";statpanel_item_click=left"; + a.textContent = part[2]; + td2.appendChild(a); + } else { + td2.textContent = part[2]; + } + tr.appendChild(td1); + tr.appendChild(td2); + table.appendChild(tr); + } + document.getElementById("statcontent").appendChild(table); +} + +function make_verb_onclick(command) { + return function () { + run_after_focus(function () { + Byond.command(command); + }); + }; +} + +function draw_verbs(cat) { + statcontentdiv.textContent = ""; + var table = document.createElement("div"); + var additions = {}; // additional sub-categories to be rendered + table.className = "grid-container"; + sortVerbs(); + if (split_admin_tabs && cat.lastIndexOf(".") != -1) { + var splitName = cat.split("."); + if (splitName[0] === "Admin") + cat = splitName[1]; + } + verbs.reverse(); // sort verbs backwards before we draw + for (var i = 0; i < verbs.length; ++i) { + var part = verbs[i]; + var name = part[0]; + if (split_admin_tabs && name.lastIndexOf(".") != -1) { + var splitName = name.split("."); + if (splitName[0] === "Admin") + name = splitName[1]; + } + var command = part[1]; + + if (command && name.lastIndexOf(cat, 0) != -1 && (name.length == cat.length || name.charAt(cat.length) == ".")) { + var subCat = name.lastIndexOf(".") != -1 ? name.split(".")[1] : null; + if (subCat && !additions[subCat]) { + var newTable = document.createElement("div"); + newTable.className = "grid-container"; + additions[subCat] = newTable; + } + + var a = document.createElement("a"); + a.href = "#"; + a.onclick = make_verb_onclick(command.replace(/\s/g, "-")); + a.className = "grid-item"; + var t = document.createElement("span"); + t.textContent = command; + t.className = "grid-item-text"; + a.appendChild(t); + (subCat ? additions[subCat] : table).appendChild(a); + } + } + + // Append base table to view + var content = document.getElementById("statcontent"); + content.appendChild(table); + + // Append additional sub-categories if relevant + for (var cat in additions) { + if (additions.hasOwnProperty(cat)) { + // do addition here + var header = document.createElement("h3"); + header.textContent = cat; + content.appendChild(header); + content.appendChild(additions[cat]); + } + } +} + +function set_theme(which) { + if (which == "light") { + document.body.className = ""; + set_style_sheet("browserOutput_white"); + } else if (which == "dark") { + document.body.className = "dark"; + set_style_sheet("browserOutput"); + } +} + +function set_style_sheet(sheet) { + if (document.getElementById("goonStyle")) { + var currentSheet = document.getElementById("goonStyle"); + currentSheet.parentElement.removeChild(currentSheet); + } + var head = document.getElementsByTagName('head')[0]; + var sheetElement = document.createElement("link"); + sheetElement.id = "goonStyle"; + sheetElement.rel = "stylesheet"; + sheetElement.type = "text/css"; + sheetElement.href = sheet + ".css"; + sheetElement.media = 'all'; + head.appendChild(sheetElement); +} + +function restoreFocus() { + run_after_focus(function () { + Byond.winset('map', { + focus: true, + }); + }); +} + +function getCookie(cname) { + var name = cname + '='; + var ca = document.cookie.split(';'); + for (var i = 0; i < ca.length; i++) { + var c = ca[i]; + while (c.charAt(0) == ' ') c = c.substring(1); + if (c.indexOf(name) === 0) { + return decoder(c.substring(name.length, c.length)); + } + } + return ''; +} + +function add_verb_list(payload) { + var to_add = payload; // list of a list with category and verb inside it + to_add.sort(); // sort what we're adding + for (var i = 0; i < to_add.length; i++) { + var part = to_add[i]; + if (!part[0]) + continue; + var category = part[0]; + if (category.indexOf(".") != -1) { + var splitName = category.split("."); + if (split_admin_tabs && splitName[0] === "Admin") + category = splitName[1]; + else + category = splitName[0]; + } + if (findVerbindex(part[1], verbs)) + continue; + if (verb_tabs.includes(category)) { + verbs.push(part); + if (current_tab == category) { + draw_verbs(category); // redraw if we added a verb to the tab we're currently in + } + } else if (category) { + verb_tabs.push(category); + verbs.push(part); + createStatusTab(category); + } + } +}; + +function init_spells() { + var cat = ""; + for (var i = 0; i < spell_tabs.length; i++) { + cat = spell_tabs[i]; + if (cat.length > 0) { + verb_tabs.push(cat); + createStatusTab(cat); + } + } +} + +document.addEventListener("mouseup", restoreFocus); +document.addEventListener("keyup", restoreFocus); + +if (!current_tab) { + addPermanentTab("Status"); + tab_change("Status"); +} + +window.onload = function () { + Byond.command("Update-Verbs"); +}; + +Byond.subscribeTo('update_spells', function (payload) { + spell_tabs = payload.spell_tabs; + var do_update = false; + if (spell_tabs.includes(current_tab)) { + do_update = true; + } + init_spells(); + if (payload.verblist) { + spells = payload.verblist; + if (do_update) { + draw_spells(current_tab); + } + } else { + remove_spells(); + } +}); + +Byond.subscribeTo('remove_verb_list', function (v) { + var to_remove = v; + for (var i = 0; i < to_remove.length; i++) { + remove_verb(to_remove[i]); + } + check_verbs(); + sortVerbs(); + if (verb_tabs.includes(current_tab)) + draw_verbs(current_tab); +}); + +// passes a 2D list of (verbcategory, verbname) creates tabs and adds verbs to respective list +// example (IC, Say) +Byond.subscribeTo('init_verbs', function (payload) { + wipe_verbs(); // remove all verb categories so we can replace them + checkStatusTab(); // remove all status tabs + verb_tabs = payload.panel_tabs; + verb_tabs.sort(); // sort it + var do_update = false; + var cat = ""; + for (var i = 0; i < verb_tabs.length; i++) { + cat = verb_tabs[i]; + createStatusTab(cat); // create a category if the verb doesn't exist yet + } + if (verb_tabs.includes(current_tab)) { + do_update = true; + } + if (payload.verblist) { + add_verb_list(payload.verblist); + sortVerbs(); // sort them + if (do_update) { + draw_verbs(current_tab); + } + } + SendTabsToByond(); +}); + +Byond.subscribeTo('update_stat', function (payload) { + status_tab_parts = [payload.ping_str]; + var parsed = payload.global_data; + + for (var i = 0; i < parsed.length; i++) if (parsed[i] != null) status_tab_parts.push(parsed[i]); + + parsed = payload.other_str; + + for (var i = 0; i < parsed.length; i++) if (parsed[i] != null) status_tab_parts.push(parsed[i]); + + if (current_tab == "Status") { + draw_status(); + } else if (current_tab == "Debug Stat Panel") { + draw_debug(); + } +}); + +Byond.subscribeTo('update_mc', function (payload) { + mc_tab_parts = payload.mc_data; + mc_tab_parts.splice(0, 0, ["Location:", payload.coord_entry]); + + if (!verb_tabs.includes("MC")) { + verb_tabs.push("MC"); + } + + createStatusTab("MC"); + + if (current_tab == "MC") { + draw_mc(); + } +}); + +Byond.subscribeTo('remove_spells', function () { + for (var s = 0; s < spell_tabs.length; s++) { + removeStatusTab(spell_tabs[s]); + } +}); + +Byond.subscribeTo('init_spells', function () { + var cat = ""; + for (var i = 0; i < spell_tabs.length; i++) { + cat = spell_tabs[i]; + if (cat.length > 0) { + verb_tabs.push(cat); + createStatusTab(cat); + } + } +}); + +Byond.subscribeTo('check_spells', function () { + for (var v = 0; v < spell_tabs.length; v++) { + spell_cat_check(spell_tabs[v]); + } +}); + +Byond.subscribeTo('create_debug', function () { + if (!document.getElementById("Debug Stat Panel")) { + addPermanentTab("Debug Stat Panel"); + } else { + removePermanentTab("Debug Stat Panel"); + } +}); + +Byond.subscribeTo('create_listedturf', function (TN) { + remove_listedturf(); // remove the last one if we had one + turfname = TN; + addPermanentTab(turfname); + tab_change(turfname); +}); + +Byond.subscribeTo('remove_admin_tabs', function () { + href_token = null; + remove_mc(); + remove_tickets(); + remove_sdql2(); + remove_interviews(); +}); + +Byond.subscribeTo('update_listedturf', function (TC) { + turfcontents = TC; + if (current_tab == turfname) { + draw_listedturf(); + } +}); + +Byond.subscribeTo('update_interviews', function (I) { + interviewManager = I; + if (current_tab == "Tickets") { + draw_interviews(); + } +}); + +Byond.subscribeTo('update_split_admin_tabs', function (status) { + status = (status == true); + + if (split_admin_tabs !== status) { + if (split_admin_tabs === true) { + removeStatusTab("Events"); + removeStatusTab("Fun"); + removeStatusTab("Game"); + } + update_verbs(); + } + split_admin_tabs = status; +}); + +Byond.subscribeTo('add_admin_tabs', function (ht) { + href_token = ht; + addPermanentTab("MC"); + addPermanentTab("Tickets"); +}); + +Byond.subscribeTo('update_sdql2', function (S) { + sdql2 = S; + if (sdql2.length > 0 && !verb_tabs.includes("SDQL2")) { + verb_tabs.push("SDQL2"); + addPermanentTab("SDQL2"); + } + if (current_tab == "SDQL2") { + draw_sdql2(); + } +}); + +Byond.subscribeTo('update_tickets', function (T) { + tickets = T; + if (!verb_tabs.includes("Tickets")) { + verb_tabs.push("Tickets"); + addPermanentTab("Tickets"); + } + if (current_tab == "Tickets") { + draw_tickets(); + } +}); + +Byond.subscribeTo('remove_listedturf', remove_listedturf); + +Byond.subscribeTo('remove_sdql2', remove_sdql2); + +Byond.subscribeTo('remove_mc', remove_mc); + +Byond.subscribeTo('add_verb_list', add_verb_list); diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index dbb2a6a40ff5..151cc5c1b2ea 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index b67e589ef5d4..78b8033a2e35 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index 137b0673482d..b7574c4afb0e 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi index 9af8d7dc8bba..5f7fa454a218 100644 Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ diff --git a/icons/mob/clothing/faction/gezena/suits.dmi b/icons/mob/clothing/faction/gezena/suits.dmi index c76b3368c644..a5a6e864dddf 100644 Binary files a/icons/mob/clothing/faction/gezena/suits.dmi and b/icons/mob/clothing/faction/gezena/suits.dmi differ diff --git a/icons/mob/clothing/faction/suns/belt.dmi b/icons/mob/clothing/faction/suns/belt.dmi new file mode 100644 index 000000000000..dde9fb4bfa42 Binary files /dev/null and b/icons/mob/clothing/faction/suns/belt.dmi differ diff --git a/icons/mob/clothing/faction/suns/mask.dmi b/icons/mob/clothing/faction/suns/mask.dmi index 9068c5c74abc..373ae5b94052 100644 Binary files a/icons/mob/clothing/faction/suns/mask.dmi and b/icons/mob/clothing/faction/suns/mask.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index f370aa665669..e6dd95288038 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index a832ae961c56..4cde21dfa401 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi index bc8daf14abd6..43440753b4f7 100644 Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi index 7168514ee697..b8293f7cb440 100644 Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ diff --git a/icons/mob/hair_extensions.dmi b/icons/mob/hair_extensions.dmi deleted file mode 100644 index cafc9fab781c..000000000000 Binary files a/icons/mob/hair_extensions.dmi and /dev/null differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index d130ba2cf2e3..a819dd3ca780 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/inhands/faction/suns/suns_lefthand.dmi b/icons/mob/inhands/faction/suns/suns_lefthand.dmi index f608d69ff95f..68eaf2a408f3 100644 Binary files a/icons/mob/inhands/faction/suns/suns_lefthand.dmi and b/icons/mob/inhands/faction/suns/suns_lefthand.dmi differ diff --git a/icons/mob/inhands/faction/suns/suns_righthand.dmi b/icons/mob/inhands/faction/suns/suns_righthand.dmi index 2738ccdd2903..67743f04a454 100644 Binary files a/icons/mob/inhands/faction/suns/suns_righthand.dmi and b/icons/mob/inhands/faction/suns/suns_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 24557d26a896..811173593681 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index b68f44a56727..4976bd2e2e00 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index 8037796c590a..41093fde051e 100644 Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi index 6231276ec7c4..a8559339cd26 100644 Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ diff --git a/icons/mob/ipc_accessories.dmi b/icons/mob/ipc_accessories.dmi index 86311ca3172e..e9fb262aa319 100644 Binary files a/icons/mob/ipc_accessories.dmi and b/icons/mob/ipc_accessories.dmi differ diff --git a/icons/mob/species/ipc/bodyparts.dmi b/icons/mob/species/ipc/bodyparts.dmi index f5c348617b56..1b4b568dcc78 100644 Binary files a/icons/mob/species/ipc/bodyparts.dmi and b/icons/mob/species/ipc/bodyparts.dmi differ diff --git a/icons/mob/species/misc/digitigrade.dmi b/icons/mob/species/misc/digitigrade.dmi index 7c6aca4107b1..b937694ec240 100644 Binary files a/icons/mob/species/misc/digitigrade.dmi and b/icons/mob/species/misc/digitigrade.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 16b813111187..24cdcaed7839 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/faction/gezena/suits.dmi b/icons/obj/clothing/faction/gezena/suits.dmi index 09e00adf3289..f115778221f7 100644 Binary files a/icons/obj/clothing/faction/gezena/suits.dmi and b/icons/obj/clothing/faction/gezena/suits.dmi differ diff --git a/icons/obj/clothing/faction/suns/belt.dmi b/icons/obj/clothing/faction/suns/belt.dmi new file mode 100644 index 000000000000..84c5fd0b1b64 Binary files /dev/null and b/icons/obj/clothing/faction/suns/belt.dmi differ diff --git a/icons/obj/clothing/faction/suns/mask.dmi b/icons/obj/clothing/faction/suns/mask.dmi index 1417e85a42db..4554e2013dd8 100644 Binary files a/icons/obj/clothing/faction/suns/mask.dmi and b/icons/obj/clothing/faction/suns/mask.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 45d868f69692..10e7be38f19f 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 11a1d9f84857..a96fa819bc3e 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 10eab742cfa6..7357ac421285 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index b0d9bd53a345..ef671bc9c0d9 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/deskflags.dmi b/icons/obj/deskflags.dmi new file mode 100644 index 000000000000..cf1eaacf5bb3 Binary files /dev/null and b/icons/obj/deskflags.dmi differ diff --git a/icons/obj/flags.dmi b/icons/obj/flags.dmi deleted file mode 100644 index 71681940bbb7..000000000000 Binary files a/icons/obj/flags.dmi and /dev/null differ diff --git a/icons/obj/guns/48x32guns.dmi b/icons/obj/guns/48x32guns.dmi index 2d0e82cb0a77..fa7eba30f13a 100644 Binary files a/icons/obj/guns/48x32guns.dmi and b/icons/obj/guns/48x32guns.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 8e6b46f822d6..b89094f953f3 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 7a20a687e055..81c1e3ff9b12 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi index d6921658546f..1d4b0e63d10e 100644 Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ diff --git a/icons/obj/structures/signs/directions.dmi b/icons/obj/structures/signs/directions.dmi new file mode 100644 index 000000000000..f95cc15bbf87 Binary files /dev/null and b/icons/obj/structures/signs/directions.dmi differ diff --git a/icons/obj/structures/signs/sign.dmi b/icons/obj/structures/signs/sign.dmi new file mode 100644 index 000000000000..c7038f2d4121 Binary files /dev/null and b/icons/obj/structures/signs/sign.dmi differ diff --git a/icons/obj/structures/signs/wallflags.dmi b/icons/obj/structures/signs/wallflags.dmi new file mode 100644 index 000000000000..4b4696ad9623 Binary files /dev/null and b/icons/obj/structures/signs/wallflags.dmi differ diff --git a/shiptest.dme b/shiptest.dme index 9840f4d4cc9c..716dde409b8c 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -375,6 +375,7 @@ #include "code\controllers\subsystem\processing\nanites.dm" #include "code\controllers\subsystem\processing\networks.dm" #include "code\controllers\subsystem\processing\obj.dm" +#include "code\controllers\subsystem\processing\obj_tab_items.dm" #include "code\controllers\subsystem\processing\processing.dm" #include "code\controllers\subsystem\processing\projectiles.dm" #include "code\controllers\subsystem\processing\quirks.dm" @@ -458,6 +459,7 @@ #include "code\datums\components\chasm.dm" #include "code\datums\components\connect_containers.dm" #include "code\datums\components\connect_loc_behalf.dm" +#include "code\datums\components\connect_mob_behalf.dm" #include "code\datums\components\connect_range.dm" #include "code\datums\components\construction.dm" #include "code\datums\components\creamed.dm" @@ -974,7 +976,7 @@ #include "code\game\MapData\shuttles\misc.dm" #include "code\game\MapData\shuttles\nanotrasen_mimir.dm" #include "code\game\MapData\shuttles\nanotrasen_ranger.dm" -#include "code\game\MapData\shuttles\srm_glaive.dm" +#include "code\game\MapData\shuttles\srm_elder.dm" #include "code\game\mecha\mech_bay.dm" #include "code\game\mecha\mech_fabricator.dm" #include "code\game\mecha\mecha.dm" @@ -3448,7 +3450,6 @@ #include "code\modules\vending\games.dm" #include "code\modules\vending\liberation.dm" #include "code\modules\vending\liberation_toy.dm" -#include "code\modules\vending\magivend.dm" #include "code\modules\vending\medical.dm" #include "code\modules\vending\medical_wall.dm" #include "code\modules\vending\megaseed.dm" diff --git a/tgui/packages/tgui/interfaces/NtosRoboControl.js b/tgui/packages/tgui/interfaces/NtosRoboControl.js index f6bdb42bd86c..b206018c4e2e 100644 --- a/tgui/packages/tgui/interfaces/NtosRoboControl.js +++ b/tgui/packages/tgui/interfaces/NtosRoboControl.js @@ -83,7 +83,7 @@ const RobotInfo = (props, context) => {