From ee930d675afd2470b3a548ea8d038a1cd7b1c920 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Thu, 10 Oct 2024 00:52:06 +0200 Subject: [PATCH] Maploader tweaks (#20026) Fixed the maploader sleeping without reinitializing SSAtoms to initialize, which caused some runtimes in niche cases in the CI. --- code/game/machinery/doors/blast_door.dm | 3 + .../admin/verbs/map_template_loadverb.dm | 6 +- code/modules/library/lib_items.dm | 4 + code/modules/mapping/map_template.dm | 2 - code/modules/mapping/reader.dm | 23 +- code/modules/recycling/disposal.dm | 2 +- code/unit_tests/map_tests.dm | 14 + .../fluffyghost-maploadertweaks.yml | 58 + .../abandoned_diner/abandoned_diner.dmm | 6 - .../abandoned_industrial_station.dmm | 4 +- .../away_site/abandoned_mining/cursed.dmm | 18 +- .../abandoned_propellant_depot.dmm | 84 +- .../away_site/big_derelict/bigderelict.dmm | 4146 ++++++++--------- .../crashed_elyran_tanker.dmm | 97 +- .../crystal_planet_outpost.dmm | 49 +- maps/away/away_site/cult_base/cult_base.dmm | 886 +--- .../away_site/first_aurora/first_aurora.dmm | 356 +- .../away_site/idris_wreck/idris_wreck.dmm | 4 +- maps/away/away_site/magshield/magshield.dmm | 25 +- .../orion/orion_automated_station.dmm | 47 +- .../away_site/pirate_base/pirate_base.dmm | 92 +- maps/away/away_site/racers/racers.dmm | 14 +- .../away_site/romanovich/grand_romanovich.dmm | 1785 +++---- .../hegemony_waypoint/hegemony_waypoint.dmm | 12 +- .../hegemony_waypoint_submaps.dmm | 9 +- maps/away/away_site/sol_bunker/bunker.dmm | 29 +- .../tajara/mining_jack/mining_jack.dmm | 35 +- .../peoples_station/peoples_station.dmm | 155 +- .../tajara/pra_satellite/pra_satellite.dmm | 24 +- .../saniorios_outpost/saniorios_outpost.dmm | 52 +- .../away_site/tajara/scrapper/scrapper.dmm | 64 +- .../tajara/taj_safehouse/tajara_safehouse.dmm | 48 +- .../uueoaesa/omgolo/omgolo_tourist.dmm | 195 +- .../uueoaesa/reclamation/ihss_reclamation.dmm | 114 +- .../uueoaesa/tret/tret_industrial_complex.dmm | 984 +--- .../biesel/tcaf_corvette/tcaf_corvette.dmm | 252 +- .../tcfl_patrol/tcfl_peacekeeper_ship.dmm | 540 ++- maps/away/ships/casino/casino.dmm | 64 +- maps/away/ships/coc/coc_ranger/coc_ship.dm | 9 +- maps/away/ships/coc/coc_ranger/coc_ship.dmm | 107 +- maps/away/ships/coc/coc_scarab/coc_scarab.dmm | 9 +- .../ships/coc/coc_surveyor/coc_surveyor.dmm | 59 +- .../coc/gadpathur_patrol/gadpathur_patrol.dmm | 44 +- .../dominian_corvette/dominian_corvette.dmm | 210 +- .../dominian_science_vessel.dmm | 81 +- .../dominian_unathi_privateer.dmm | 97 +- .../ships/dpra/hailstorm/hailstorm_ship.dmm | 141 +- maps/away/ships/einstein/ee_spy_ship.dmm | 360 +- .../elyra/elyra_corvette/elyra_corvette.dmm | 42 +- .../ships/freebooter/freebooter_ship_.dmm | 49 +- .../freebooter/freebooter_ship_submaps.dmm | 47 +- .../golden_deep/golden_deep_merchant.dmm | 120 +- .../fishing_league_trawler.dmm | 47 +- .../hegemony_corvette/hegemony_corvette.dmm | 200 +- .../merchants_guild/merchant_freighter.dmm | 120 +- .../miners_guild/miners_guild_station.dmm | 105 +- maps/away/ships/heph/cyclops/cyclops.dmm | 7 +- .../heph/heph_security/heph_security.dmm | 145 +- maps/away/ships/iac/iac_rescue_ship.dmm | 55 +- maps/away/ships/idris/idris_cruiser.dmm | 3 - .../ships/kataphracts/kataphract_ship.dmm | 428 +- .../ships/konyang/air_konyang/air_konyang.dmm | 3 +- .../einstein_shuttle/einstein_shuttle.dmm | 15 +- .../konyang/ipc_refugee/ipc_refugee_ship.dmm | 12 +- .../ships/konyang/kasf_ship/kasf_ship.dmm | 2 - .../konyang/konyang_wreck/konyang_wreck.dmm | 42 +- .../ships/konyang/water_barge/water_barge.dmm | 26 +- maps/away/ships/lone_spacer/lone_spacer.dmm | 47 +- .../ships/nka/nka_merchant/nka_merchant.dmm | 158 +- maps/away/ships/orion/orion_express_ship.dmm | 136 +- .../database_freighter/database_freighter.dmm | 55 +- .../ships/pra/headmaster/headmaster_ship.dmm | 226 +- maps/away/ships/sadar_scout/sadar_scout.dmm | 1 - maps/away/ships/scc/scc_scout_ship.dmm | 145 +- .../ships/sol/sol_merc/fsf_patrol_ship.dmm | 429 +- .../ships/sol/sol_pirate/sfa_patrol_ship.dmm | 145 +- maps/away/ships/sol/sol_ssmd/ssmd_ship.dmm | 54 +- .../ships/tajara/circus/adhomian_circus.dmm | 13 +- .../tajara/taj_smuggler/tajaran_smuggler.dmm | 75 +- .../tirakqi_smuggler/tirakqi_smuggler.dmm | 25 +- .../ships/tramp_freighter/tramp_freighter.dmm | 69 +- .../hiskyn/unathi_pirate_hiskyn.dmm | 286 +- .../izharshan/unathi_pirate_izharshan.dmm | 33 +- .../tarwa/unathi_pirate_tarwa.dmm | 84 +- maps/away/ships/xanu/xanu_frigate.dmm | 7 - maps/away/ships/yacht/yacht.dmm | 12 +- maps/away/ships/yacht_civ/yacht_civ.dmm | 100 +- maps/dungeon_spawns/coc_ship_unique.dmm | 11 +- .../dungeon_spawns/satellite_crash_unique.dmm | 3 +- maps/dungeon_spawns/shuttle_unique.dmm | 8 +- maps/dungeon_spawns/skrell_crash_unique.dmm | 66 +- maps/dungeon_spawns/sol_bunker_unique.dmm | 153 +- maps/dungeon_spawns/vannatusk_unique.dmm | 47 +- maps/dungeon_spawns/vault_unique.dmm | 6 +- .../generic_dock/code/generic_dock_areas.dm | 3 + maps/event/generic_dock/generic_dock-1.dmm | 233 +- maps/event/halloween/halloween.dmm | 78 +- maps/event/idris_cruise/idris_cruise-1.dmm | 2151 +++------ maps/event/rooftop/rooftop-1.dmm | 382 +- .../helpers/event_shuttles/sccv_apollo_v1.dmm | 32 +- .../helpers/event_shuttles/sccv_apollo_v2.dmm | 26 +- .../helpers/event_shuttles/sccv_apollo_v3.dmm | 26 +- maps/helpers/event_shuttles/sccv_artemis.dmm | 36 +- maps/helpers/event_shuttles/sccv_packrat.dmm | 15 +- .../guidelines/guidelines_airlocks.dmm | 171 +- maps/helpers/guidelines/guidelines_docks.dmm | 36 +- .../guidelines/guidelines_shuttles.dmm | 16 +- maps/helpers/guidelines/guidelines_wiring.dmm | 8 +- .../pre_fabricated/massfab_civilian_misc.dmm | 9 +- .../pre_fabricated/massfab_medical.dmm | 9 +- .../exoplanets/adhomai/adhomai_bar.dmm | 4 +- .../adhomai/adhomai_fallout_bunker.dmm | 3 +- .../exoplanets/adhomai/adhomai_silo.dmm | 3 +- .../exoplanets/adhomai/adhomai_village.dmm | 4 +- .../adhomai/adhomai_war_memorial.dmm | 4 +- .../abandoned_prison/abandoned_prison.dmm | 59 +- .../coalition_base/coalition_base.dmm | 14 +- .../asteroid/coc_ship/coc_ship_unique.dmm | 10 +- .../mystery_ship/mystery_ship_unique.dmm | 12 +- .../satellite_crash_unique.dmm | 3 +- .../skrell_ship/skrell_crash_unique.dmm | 57 +- .../exoplanets/biesel/biesel_crash.dmm | 15 +- .../exoplanets/burzsia/burzsia_mining.dmm | 9 +- .../konyang/abandoned/factory_robotics.dmm | 8 +- .../konyang/abandoned/house_small.dmm | 65 +- .../konyang/abandoned/landing_zone.dmm | 79 +- .../konyang/abandoned/rural_clinic.dmm | 11 +- .../exoplanets/konyang/landing_zone.dmm | 52 +- .../konyang/ocean/naval_landing_zone.dmm | 31 +- .../exoplanets/konyang/tribute.dmm | 231 +- .../exoplanets/konyang/village.dmm | 27 +- .../exoplanets/moghes/moghes_guild_mining.dmm | 6 +- .../exoplanets/moghes/moghes_skakh.dmm | 4 +- .../moghes/moghes_wasteland_vihnmes.dmm | 12 +- .../exoplanets/new_gibson/gibson_resupply.dmm | 3 +- .../exoplanets/ouerea/ouerea_guild_mining.dmm | 6 +- .../exoplanets/ouerea/ouerea_sol_base.dmm | 9 +- .../exoplanets/raskara/raskara_okon.dmm | 4 +- .../uueoaesa/heph_mining_station.dmm | 3 +- .../exoplanets/uueoaesa/heph_survey_post.dmm | 6 +- .../exoplanets/uueoaesa/kazhkz_crash.dmm | 16 +- .../uueoaesa/miners_guild_outpost.dmm | 9 +- .../uueoaesa/pid_crashed_shuttle.dmm | 3 +- .../space_ruins/multi_zas_test.dmm | 1 + maps/runtime/runtime.dmm | 2 - maps/sccv_horizon/sccv_horizon.dmm | 121 +- .../submaps/ops_warehouse_small_storage.dmm | 10 +- maps/templates/distress/iac.dmm | 3 +- 148 files changed, 6478 insertions(+), 12953 deletions(-) create mode 100644 html/changelogs/fluffyghost-maploadertweaks.yml diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index 47d8675ae3c..a3b2c1f2d9e 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -198,6 +198,7 @@ // SUBTYPE: Regular // Your classical blast door, found almost everywhere. /obj/machinery/door/blast/regular + name = "blast door" //Because SDMM doesn't recognise the name otherwise, for some reason icon_state_open = "pdoor0" icon_state_opening = "pdoorc0" icon_state_closed = "pdoor1" @@ -207,6 +208,7 @@ block_air_zones = 1 /obj/machinery/door/blast/regular/open + name = "blast door" //Because SDMM doesn't recognise the name otherwise, for some reason icon_state = "pdoor0" density = FALSE opacity = FALSE @@ -240,6 +242,7 @@ block_air_zones = 1 /obj/machinery/door/blast/odin/open + name = "blast door" //Because SDMM doesn't recognise the name otherwise, for some reason icon_state = "pdoor0" density = 0 opacity = 0 diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm index 720293f27f3..6e9ef3bfed7 100644 --- a/code/modules/admin/verbs/map_template_loadverb.dm +++ b/code/modules/admin/verbs/map_template_loadverb.dm @@ -59,9 +59,9 @@ SSair.can_fire = FALSE log_and_message_admins("is attempting to place a map template [log_name].") to_chat(usr, "Attempting to place map template [log_name].") - var/new_z_centre = template.load_new_z(FALSE) // Don't skip changeturf - if (new_z_centre) - log_and_message_admins("has placed a map template [log_name].", location = new_z_centre) + var/bounds = template.load_new_z(FALSE) // Don't skip changeturf + if (bounds) + log_and_message_admins("has placed a map template [log_name] on Z bounds [bounds[MAP_MINZ]] - [bounds[MAP_MAXZ]].") to_chat(usr, "Successfully place map template [log_name].") else log_and_message_admins("has failed to place a map template [log_name].") diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 565efbf545d..293a077740e 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -134,15 +134,19 @@ update_icon() /obj/structure/bookcase/libraryspawn/fiction + name = "bookcase" //Because SDMM doesn't recognise the name otherwise, for some reason spawn_category = "Fiction" /obj/structure/bookcase/libraryspawn/nonfiction + name = "bookcase" //Because SDMM doesn't recognise the name otherwise, for some reason spawn_category = "Non-Fiction" /obj/structure/bookcase/libraryspawn/reference + name = "bookcase" //Because SDMM doesn't recognise the name otherwise, for some reason spawn_category = "Reference" /obj/structure/bookcase/libraryspawn/religion + name = "bookcase" //Because SDMM doesn't recognise the name otherwise, for some reason spawn_category = "Religion" /obj/structure/bookcase/manuals/medical diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm index 54df0ddd888..c425edb575d 100644 --- a/code/modules/mapping/map_template.dm +++ b/code/modules/mapping/map_template.dm @@ -52,8 +52,6 @@ return bounds /datum/map_template/proc/load_new_z(var/no_changeturf = TRUE) - RETURN_TYPE(/turf) - var/x = round((world.maxx - width)/2) var/y = round((world.maxy - height)/2) var/initial_z = world.maxz + 1 diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm index 7a6583f90c4..c8cdde1f039 100644 --- a/code/modules/mapping/reader.dm +++ b/code/modules/mapping/reader.dm @@ -19,10 +19,22 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new) var/static/regex/trimRegex = new/regex("^\[\\s\n]+|\[\\s\n]+$", "g") var/static/list/modelCache = list() var/static/space_key + var/loading = FALSE //text trimming (both directions) helper macro #define TRIM_TEXT(text) (replacetext_char(text, trimRegex, "")) +#define MAPLOADING_CHECK_TICK \ + if(TICK_CHECK) { \ + if(loading) { \ + SSatoms.map_loader_stop(REF(src)); \ + stoplag(); \ + SSatoms.map_loader_begin(REF(src)); \ + } else { \ + stoplag(); \ + } \ + } + /** * Construct the model map and control the loading process * @@ -166,6 +178,7 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new) else //turn off base new Initialization until the whole thing is loaded SSatoms.map_loader_begin(REF(src)) + loading = TRUE for(var/line in gridLines) if((ycrd - y_offset + 1) < y_lower || (ycrd - y_offset + 1) > y_upper) //Reverse operation and check if it is out of bounds of cropping. @@ -199,6 +212,7 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new) ++xcrd --ycrd + loading = FALSE //Restore initialization to the previous value SSatoms.map_loader_stop(REF(src)) @@ -312,7 +326,7 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new) members_attributes.len++ members_attributes[index++] = fields - CHECK_TICK + MAPLOADING_CHECK_TICK while(dpos != 0) //check and see if we can just skip this turf @@ -403,11 +417,7 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new) if(GLOB.use_preloader && .)//second preloader pass, for those atoms that don't ..() in New() GLOB._preloader.load(.) - //custom CHECK_TICK here because we don't want things created while we're sleeping to not initialize - if(TICK_CHECK) - SSatoms.map_loader_stop(REF(src)) - stoplag() - SSatoms.map_loader_begin(REF(src)) + MAPLOADING_CHECK_TICK /dmm_suite/proc/create_atom(path, crds) set waitfor = FALSE @@ -539,3 +549,4 @@ GLOBAL_LIST_INIT(_preloader_path, null) icon_state = "noop" #undef TRIM_TEXT +#undef MAPLOADING_CHECK_TICK diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index db15854eaf1..2eaa608bb6a 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -795,7 +795,7 @@ level = 1 // underfloor only var/dpdir = 0 // bitmask of pipe directions - dir = 0 // dir will contain dominant direction for junction pipes + //dir = 0 // dir will contain dominant direction for junction pipes var/health = 10 // health points 0-10 layer = EXPOSED_DISPOSALS_PIPE_LAYER var/sortType = "" diff --git a/code/unit_tests/map_tests.dm b/code/unit_tests/map_tests.dm index f288464677a..190fde52a98 100644 --- a/code/unit_tests/map_tests.dm +++ b/code/unit_tests/map_tests.dm @@ -343,5 +343,19 @@ return test_status +/datum/unit_test/map_test/no_dirty_vars + name = "MAP: No Dirty Vars" + +/datum/unit_test/map_test/no_dirty_vars/start_test() + var/test_status + + if(length(GLOB.dirty_vars)) + test_status = TEST_FAIL("There are dirty vars in the map! Read the logs above!") + TEST_DEBUG(json_encode(GLOB.dirty_vars)) + else + test_status = TEST_PASS("No dirty vars in the map.") + + return test_status + #undef SUCCESS #undef FAILURE diff --git a/html/changelogs/fluffyghost-maploadertweaks.yml b/html/changelogs/fluffyghost-maploadertweaks.yml new file mode 100644 index 00000000000..a69466d85b7 --- /dev/null +++ b/html/changelogs/fluffyghost-maploadertweaks.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed the maploader sleeping without reinitializing SSAtoms to initialize, which caused some runtimes in niche cases in the CI." diff --git a/maps/away/away_site/abandoned_diner/abandoned_diner.dmm b/maps/away/away_site/abandoned_diner/abandoned_diner.dmm index 8d212577c09..2e8f86d2f63 100644 --- a/maps/away/away_site/abandoned_diner/abandoned_diner.dmm +++ b/maps/away/away_site/abandoned_diner/abandoned_diner.dmm @@ -2627,7 +2627,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/junction{ - dir = 2; icon_state = "pipe-j2" }, /obj/structure/cable/green{ @@ -2826,7 +2825,6 @@ dir = 6 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/bed/stool/chair/folding{ @@ -3114,7 +3112,6 @@ }, /obj/effect/floor_decal/corner_wide/green/diagonal, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/cable/green{ @@ -3491,7 +3488,6 @@ id = "diner_a" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -3691,7 +3687,6 @@ dir = 10 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/cable/green{ @@ -4209,7 +4204,6 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/dark, diff --git a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm index 9252c2f19e9..6c83f6b56f0 100644 --- a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm +++ b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm @@ -8654,9 +8654,7 @@ "Bi" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/structure/safe/cash{ - pixel_y = 0 - }, +/obj/structure/safe/cash, /turf/simulated/floor/plating, /area/abandoned_industrial_station/operations) "Bj" = ( diff --git a/maps/away/away_site/abandoned_mining/cursed.dmm b/maps/away/away_site/abandoned_mining/cursed.dmm index dbf61e10361..0668f341da2 100644 --- a/maps/away/away_site/abandoned_mining/cursed.dmm +++ b/maps/away/away_site/abandoned_mining/cursed.dmm @@ -6,13 +6,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/yellow, /area/cursed/storage) -"aab" = ( -/obj/machinery/door/airlock/glass_mining{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/yellow, -/area/cursed/storage) "afk" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/effect/decal/cleanable/dirt, @@ -181,7 +174,7 @@ /area/mine) "aQn" = ( /obj/machinery/atmospherics/portables_connector{ - dir = 4; + dir = 4 }, /turf/simulated/floor, /area/cursed/hangar) @@ -1151,8 +1144,7 @@ /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/item/reagent_containers/blood/OMinus, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/white, /area/cursed/medical) "gNq" = ( @@ -1849,7 +1841,7 @@ /area/cursed/living_area) "lrD" = ( /obj/machinery/atmospherics/portables_connector{ - dir = 4; + dir = 4 }, /obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor, @@ -2181,7 +2173,7 @@ /area/cursed/mineral_processing) "mTG" = ( /obj/machinery/atmospherics/binary/pump/high_power{ - dir = 8; + dir = 8 }, /turf/simulated/floor, /area/cursed/engineering) @@ -37134,7 +37126,7 @@ npR xHS lyG lyG -aab +aaa lyG lyG lyG diff --git a/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot.dmm b/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot.dmm index 15742b137b8..4f0026cd3cd 100644 --- a/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot.dmm +++ b/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot.dmm @@ -880,8 +880,7 @@ pixel_y = -3 }, /obj/item/pipe{ - pixel_x = -5; - pixel_y = 0 + pixel_x = -5 }, /obj/item/pipe{ pixel_x = 10; @@ -1106,9 +1105,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch/red, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/warning/cee, /obj/machinery/access_button{ pixel_x = -12; pixel_y = -28; @@ -2399,8 +2396,7 @@ dir = 4 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/shuttle_landmark/abandoned_propellant_depot/dock/south_west, /obj/effect/map_effect/marker_helper/airlock/exterior, @@ -2579,9 +2575,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch/red, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/warning/cee, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock/docking{ name = "airlock_abandoned_propellant_depot_dock_north_east"; @@ -2670,8 +2664,7 @@ "iu" = ( /obj/structure/bed/padded, /obj/item/towel_flat{ - pixel_x = -2; - pixel_y = 0 + pixel_x = -2 }, /turf/simulated/floor/tiled, /area/abandoned_propellant_depot/crew_quarters) @@ -2890,7 +2883,6 @@ /area/abandoned_propellant_depot/docks_south_west) "jb" = ( /obj/item/reagent_containers/food/drinks/waterbottle{ - pixel_y = 0; pixel_x = -9 }, /obj/random/dirt_75, @@ -3045,7 +3037,6 @@ pixel_x = -3 }, /obj/structure/barricade/metal{ - pixel_y = 0; dir = 8 }, /obj/item/ammo_casing/a762/spent{ @@ -3980,8 +3971,7 @@ dir = 4 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/shuttle_landmark/abandoned_propellant_depot/dock/south_mid, /obj/effect/map_effect/marker_helper/airlock/exterior, @@ -4415,8 +4405,7 @@ /area/abandoned_propellant_depot/hallways_south) "oD" = ( /obj/item/clothing/shoes/workboots{ - pixel_x = 13; - pixel_y = 0 + pixel_x = 13 }, /obj/random/dirt_75, /turf/simulated/floor/tiled, @@ -5462,9 +5451,7 @@ /turf/simulated/floor/plating, /area/abandoned_propellant_depot/atmos_propellant) "sn" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/random/dirt_75, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 8; @@ -5502,7 +5489,6 @@ /obj/random/dirt_75, /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 8; - pixel_y = 0; pixel_x = 20 }, /obj/effect/map_effect/marker/airlock/docking{ @@ -5519,8 +5505,7 @@ dir = 4 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/shuttle_landmark/abandoned_propellant_depot/dock/south_east, /obj/effect/map_effect/marker_helper/airlock/exterior, @@ -5662,9 +5647,7 @@ /turf/simulated/floor/tiled, /area/abandoned_propellant_depot/hallways_east) "sR" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/random/dirt_75, /obj/effect/map_effect/marker/airlock/docking{ name = "airlock_abandoned_propellant_depot_dock_north_east"; @@ -6088,8 +6071,7 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock{ @@ -6115,8 +6097,7 @@ dir = 8 }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock/docking{ @@ -6408,8 +6389,7 @@ }, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock/docking{ @@ -7815,7 +7795,6 @@ pixel_y = -6 }, /obj/structure/barricade/metal{ - pixel_y = 0; dir = 8 }, /obj/item/ammo_casing/a762/spent{ @@ -7869,9 +7848,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch/red, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/warning/cee, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock/docking{ name = "airlock_abandoned_propellant_depot_dock_west"; @@ -8582,8 +8559,7 @@ dir = 8 }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock/docking{ @@ -8816,11 +8792,9 @@ pixel_y = 5 }, /obj/item/reagent_containers/food/drinks/waterbottle{ - pixel_y = 0; pixel_x = 2 }, /obj/item/reagent_containers/food/drinks/waterbottle{ - pixel_y = 0; pixel_x = -9 }, /obj/item/reagent_containers/food/drinks/waterbottle{ @@ -8857,12 +8831,10 @@ /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/crate, /obj/item/cell/super{ - pixel_x = -6; - pixel_y = 0 + pixel_x = -6 }, /obj/item/cell/super{ - pixel_x = -6; - pixel_y = 0 + pixel_x = -6 }, /obj/item/cell/high{ pixel_x = 6 @@ -8897,7 +8869,6 @@ }, /obj/random/dirt_75, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -10101,8 +10072,7 @@ dir = 8 }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock/docking{ @@ -10523,8 +10493,7 @@ pixel_y = 1 }, /obj/item/pipe_meter{ - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/item/pipe_meter{ pixel_x = 2; @@ -11050,8 +11019,7 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock{ @@ -11128,8 +11096,7 @@ icon_state = "1-2" }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock{ @@ -11480,7 +11447,6 @@ }, /obj/random/dirt_75, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -12150,9 +12116,7 @@ /turf/simulated/floor/plating, /area/abandoned_propellant_depot/maint_storage) "NK" = ( -/obj/structure/bed/stool/chair/folding{ - dir = 2 - }, +/obj/structure/bed/stool/chair/folding, /obj/random/dirt_75, /obj/random/dirt_75, /turf/simulated/floor/wood, @@ -15578,9 +15542,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch/red, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/warning/cee, /obj/machinery/access_button{ pixel_x = 28; pixel_y = -20; diff --git a/maps/away/away_site/big_derelict/bigderelict.dmm b/maps/away/away_site/big_derelict/bigderelict.dmm index eb7f34e52bc..2f1cc6bf0b0 100644 --- a/maps/away/away_site/big_derelict/bigderelict.dmm +++ b/maps/away/away_site/big_derelict/bigderelict.dmm @@ -34,24 +34,6 @@ /obj/structure/table, /turf/simulated/floor/tiled/dark/airless, /area/derelict) -"ai" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) -"aj" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) -"ak" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "al" = ( /obj/random/handgun, /turf/simulated/floor/airless, @@ -63,12 +45,6 @@ /obj/machinery/door/blast/regular/open, /turf/simulated/floor/airless, /area/derelict) -"an" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "ao" = ( /obj/machinery/door/airlock/maintenance_hatch{ dir = 4 @@ -80,12 +56,6 @@ /obj/item/modular_computer/console, /turf/simulated/floor/tiled/dark/airless, /area/derelict) -"aq" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 1 - }, -/turf/simulated/floor/airless, -/area/derelict) "ar" = ( /obj/random/energy, /turf/simulated/floor/airless, @@ -95,12 +65,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/wood/airless, /area/derelict) -"at" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "au" = ( /obj/structure/bookcase, /turf/simulated/floor/wood/airless, @@ -342,12 +306,10 @@ "bt" = ( /obj/machinery/shieldgen, /obj/structure/window/basic{ - dir = 8; - icon_state = "window" + dir = 8 }, /obj/structure/window/basic{ - dir = 1; - icon_state = "window" + dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, @@ -361,40 +323,24 @@ /obj/structure/lattice, /turf/template_noop, /area/space) -"bw" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "bx" = ( /obj/machinery/shieldgen, /obj/structure/window/basic{ - dir = 4; - icon_state = "window" + dir = 4 }, /obj/structure/window/basic{ - dir = 1; - icon_state = "window" + dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/derelict) -"by" = ( -/obj/machinery/door/airlock/glass_engineering{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "bz" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/structure/window/basic{ - dir = 8; - icon_state = "window" + dir = 8 }, /obj/structure/window/basic{ - dir = 1; - icon_state = "window" + dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, @@ -402,12 +348,10 @@ "bA" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/structure/window/basic{ - dir = 4; - icon_state = "window" + dir = 4 }, /obj/structure/window/basic{ - dir = 1; - icon_state = "window" + dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, @@ -419,29 +363,19 @@ icon_state = "tube_empty" }, /obj/item/stack/material/steel{ - amount = 50; - pixel_x = 0; - pixel_y = 0 + amount = 50 }, /obj/item/stack/material/steel{ - amount = 50; - pixel_x = 0; - pixel_y = 0 + amount = 50 }, /obj/item/stack/material/steel{ - amount = 50; - pixel_x = 0; - pixel_y = 0 + amount = 50 }, /obj/item/stack/material/steel{ - amount = 50; - pixel_x = 0; - pixel_y = 0 + amount = 50 }, /obj/item/stack/material/steel{ - amount = 50; - pixel_x = 0; - pixel_y = 0 + amount = 50 }, /obj/random/tech_supply, /turf/simulated/floor/tiled/dark, @@ -505,8 +439,7 @@ "bI" = ( /obj/machinery/shieldgen, /obj/structure/window/basic{ - dir = 8; - icon_state = "window" + dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, @@ -514,8 +447,7 @@ "bJ" = ( /obj/machinery/shieldgen, /obj/structure/window/basic{ - dir = 4; - icon_state = "window" + dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, @@ -523,8 +455,7 @@ "bK" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/structure/window/basic{ - dir = 8; - icon_state = "window" + dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, @@ -532,8 +463,7 @@ "bL" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/structure/window/basic{ - dir = 4; - icon_state = "window" + dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, @@ -570,7 +500,6 @@ /obj/machinery/access_button/airlock_exterior{ master_tag = "constructionsite_airlock"; pixel_x = 20; - pixel_y = 0; req_access = list(10) }, /turf/simulated/floor/tiled/dark/airless, @@ -579,12 +508,10 @@ /obj/machinery/access_button/airlock_interior{ master_tag = "constructionsite_airlock"; pixel_x = -20; - pixel_y = 0; req_access = list(10) }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/derelict) @@ -628,8 +555,7 @@ id_tag = "constructionsite_vent" }, /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor, /area/derelict) @@ -642,8 +568,7 @@ c_tag = "Construction Site Teleporter Airlock" }, /obj/effect/floor_decal/industrial/warning{ - dir = 5; - icon_state = "warning" + dir = 5 }, /turf/simulated/floor, /area/derelict) @@ -660,8 +585,7 @@ /area/derelict) "ca" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/tiled, /area/derelict) @@ -681,14 +605,11 @@ /area/derelict) "cd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/light/small, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1379; id_tag = "constructionsite_airlock"; - pixel_x = 0; pixel_y = -25; req_access = list(10); tag_airpump = "constructionsite_vent"; @@ -697,29 +618,24 @@ tag_interior_door = "constructionsite_inner" }, /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /turf/simulated/floor, /area/derelict) "ce" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/blue, /obj/machinery/airlock_sensor{ - frequency = 1379; id_tag = "constructionsite_sensor"; - pixel_x = 0; pixel_y = -25 }, /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /turf/simulated/floor, /area/derelict) "cf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -733,19 +649,16 @@ /area/derelict) "cg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/tiled, /area/derelict) "ch" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/tiled, /area/derelict) @@ -785,24 +698,20 @@ /area/derelict) "cm" = ( /obj/structure/window/basic{ - dir = 1; - icon_state = "window" + dir = 1 }, /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/atmospherics/portables_connector{ - dir = 4; - icon_state = "map_connector" + dir = 4 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/derelict) "cn" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/blue{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/derelict) @@ -854,15 +763,13 @@ /obj/structure/window/basic, /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/atmospherics/portables_connector{ - dir = 4; - icon_state = "map_connector" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/derelict) "cu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/derelict) @@ -874,12 +781,6 @@ }, /turf/simulated/floor/tiled/dark, /area/derelict) -"cw" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "cx" = ( /obj/machinery/r_n_d/circuit_imprinter, /obj/effect/floor_decal/corner/purple/diagonal, @@ -943,16 +844,14 @@ /area/derelict) "cK" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /obj/structure/computerframe, /turf/simulated/floor/tiled/dark, /area/derelict) "cL" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/structure/closet/crate/loot, /turf/simulated/floor/tiled/dark, @@ -1017,12 +916,6 @@ }, /turf/simulated/floor/airless, /area/derelict) -"db" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "dc" = ( /obj/structure/AIcore/deactivated, /turf/simulated/floor/bluegrid/airless, @@ -1063,15 +956,6 @@ icon_state = "dmg2" }, /area/derelict) -"dj" = ( -/obj/machinery/door/airlock/glass_command{ - name = "Bridge"; - req_access = list(19); - dir = 1 - }, -/obj/machinery/door/blast/regular, -/turf/simulated/floor/tiled/dark/airless, -/area/derelict) "dk" = ( /obj/structure/lattice, /obj/structure/extinguisher_cabinet/west{ @@ -1128,18 +1012,6 @@ }, /turf/simulated/floor/airless, /area/derelict) -"dv" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) -"dw" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "dx" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/white/airless, @@ -1268,12 +1140,6 @@ /obj/item/roller, /turf/space, /area/derelict) -"eb" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "ec" = ( /obj/random/junk, /obj/random/loot, @@ -1343,8 +1209,7 @@ /area/derelict) "ei" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/wall, /area/derelict) @@ -1352,7 +1217,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1443; - icon_state = "map_injector"; id = "d_air_in"; use_power = 1 }, @@ -1364,21 +1228,13 @@ /area/derelict) "el" = ( /obj/effect/floor_decal/industrial/warning/dust{ - dir = 8; - icon_state = "warning_dust" + dir = 8 }, /turf/simulated/floor/tiled/dark/airless, /area/derelict) -"em" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "en" = ( /obj/effect/floor_decal/industrial/warning/dust{ - dir = 8; - icon_state = "warning_dust" + dir = 8 }, /turf/simulated/floor/airless, /area/derelict) @@ -1390,7 +1246,6 @@ /area/derelict) "ep" = ( /obj/machinery/computer/general_air_control/large_tank_control{ - frequency = 1441; input_tag = "d_o2_in"; name = "Oxygen Supply Control"; output_tag = "d_o2_out"; @@ -1439,7 +1294,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1441; - icon_state = "map_injector"; id = "d_o2_in"; use_power = 1 }, @@ -1454,12 +1308,6 @@ /obj/structure/girder, /turf/space, /area/derelict) -"ew" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "ex" = ( /obj/structure/cable/blue{ d1 = 1; @@ -1470,7 +1318,6 @@ /area/derelict) "ey" = ( /obj/machinery/computer/general_air_control/large_tank_control{ - frequency = 1441; input_tag = "d_n2_in"; name = "Nitrogen Supply Control"; output_tag = "d_n2_out"; @@ -1531,8 +1378,7 @@ /area/derelict) "eG" = ( /obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/airless, /area/derelict) @@ -1547,7 +1393,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1441; - icon_state = "map_injector"; id = "d_n2_in"; use_power = 1 }, @@ -1868,7 +1713,6 @@ "fL" = ( /obj/machinery/door/airlock/highsecurity{ icon_state = "door_closed"; - locked = 0; name = "AI Upload"; req_access = list(16); dir = 1 @@ -1890,7 +1734,6 @@ "fO" = ( /obj/machinery/door/airlock/highsecurity{ icon_state = "door_closed"; - locked = 0; name = "AI Upload Access"; req_access = list(16); dir = 1 @@ -1901,24 +1744,6 @@ /obj/structure/table/rack, /turf/simulated/floor/airless, /area/derelict) -"ga" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) -"gb" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) -"gc" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict) "gj" = ( /mob/living/simple_animal/hostile/carp, /turf/simulated/floor/airless, @@ -1992,9 +1817,6 @@ icon_state = "dmg2" }, /area/derelict) -"ju" = ( -/turf/simulated/floor/airless, -/area/derelict) "jw" = ( /obj/machinery/door/airlock/maintenance_hatch{ dir = 1 @@ -20614,7 +20436,7 @@ fb bh cD bh -ju +fk cD dO cD @@ -20871,7 +20693,7 @@ fb bh cD bh -ju +fk cD dO cD @@ -21111,7 +20933,7 @@ fb bh bh dO -ju +fk cD bh bh @@ -21128,7 +20950,7 @@ fb bh cD bh -ju +fk cD dO cD @@ -21641,9 +21463,9 @@ fb fb bh dO -ju -ju -ju +fk +fk +fk cD cD fb @@ -21883,7 +21705,7 @@ bh bh dO cD -ju +fk cD cD bh @@ -21900,7 +21722,7 @@ bh dO cD cD -ju +fk cD cD fb @@ -22139,8 +21961,8 @@ fb bh cD dO -ju -ju +fk +fk cD cD bh @@ -22155,9 +21977,9 @@ fb fb bh dO -ju +fk cD -ju +fk cD cD fb @@ -22397,7 +22219,7 @@ bh cD dO cD -ju +fk cD cD bh @@ -22412,8 +22234,8 @@ fb fb bh dO -ju -ju +fk +fk be cD cD @@ -22669,9 +22491,9 @@ fb fb bh dO -ju -ju -ju +fk +fk +fk dO cD fb @@ -22926,9 +22748,9 @@ bh cD bh cD -ju +fk cD -ju +fk dO cD fb @@ -23165,10 +22987,10 @@ fb fb fb bh -ju +fk dO -ju -ju +fk +fk cD cD bh @@ -23182,10 +23004,10 @@ fb bh cD cD -ju -ju -ju -ju +fk +fk +fk +fk dO cD fb @@ -23422,10 +23244,10 @@ fb fb fb bh -ju +fk dO cD -ju +fk cD cD bh @@ -23438,7 +23260,7 @@ fb fb bh cD -ju +fk cD be cD @@ -23679,10 +23501,10 @@ fb fb fb bh -ju +fk dO -ju -ju +fk +fk dO cD bh @@ -23695,11 +23517,11 @@ fb fb bh cD -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk dO cD fb @@ -23936,10 +23758,10 @@ fb fb fb bh -ju +fk dO cD -ju +fk dO cD bh @@ -23952,9 +23774,9 @@ fb fb bh cD -ju +fk cD -ju +fk cD cD dO @@ -24195,7 +24017,7 @@ fb bh cD dO -ju +fk be dO cD @@ -24209,11 +24031,11 @@ fb fb bh cD -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk dO cD fb @@ -24450,10 +24272,10 @@ fb fb fb bh -ju +fk dO cD -ju +fk cD cD bh @@ -24465,12 +24287,12 @@ fb fb fb cD -ju -ju +fk +fk cD -ju +fk cD -ju +fk dO cD fb @@ -24707,10 +24529,10 @@ cD bh cD bh -ju +fk dO -ju -ju +fk +fk cD cD bh @@ -24723,11 +24545,11 @@ fb fb bh cD -ju +fk be -ju -ju -ju +fk +fk +fk dO cD fb @@ -24966,7 +24788,7 @@ cD cD cD dO -ju +fk cQ dO cD @@ -24980,7 +24802,7 @@ fb fb cD cD -ju +fk cD cQ cD @@ -25224,7 +25046,7 @@ bh cD dO cQ -ju +fk dO cD cD @@ -25236,12 +25058,12 @@ fb fb fb cD -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk dO cD fb @@ -25480,8 +25302,8 @@ cD cD cD dO -ju -ju +fk +fk dO cD cD @@ -25492,13 +25314,13 @@ fb fb fb fb -ju -ju -ju +fk +fk +fk dO -ju +fk cD -ju +fk dO cD fb @@ -25738,7 +25560,7 @@ bh cD dO cQ -ju +fk dO cD cD @@ -25751,11 +25573,11 @@ fb fb cD be -ju +fk dO -ju -ju -ju +fk +fk +fk dO cD fb @@ -25995,7 +25817,7 @@ cD cD dO be -ju +fk dO cD cD @@ -26006,13 +25828,13 @@ fb fb fb fb -ju -ju -ju +fk +fk +fk dO -ju +fk cD -ju +fk dO cD fb @@ -26263,12 +26085,12 @@ fb fb fb fb -ju -ju -ju +fk +fk +fk dO -ju -ju +fk +fk cD dO cD @@ -26508,9 +26330,9 @@ dO dO cQ cQ -ju +fk be -ju +fk im cD bh @@ -26521,12 +26343,12 @@ bh cD bh cD -ju -ju +fk +fk dO cQ -ju -ju +fk +fk dO cD bh @@ -26763,10 +26585,10 @@ cD cD cD dO -ju -ju -ju -ju +fk +fk +fk +fk be gV cD @@ -26778,12 +26600,12 @@ cD cD cD cD -ju -ju +fk +fk dO cQ be -ju +fk dO cD cD @@ -27021,7 +26843,7 @@ cD cD dO cQ -ju +fk cQ cQ cQ @@ -27034,12 +26856,12 @@ cD bh cD bh -ju -ju -ju +fk +fk +fk dO -ju -ju +fk +fk cQ dO cD @@ -27278,9 +27100,9 @@ dO dO dO cQ -ju +fk cQ -ju +fk cQ im cD @@ -27292,12 +27114,12 @@ cD cD cD cD -ju -ju +fk +fk dO fU -ju -ju +fk +fk dO cD bh @@ -27534,7 +27356,7 @@ bh bh bh dO -ju +fk be dO dO @@ -27549,11 +27371,11 @@ bh cD bh cD -ju +fk be dO fU -ju +fk be dO cD @@ -27792,10 +27614,10 @@ cD dO dO cQ -ju -ju +fk +fk cQ -ju +fk dO cD cD @@ -27805,13 +27627,13 @@ cD cD cD cD -ju -ju -ju +fk +fk +fk dO -ju -ju -ju +fk +fk +fk dO cD cD @@ -27856,7 +27678,7 @@ dO aT dO dO -ju +fk eh jp gV @@ -28047,12 +27869,12 @@ bh bh cD dO -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju +fk dO dO dO @@ -28067,8 +27889,8 @@ dO dO dO cQ -ju -ju +fk +fk dO dO dO @@ -28110,15 +27932,15 @@ fb fb dO cQ -ju +fk iK -ju -ju +fk +fk dO cQ -ju +fk dO -ju +fk cD dO fb @@ -28306,26 +28128,26 @@ cD dO dO cQ -ju +fk dO dO -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju -ju -ju +fk +fk +fk cQ -ju -ju -ju +fk +fk +fk cQ -ju -ju -ju -ju +fk +fk +fk +fk dO cD cD @@ -28367,13 +28189,13 @@ fb fb dO cD -ju +fk eh hs bj dO cD -ju +fk eh bh cy @@ -28387,8 +28209,8 @@ fb fb fb dO -ju -ju +fk +fk dO cD cD @@ -28545,9 +28367,9 @@ fb fb cD dO -ju +fk cQ -ju +fk cQ dO im @@ -28561,9 +28383,9 @@ gV gV im dO -ju -ju -ju +fk +fk +fk cQ dO dO @@ -28581,7 +28403,7 @@ dO dO dO be -ju +fk cQ dO dO @@ -28598,9 +28420,9 @@ dO dO dO dO -ju +fk cQ -ju +fk fN dO dO @@ -28630,7 +28452,7 @@ dO eN dO iK -ju +fk dO dO dp @@ -28644,7 +28466,7 @@ dO dO iK dO -ju +fk cQ dO cD @@ -28805,15 +28627,15 @@ dO cQ cQ be -ju +fk cQ -ju +fk cQ cQ cQ -ju +fk cQ -ju +fk be cQ cQ @@ -28822,43 +28644,43 @@ cD cD be cQ -ju -ju +fk +fk cD -ju -ju +fk +fk cQ -ju +fk be cQ be -ju +fk cQ -ju -ju +fk +fk cQ cQ -ju -ju -ju +fk +fk +fk be cQ -ju -ju +fk +fk cQ cQ aI -ju +fk be -ju +fk cQ cQ cQ -ju +fk be cQ -ju -ju +fk +fk dp cD cD @@ -28881,27 +28703,27 @@ fb fb gV cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD -ju -ju +fk +fk gV fb fb dO -ju -ju +fk +fk dO -ju -ju +fk +fk cQ -ju +fk eW iK bh @@ -29062,57 +28884,57 @@ dO be cQ cQ -ju -ju +fk +fk cQ cQ -ju +fk be cQ cQ cQ cQ -ju -ju +fk +fk cQ cQ cD -ju +fk cQ -ju -ju -ju +fk +fk +fk cQ be -ju +fk cQ -ju +fk cQ -ju +fk be cD -ju +fk cQ -ju +fk cQ -ju -ju +fk +fk cQ -ju +fk cQ -ju +fk be cQ cQ -ju +fk cQ -ju +fk be -ju +fk be cQ cQ -ju +fk cQ cQ be @@ -29138,16 +28960,16 @@ fb fb im eC -ju -ju +fk +fk cQ -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk im fb fb @@ -29155,10 +28977,10 @@ dO cQ cD cD -ju +fk be -ju -ju +fk +fk fU dO dO @@ -29308,18 +29130,18 @@ fb cD dO dO -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk jw -ju -ju +fk +fk cQ -ju +fk dO dO dO @@ -29332,17 +29154,17 @@ dO dO dO dO -ju +fk cQ -ju -ju +fk +fk dO im -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk im im gV @@ -29351,16 +29173,16 @@ gV dO dO dO -ju -ju -ju +fk +fk +fk dO dO dO im gV im -ju +fk im im gV @@ -29369,10 +29191,10 @@ im gV gV dO -ju -ju -ju -ju +fk +fk +fk +fk dO dO dO @@ -29396,27 +29218,27 @@ fb im ie bh -ju -ju -ju +fk +fk +fk cQ hP -ju +fk cQ cQ -ju +fk im fb fb dO cD -ju -ju -ju +fk +fk +fk aI cQ -ju -ju +fk +fk cD jp bh @@ -29564,33 +29386,33 @@ fb fb cD dO -ju +fk gj -ju -ju +fk +fk dO iK dO -ai +de dO -ju +fk cQ cQ dO dO -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk dO dO -ju +fk cy dO dO @@ -29606,13 +29428,13 @@ cD cD cD dO -ju +fk jw -ju +fk cQ -ju +fk jw -ju +fk dO cD cD @@ -29627,14 +29449,14 @@ cD cD dO dO -ju +fk be dO dO du -ju -ju -ju +fk +fk +fk cD cD bh @@ -29652,16 +29474,16 @@ bh bh im eD -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju -ju -ju +fk +fk +fk cQ -ju +fk gV fb fb @@ -29669,11 +29491,11 @@ dO dO cD cD -ju +fk cQ -ju -ju -ju +fk +fk +fk eY dO bh @@ -29687,7 +29509,7 @@ cD cD bh cD -ju +fk dO cD fb @@ -29821,8 +29643,8 @@ cD cD cD dO -ju -ju +fk +fk ar dO dO @@ -29834,21 +29656,21 @@ cQ be fN dO -ju -ju +fk +fk dO dO dO dO -aj +de dO dO dO -ju -ju +fk +fk dO -ju -ju +fk +fk im cD bh @@ -29866,7 +29688,7 @@ dO be dO cQ -ju +fk cQ dO be @@ -29883,14 +29705,14 @@ cD bh bh cD -ju -ju +fk +fk cQ -ju +fk dq -ju -ju -ju +fk +fk +fk dJ cD cD @@ -29913,12 +29735,12 @@ eL cQ cQ cU -ju -ju +fk +fk cQ cQ cQ -ju +fk im fb fb @@ -29929,8 +29751,8 @@ cQ cD cQ ie -ju -ju +fk +fk cD dO dO @@ -29939,12 +29761,12 @@ fb fb bh cD -ju +fk cD cD bh cD -ju +fk dO cD fb @@ -30073,12 +29895,12 @@ bh dO dO im -ju -ju -ju +fk +fk +fk im dO -ju +fk fN dO dO @@ -30087,11 +29909,11 @@ bf bf bf dO -ju +fk cQ -ju +fk dO -ju +fk dO dO bF @@ -30102,7 +29924,7 @@ bH bU dO dO -ju +fk dO cQ cQ @@ -30116,22 +29938,22 @@ cD cD dO cT -ju +fk be -ju -ju -ju +fk +fk +fk dO -ju +fk cQ -ju +fk dO -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk dO cD cD @@ -30140,15 +29962,15 @@ cD cD cD cD -ju +fk cQ -ju +fk do ax -ju +fk ax -ju -ju +fk +fk cD cD bh @@ -30160,34 +29982,34 @@ cD bh cD bh -ju -ju +fk +fk cQ bh im gP cQ cQ -ju +fk cQ -ju -ju +fk +fk cQ -ju -ju -ju +fk +fk +fk cR fb fb fb dO cD -ju +fk be cQ iu bb -ju +fk cQ cD dO @@ -30196,12 +30018,12 @@ fb fb bh cD -ju +fk cD cD bh dO -ju +fk dO cD fb @@ -30329,13 +30151,13 @@ fb bh dO dO -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk dO -ju +fk dO dO bf @@ -30344,11 +30166,11 @@ bf bf bf aS -ju +fk be be dO -ju +fk dO bl bU @@ -30359,7 +30181,7 @@ bP bU bu dO -ju +fk dO cQ cQ @@ -30372,22 +30194,22 @@ bh bh cD dO -ju -ju -ju -ju +fk +fk +fk +fk dO dO dO -ju -ju -ju +fk +fk +fk dO dO dO aa -ju -ju +fk +fk di dO cD @@ -30400,13 +30222,13 @@ cD gV cQ cQ -ju +fk ax ax -ju -ju -ju -ju +fk +fk +fk +fk bh cD cD @@ -30424,14 +30246,14 @@ bh gV iu cD -ju +fk cQ -ju -ju +fk +fk cQ cQ cQ -ju +fk cQ gV fb @@ -30441,24 +30263,24 @@ dO dO cD cD -ju +fk cQ eU -ju +fk cD -ju +fk iK bh fb fb bh cD -ju +fk cD cD bh dO -ju +fk dO cD fb @@ -30586,13 +30408,13 @@ fb bh cD im -ju -ju -ju +fk +fk +fk bh -ju +fk iK -ju +fk dO as au @@ -30601,7 +30423,7 @@ au bf aM dO -ju +fk cQ be jw @@ -30616,10 +30438,10 @@ bH bU bU dO -ju +fk dO -ju -ju +fk +fk im cD cD @@ -30629,23 +30451,23 @@ cD cD cD dO -ju +fk dO dO dO dO be -ju -ju +fk +fk cQ -ju +fk dk -ju +fk dO dO dO dO -ju +fk dO cD cD @@ -30655,27 +30477,27 @@ cD cD cD im -ju -ju -ju +fk +fk +fk dr dx ie dE -ju -ju +fk +fk cD cD cD cD -ju +fk bh cD bh cD bh bh -ju +fk bh bh im @@ -30699,10 +30521,10 @@ iK cD cQ cQ -ju +fk cQ -ju -ju +fk +fk cD dO dO @@ -30710,12 +30532,12 @@ fb fb bh dO -ju +fk cD cD bh dO -ju +fk dO cD fb @@ -30843,13 +30665,13 @@ fb bh cD im -ju -ju -ju +fk +fk +fk be -ju +fk jw -ju +fk dO bf bf @@ -30857,12 +30679,12 @@ bf bf bf af -ju -ju +fk +fk cQ cQ dO -ju +fk dO bn bU @@ -30873,9 +30695,9 @@ bU bU cx dO -ju +fk dO -ju +fk be gV cD @@ -30886,23 +30708,23 @@ bh cD cD dO -ak +de dO -ju +fk cQ be be -ju -ju +fk +fk cQ -ju +fk cQ -ju -ju -ju +fk +fk +fk cy dO -an +de dO cD cD @@ -30912,28 +30734,28 @@ bh bh cD im -ju +fk cQ dO dO dO dO dO -ju -ju -ju +fk +fk +fk dR cD -ju +fk cD cD cD cD cD bh -ju +fk cD -ju +fk bh dO bd @@ -30953,26 +30775,26 @@ fb fb fb dO -ju +fk cD -ju -ju +fk +fk cQ cS -ju -ju +fk +fk cD dO fb fb bh cD -ju +fk dO cD bh dO -ju +fk dO cD fb @@ -31100,26 +30922,26 @@ fb bh dO dO -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk dO -ju +fk iK au au au aF -ju +fk be im -ju +fk cQ cQ dO -ju +fk dO bp bU @@ -31130,7 +30952,7 @@ cl bU cz dO -ju +fk dO cO cQ @@ -31143,22 +30965,22 @@ cD cD dO dO -ju -ju +fk +fk cQ cQ aI cQ -ju +fk aI be be cD cQ cD -ju +fk cD -ju +fk cD dO dO @@ -31169,28 +30991,28 @@ cD cD cD im -ju +fk cQ dO ax dA -ju +fk dF ax -ju -ju +fk +fk cD -ju +fk cD -ju +fk cD cD bh cD bh -ju -ju -ju +fk +fk +fk bh cD bh @@ -31212,7 +31034,7 @@ fb dO dO cD -ju +fk cQ iV cQ @@ -31224,12 +31046,12 @@ fb fb bh cD -ju +fk dO cD bh dO -ju +fk dO cD bh @@ -31357,13 +31179,13 @@ fb bh dO dO -ju +fk im -ju -ju -ju +fk +fk +fk dO -ju +fk dO bf bf @@ -31373,10 +31195,10 @@ bf af be cQ -ju +fk cQ dO -ju +fk dO br bU @@ -31387,10 +31209,10 @@ bH bU cA dO -ju +fk dO be -ju +fk cR cD dO @@ -31399,25 +31221,25 @@ dO dO dO dO -ju +fk cQ cQ be aI cQ -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk cQ aI be -ju +fk dO dO dO @@ -31428,26 +31250,26 @@ cD gV cQ cQ -ju +fk ds ax dC ax -ju -ju -ju -ju +fk +fk +fk +fk cD -ju +fk cD -ju +fk cD bh cD bh -ju +fk cD -ju +fk bh cD cD @@ -31468,7 +31290,7 @@ fb fb bh eS -ju +fk eT fF eV @@ -31481,12 +31303,12 @@ fb fb bh dO -ju +fk dO cD bh dO -ju +fk dO cD bh @@ -31495,10 +31317,10 @@ dO dO dO fj -ju -ju -ju -ju +fk +fk +fk +fk dO dO fb @@ -31620,7 +31442,7 @@ bh bh bh dO -ju +fk dO av av @@ -31633,7 +31455,7 @@ cQ cQ fN dO -ju +fk dO bU bU @@ -31644,68 +31466,68 @@ bU bU fr dO -ju +fk dO cQ cQ im cD dO -ju -ju -ju +fk +fk +fk jw -ju -ju +fk +fk cQ -ju +fk be -ju +fk cQ -ju +fk dO dO da dO dO -ju +fk cD -ju +fk cD be cD -ju +fk cD -aq -ju +jw +fk be -ju +fk dO cD im cQ -ju -ju +fk +fk dt ax dD -ju -ju +fk +fk dM -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk bh cD -ju -ju +fk +fk ax -ju -ju +fk +fk cD bh bh @@ -31724,7 +31546,7 @@ fb fb fb bh -ju +fk be fA dO @@ -31738,12 +31560,12 @@ fb fb bh dO -ju +fk dO cD bh dO -ju +fk dO dO dO @@ -31754,7 +31576,7 @@ aa cQ cQ cQ -ju +fk cQ aI dO @@ -31877,7 +31699,7 @@ cD cD cD dO -ju +fk dO bf bf @@ -31886,11 +31708,11 @@ bf bf aN aU -ju +fk cQ cQ dO -ju +fk bd bU bU @@ -31901,82 +31723,82 @@ bP cs cB dO -ju +fk dO -ju +fk cQ gV cD dO -ju -ju +fk +fk dO dO -ju +fk cQ be cQ -ju +fk gV im -ju +fk dO cQ dP cQ dO -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk cQ -ju +fk dO dO -ju -ju +fk +fk dO cD -ju +fk cQ cQ -ju +fk ds ax -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk cD cD -ju -ju +fk +fk cD dB -ju +fk cD af cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD fb fb @@ -31995,42 +31817,42 @@ fb fb cD dO -ju +fk dO cD bh dO -ju +fk dO aI -ju -ju -be -ju -cQ -ju -ju fk -ju -ju +fk +be +fk +cQ +fk +fk +fk +fk +fk fN dO -ju -ju +fk +fk cQ fk dO -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk fb fI fI @@ -32143,11 +31965,11 @@ av bf bf dO -ju +fk be -ju +fk dO -ju +fk dO bs bG @@ -32160,21 +31982,21 @@ cC dO fN dO -ju +fk aI im cD dO -ju -ju +fk +fk dO -ju -ju +fk +fk be be -ju -ju -ju +fk +fk +fk cD cD dO @@ -32184,57 +32006,57 @@ cQ dO cD cD -ju -ju +fk +fk cQ cD -ju +fk cD -ju +fk dO -ju -ju +fk +fk dO cD im aI -ju -ju +fk +fk aD ax -ju +fk dG -ju -ju -ju +fk +fk +fk cD -ju +fk cD dW cD -ju +fk cD cD eh -ju -ju +fk +fk es ev cD eE -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk fb fb fb @@ -32252,20 +32074,20 @@ fb fb cD dO -ju +fk dO cD bh dO -ju +fk dO dO -ju +fk cQ cQ -ju -ju -ju +fk +fk +fk cQ cQ cQ @@ -32273,22 +32095,22 @@ cQ cQ fm cQ -ju -ju +fk +fk fN dO -ju -ju +fk +fk fJ -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk fJ -ju +fk fI fI fI @@ -32389,9 +32211,9 @@ cD ac ae af -ju -ju -ju +fk +fk +fk dO dO bf @@ -32400,11 +32222,11 @@ bf bf bf aS -ju +fk cD cQ dO -ju +fk dO dO dO @@ -32415,22 +32237,22 @@ dO dO dO dO -ju +fk dO cQ cQ im cD dO -ju +fk gO dO -ju +fk be -ju -ju -ju -ju +fk +fk +fk +fk cD cD cD @@ -32442,31 +32264,31 @@ dO cD cD cD -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk cQ dO -ju -ju +fk +fk dO cD gV be -ju -ju +fk +fk ds dy dO dO dO -ju -ju +fk +fk dD -ju -ju +fk +fk dO dO dO @@ -32480,17 +32302,17 @@ dO dO dO cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD fb fb @@ -32509,24 +32331,24 @@ fb fb cD dO -ju +fk dO cD bh dO -ju +fk dO -ju +fk cQ cQ -ju +fk cQ -ju +fk cQ -ju +fk cQ cQ -ju +fk be dO fo @@ -32534,18 +32356,18 @@ cQ fU fG dO -ju +fk cD -ju +fk cD cD cD -ju +fk cD cD -ju -ju -ju +fk +fk +fk fI fI fI @@ -32643,13 +32465,13 @@ bh cD bh cD -ju +fk af cQ -ju -ju -ju -ju +fk +fk +fk +fk iK dO aB @@ -32661,32 +32483,32 @@ cQ cQ cD dO -ju -ju -ju -ju +fk +fk +fk +fk dO -ju -ju +fk +fk dO -ju -ju -ju -ju +fk +fk +fk +fk dO -ju -ju +fk +fk dO dO dO -ju +fk dO dO cQ aI -ju -ju -ju +fk +fk +fk cD cD cD @@ -32700,55 +32522,55 @@ dO cD cD cD -ju -ju +fk +fk be cQ cQ dO dO -ju +fk dO dO dO -ju +fk cQ dO dt dB dO dH -ju -ju -ju +fk +fk +fk bj -ju +fk cD -ju +fk cD dO dO -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju -ju +fk +fk dO dO -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk fb fb fb @@ -32766,17 +32588,17 @@ fb fb cD dO -ju +fk dO cD bh dO -ju +fk dO -ju +fk iu ie -ju +fk af fh ie @@ -32784,25 +32606,25 @@ ie ff fl ie -ju +fk dO im im im im dO -ju +fk cD fK -ju -ju -ju +fk +fk +fk fK -ju -ju -ju +fk +fk +fk fK -ju +fk fI fI fI @@ -32906,7 +32728,7 @@ aa cQ cQ gj -ju +fk be dO dO @@ -32916,34 +32738,34 @@ dn dO cQ cQ -ju +fk dO -ju -ju -ju -ju +fk +fk +fk +fk dO -ju +fk be dO -ju +fk dO dO dO dO -ju +fk cQ dO -ju -ju -ju +fk +fk +fk dO cQ -ju +fk cQ -ju -ju -ju +fk +fk +fk cD cD dO @@ -32957,54 +32779,54 @@ dO dO cD cD -ju -ju -ju +fk +fk +fk cQ cQ -ju +fk dO -ju +fk be -ju +fk dO cQ -ju +fk dO dO dO dO gI -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk aI -ju -ju +fk +fk dO -ju -ju +fk +fk cQ cQ cQ cQ -ju -ju -ju +fk +fk +fk dO -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD cD bh @@ -33023,14 +32845,14 @@ fb fb cD dO -at +de dO cD bh dO -bw +de dO -by +fu dO im gV @@ -33038,9 +32860,9 @@ gV im im gV -ju -ju -ju +fk +fk +fk dO dO fn @@ -33050,16 +32872,16 @@ eF dO dO cD -ju +fk cD cD cD -ju +fk cD cD cD -ju -ju +fk +fk fI fI fI @@ -33160,18 +32982,18 @@ cD bh dO dO -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju +fk dO -ju -ju +fk +fk im dO -ju +fk cQ be dO @@ -33183,21 +33005,21 @@ dO bV cc dO -cw +de dO fU -ju -ju +fk +fk cQ cQ dO -db +de dO dO dO -ju +fk be -ju +fk cQ dO dO @@ -33216,7 +33038,7 @@ dO dO dO dO -ju +fk cQ cQ fN @@ -33226,28 +33048,28 @@ dO de dO cQ -ju -ju -ju +fk +fk +fk cQ dO dO dO -ju -ju +fk +fk dS -ju -ju +fk +fk dO -ju +fk dO -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju -ju +fk +fk cQ fN dO @@ -33255,10 +33077,10 @@ dO dO dO dO -ju -ju -ju -ju +fk +fk +fk +fk dO dO dO @@ -33280,14 +33102,14 @@ dO dO dO dO -ju +fk dO dO cD dO -ju +fk dO -ju +fk dO cD cD @@ -33299,24 +33121,24 @@ cD cD cD dO -ju +fk cQ ft fD -ju +fk sf dO -ju -ju +fk +fk cD bh cD -ju +fk cD bh cD -ju -ju +fk +fk fI fI fI @@ -33418,44 +33240,44 @@ bh cD im af -ju -ju +fk +fk ap cQ -ju +fk aC cQ cQ -ju +fk aV cQ cQ be -ju +fk cQ cQ -ju -ju +fk +fk be -ju +fk cQ cQ -ju -ju -ju +fk +fk +fk cQ cQ -ju +fk cQ be cQ -ju +fk cQ -ju +fk be -ju +fk cQ -ju +fk dO cQ cQ @@ -33473,78 +33295,78 @@ cQ cQ cQ dO -ju -ju +fk +fk cQ aI cQ -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk cQ -ju +fk cQ cQ -ju -ju -ju +fk +fk +fk cQ cQ -ju +fk be -ju +fk be cQ cQ be cQ cQ -ju +fk cQ cQ be -ju -ju +fk +fk cQ -ju -ju -ju +fk +fk +fk cD -ju +fk cD -ju +fk cQ -ju -ju +fk +fk be aI cQ cQ -ju +fk be cQ -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk cQ cQ -ju +fk be cQ cQ -ju -ju +fk +fk fc dO dO dO -ju +fk dO -ju +fk dO dO dO @@ -33556,24 +33378,24 @@ dO dO dO dO -ju -ju +fk +fk fv fx cQ -ju +fk im cD -ju +fk cD cD cD -ju +fk cD cD cD -ju -ju +fk +fk fI fI fI @@ -33675,44 +33497,44 @@ cD cD ac af -ju +fk bi ap cQ -ju -dj -ju +fk +aC +fk cQ -ju +fk aX cQ -ju -ju +fk +fk cQ be cQ cQ cQ -ju -ju +fk +fk cQ be cQ cQ cQ cQ -ju +fk be cQ cQ -ju +fk cQ cQ -ju -ju -ju +fk +fk +fk cQ -ju +fk fO dP dP @@ -33730,56 +33552,56 @@ dP dP dP fO -ju -ju +fk +fk cQ -ju -ju -ju -ju +fk +fk +fk +fk cQ cQ cQ -ju +fk be -ju +fk be -ju +fk cQ cQ be -ju +fk cQ -ju -ju +fk +fk be cQ -ju +fk cQ cQ cQ aI cQ -ju -ju -ju +fk +fk +fk cQ -ju +fk cQ be cQ -ju -ju +fk +fk cQ cQ cQ -ju +fk cQ -ju -ju +fk +fk cQ cQ -ju +fk cQ cQ be @@ -33787,50 +33609,50 @@ cQ cQ cQ cQ -ju +fk cQ -ju -ju +fk +fk cQ -ju -ju +fk +fk be -ju +fk fd -ju +fk fd -ju +fk fd -ju +fk fd -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk fd fn fp fw fE -ju +fk cQ im cD fK -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk fK -ju +fk fI fI fI @@ -33932,44 +33754,44 @@ bh cD bq ie -ju +fk cQ ap cQ cQ aC -ju +fk be cQ aV cQ -ju +fk cQ -ju +fk cQ bk cQ -ju +fk bQ -ju +fk cQ -ju -ju +fk +fk cD cQ cQ be cQ -ju +fk cQ cQ cQ -ju +fk cQ -ju +fk cQ be -ju +fk dO cQ cQ @@ -33988,77 +33810,77 @@ cQ cQ dO cQ -ju -ju +fk +fk be cQ -ju +fk cQ cQ -ju -ju +fk +fk cQ -ju -ju +fk +fk cQ -ju +fk cQ cQ be -ju +fk cQ -ju +fk cQ -ju +fk be -ju +fk cQ -ju -ju +fk +fk cQ -ju +fk cQ cQ -ju +fk cQ -ju +fk cQ cQ -ju -ju +fk +fk eP -ju -ju +fk +fk be -ju +fk cQ -ju +fk be -ju -ju -ju +fk +fk +fk eP -ju -ju -ju -ju +fk +fk +fk +fk cQ cQ -ju -ju +fk +fk be -ju +fk cQ -ju +fk cQ cQ fN dO dO dO -ju +fk dO -ju +fk dO dO dO @@ -34074,20 +33896,20 @@ cQ cQ fx fv -ju +fk cQ im cD -ju +fk cD cD cD -ju +fk cD cD cD -ju -ju +fk +fk fI fI fI @@ -34189,18 +34011,18 @@ bh dO dO be -ju -ju +fk +fk cQ cQ ay dO -ju -ju -ju +fk +fk +fk dO -ju -ju +fk +fk cQ dO dO @@ -34211,15 +34033,15 @@ dO bW bW dO -dv +de dO -ju +fk cQ -ju +fk cS be dO -dw +de dO dO dO @@ -34251,31 +34073,31 @@ fN dO dO dO -eb +de dO -ju -ju +fk +fk cQ cQ cQ dO dO bd -ju -ju +fk +fk dT gV -ju +fk dO dO dO -ju -ju +fk +fk be cQ cQ -ju -ju +fk +fk be fN dO @@ -34308,14 +34130,14 @@ cD dO dO dO -ju +fk dO dO bh dO -ju +fk dO -ju +fk dO cD cD @@ -34331,20 +34153,20 @@ fk cQ fy fy -ju +fk cy dO -ju -ju +fk +fk cD bh cD -ju +fk cD bh cD -ju -ju +fk +fk fI fI fI @@ -34444,31 +34266,31 @@ cD cD dO dO -ju +fk cQ gr cS -ju +fk hP dO dO -ju -ju +fk +fk aQ dO be cQ cQ dO -ju -ju -ju -ju +fk +fk +fk +fk dO bX cd dO -ju +fk dO dO dO @@ -34476,16 +34298,16 @@ dO cQ cQ dO -ju -ju -ju +fk +fk +fk dO -ju +fk be cQ -ju -ju -ju +fk +fk +fk cD cD dO @@ -34499,16 +34321,16 @@ dO dO cD cD -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju +fk dO -ju -ju -ju +fk +fk +fk dO cQ be @@ -34516,31 +34338,31 @@ dO dO dO dO -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk dO -ju -ju -ju -ju +fk +fk +fk +fk be cQ cQ cQ -ju +fk dO cD cD cD -ju -ju +fk +fk cD cD cD @@ -34565,12 +34387,12 @@ bh bh cD dO -em +de dO cD bh dO -ew +de dO fu dO @@ -34579,7 +34401,7 @@ gV gV gV im -ju +fk im gV im @@ -34592,16 +34414,16 @@ eF dO dO cD -ju +fk cD cD cD -ju +fk cD cD cD -ju -ju +fk +fk fI fI fI @@ -34703,45 +34525,45 @@ ad af cQ cQ -ju -ju -ju +fk +fk +fk dO dO cM -ju +fk ax -ju +fk dO -ju +fk cQ -ju +fk dO -ju -ju -ju +fk +fk +fk be dO bY ce dO -ju +fk be -ju -ju +fk +fk dO cQ cQ dO dO dO -ju +fk dO dO -ju +fk cQ cQ -ju +fk im cD cD @@ -34756,48 +34578,48 @@ dO cD cD cD -ju +fk fU -ju +fk cQ -ju +fk dO dO -ju +fk dO dO dO -ju +fk cQ dO -ju -ju -ju +fk +fk +fk be cQ -ju +fk cQ cQ cQ cQ cQ -ju +fk dO dO ec cQ -ju -ju -ju -ju +fk +fk +fk +fk cQ dO dO cD -ju -ju -ju -ju +fk +fk +fk +fk cD cD cD @@ -34822,14 +34644,14 @@ fb fb cD dO -ju +fk dO cD bh dO -ju +fk dO -ju +fk ff iu af @@ -34847,18 +34669,18 @@ im im gV dO -ju +fk cD fK -ju -ju -ju +fk +fk +fk fK -ju -ju -ju +fk +fk +fk fK -ju +fk fI fI fI @@ -34959,22 +34781,22 @@ cD im ag ah -ju +fk al -ju +fk dO dO az ax -ju -ju +fk +fk cQ aY be cQ cQ dO -ju +fk dO dO dO @@ -34985,15 +34807,15 @@ dO dO dO dO -ju +fk dO cQ be cR cD dO -ju -ju +fk +fk dO be cQ @@ -35012,34 +34834,34 @@ dO cD cD cD -ju -ju -ju -ju +fk +fk +fk +fk cQ cQ dO -ju +fk be dO cD -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju -ju +fk +fk cQ cQ -ju +fk cQ -ju +fk be cQ cQ -ju -ju +fk +fk dO dO dO @@ -35050,19 +34872,19 @@ dO dO dO cD -ju -ju -ju -ju +fk +fk +fk +fk cD cD -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk cD cD cD @@ -35079,43 +34901,43 @@ fb fb cD dO -ju +fk dO cD bh dO -ju +fk dO -ju -ju +fk +fk cQ cQ be -ju +fk cQ cQ cQ -ju -ju -ju +fk +fk +fk dO fq fU -ju +fk fj dO -ju +fk cD -ju +fk cD cD cD -ju +fk cD cD -ju -ju -ju +fk +fk +fk fI fI fI @@ -35221,7 +35043,7 @@ dO ao dO aw -ju +fk ax be ax @@ -35229,7 +35051,7 @@ fN dO cQ cQ -ju +fk dO be dO @@ -35244,21 +35066,21 @@ cE dO fN dO -ju +fk cQ gV cD dO aI -ju +fk dO aa -ju +fk cQ -ju -ju -ju -ju +fk +fk +fk +fk cD cD dO @@ -35269,64 +35091,64 @@ dO cD cD im -ju -ju -ju +fk +fk +fk cQ -ju -ju +fk +fk dO -ju +fk aa dO cD im -ju +fk cQ be cQ -ju -ju +fk +fk cQ -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju -ju +fk +fk cQ -ju -ju -ju -ju +fk +fk +fk +fk el en en -ju -ju +fk +fk dO cD -ju -ju -ju -ju +fk +fk +fk +fk cD cD -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk fb fb fb @@ -35336,43 +35158,43 @@ fb fb cD dO -ju +fk dO cD bh dO -ju +fk dO dO aa cQ cQ -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju -ju +fk +fk cQ fm -ju -ju -ju +fk +fk +fk cy dO -ju -ju +fk +fk fM -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk fM -ju +fk fI fI fI @@ -35475,20 +35297,20 @@ cD cD cD dO -ju +fk dO -ju -ju -ju +fk +fk +fk cQ ax -ju +fk aZ cQ cQ cQ dO -ju +fk dO bx bJ @@ -35499,15 +35321,15 @@ cn cu cF dO -ju +fk dO be cQ gV cD dO -ju -ju +fk +fk dO dO cQ @@ -35515,53 +35337,53 @@ cQ cQ cQ cQ -ju -ju +fk +fk dO dO cZ dg dh dO -ju -ju -ju -ju +fk +fk +fk +fk cQ cQ cQ -ju +fk dO dO -ju -ju +fk +fk dO cD im aI cQ -ju -ju -ju +fk +fk +fk cQ -ju +fk cQ -ju -ju -ju -ju +fk +fk +fk +fk dL dU dU -ju +fk cQ -ju -ju -ju +fk +fk +fk cQ cQ cQ -ju +fk dO dO cD @@ -35580,9 +35402,9 @@ dO dO dO dO -ju +fk aI -ju +fk cD fb fb @@ -35593,42 +35415,42 @@ fb fb cD dO -ju +fk dO cD bh dO -ju +fk dO fe cQ -ju -ju +fk +fk cQ cQ cQ be -ju -ju +fk +fk be cQ iK cQ cQ -ju -ju +fk +fk dO -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk fb fI fI @@ -35732,20 +35554,20 @@ bh bh bh dO -ju +fk dO hP ax -ju +fk aH -ju +fk be ba -ju -ju +fk +fk cy dO -ju +fk dO bz bK @@ -35756,89 +35578,89 @@ bS bM cH dO -ju +fk dO cQ cQ im cD dO -ju -ju -ju +fk +fk +fk jw -ju +fk cQ cQ be cQ -ju -ju +fk +fk dO dO dO dd dO dO -ju -ju +fk +fk cQ cQ be -ju +fk cQ aI jw -ju +fk be -ju +fk dO cD -ju -ju +fk +fk be -ju +fk cQ -ju -ju +fk +fk dI cQ aa -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk cQ -ju -ju +fk +fk cQ cQ cQ -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk dO -ju +fk dO -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD -ju -ju -ju +fk +fk +fk dO -ju -ju +fk +fk bh cD fb @@ -35850,24 +35672,24 @@ fb fb cD dO -ju +fk dO cD bh dO -ju +fk dO dO dO dO fg -ju +fk aI -ju +fk cQ cU cQ -ju +fk fN dO im @@ -35984,25 +35806,25 @@ bh dO dO im -ju -ju -ju -ju +fk +fk +fk +fk dO -ju +fk dO aD -ju -ju +fk +fk aI -ju +fk ax ba -ju +fk cQ cQ dO -ju +fk dO bA bL @@ -36013,7 +35835,7 @@ co bM cI dO -ju +fk dO cQ cQ @@ -36025,25 +35847,25 @@ dO dO dO dO -ju -ju -ju +fk +fk +fk cQ cQ cU -ju +fk cQ cQ -ju -ju +fk +fk cQ -ju +fk be cQ -ju -ju +fk +fk cQ -ju +fk dO dO dO @@ -36053,11 +35875,11 @@ dO cD im cQ -ju +fk aT -ju -ju -ju +fk +fk +fk dO dK dO @@ -36065,7 +35887,7 @@ dO dO hP dO -ju +fk be eo cQ @@ -36073,29 +35895,29 @@ be aI cQ cQ -ju +fk cY ex eF dO cD dO -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk dO -ju -ju +fk +fk cD cD fb @@ -36112,7 +35934,7 @@ dO cD bh dO -ju +fk dO cD fb @@ -36120,10 +35942,10 @@ dO dO dO dO -ju +fk cQ cQ -ju +fk fe dO dO @@ -36240,26 +36062,26 @@ fb bh dO dO -ju -ju +fk +fk bh -ju -ju +fk +fk dO -ju +fk dO ie be ah -ju -ju +fk +fk ax bb cQ cQ be dO -ju +fk dO bB bM @@ -36272,8 +36094,8 @@ cJ dO bd cD -ju -ju +fk +fk im cD cD @@ -36284,22 +36106,22 @@ cD dO dO cQ -ju -ju +fk +fk cQ -ju +fk cQ be -ju -ju +fk +fk cQ -ju +fk cQ cQ -ju +fk cQ -ju -ju +fk +fk dO dO cD @@ -36310,11 +36132,11 @@ cD cD gV cQ -ju -ju +fk +fk cQ cQ -ju +fk dO dO dO @@ -36322,36 +36144,36 @@ dN dO dO dO -ju -ju -ju +fk +fk +fk cQ -ju -ju +fk +fk cQ cQ -ju -ju -ju +fk +fk +fk eG dO -ju +fk dO -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD dO cD -ju +fk dO -ju +fk cD bh cD @@ -36369,7 +36191,7 @@ dO cD bh dO -ju +fk dO cD fb @@ -36497,26 +36319,26 @@ fb bh bh im -ju -ju +fk +fk hP -ju -ju +fk +fk jw -ju +fk dO gI -ju -ju +fk +fk ah ax ax bc cQ -ju +fk cQ dO -ju +fk dO bC bM @@ -36527,10 +36349,10 @@ cp bM cK dO -ju +fk dO -ju -ju +fk +fk im bh bh @@ -36540,23 +36362,23 @@ bh cD cD dO -ga +de dO -ju -ju -ju +fk +fk +fk cQ cQ -ju +fk cQ -ju -ju +fk +fk cQ cQ -ju -ju +fk +fk dO -gb +de dO cD cD @@ -36570,46 +36392,46 @@ cQ cQ im be -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk cQ cQ cQ -ju +fk cQ -ju +fk be -ju +fk cQ eH dO -ju +fk dO -ju -ju -ju -ju +fk +fk +fk +fk hP -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk be dO -ju -ju +fk +fk bh cD fb @@ -36626,7 +36448,7 @@ dO cD bh dO -ju +fk dO cD fb @@ -36753,27 +36575,27 @@ fb fb bh bh -ju -ju -ju +fk +fk +fk be -ju -ju +fk +fk dO -ju +fk dO aD be ax -ju +fk ax -ju +fk dO cQ be -ju +fk jw -ju +fk dO bD bM @@ -36784,7 +36606,7 @@ cp bM cL dO -ju +fk dO cQ cQ @@ -36797,23 +36619,23 @@ cD cD cD dO -ju +fk dO dO dO dO -ju -ju -ju -ju +fk +fk +fk +fk be bk -ju +fk dO dO dO dO -ju +fk dO cD cD @@ -36822,51 +36644,51 @@ cD cD cD cD -ju +fk be be -ju -ju -ju +fk +fk +fk aI -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk cQ -ju -ju -ju +fk +fk +fk eo -ju -ju +fk +fk eo -ju -ju +fk +fk eo aa dO -ju +fk dO -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD cD -ju -ju +fk +fk dO -ju -ju +fk +fk cD cD fb @@ -36878,12 +36700,12 @@ fb fb cD dO -ju +fk dO cD bh dO -ju +fk dO cD fb @@ -37011,17 +36833,17 @@ fb bh dO dO -ju -ju -ju -ju +fk +fk +fk +fk fN dO -ju +fk dO dO ax -ju +fk ax aL be @@ -37030,7 +36852,7 @@ cQ cQ cQ dO -ju +fk dO bE bN @@ -37041,10 +36863,10 @@ cq bM cL dO -ju +fk dO -ju -ju +fk +fk gV cD bh @@ -37054,22 +36876,22 @@ bh bh cD dO -ju -ju -ju -ju +fk +fk +fk +fk dO dO dO -ju -ju -ju +fk +fk +fk dO dO dO -ju -ju -ju +fk +fk +fk be dO cD @@ -37080,49 +36902,49 @@ bh bh cD gV -ju +fk cQ aT -ju +fk cQ cQ -ju +fk cQ cQ cQ -ju +fk cQ cQ -ju -ju -ju -ju +fk +fk +fk +fk ed eo -ju +fk ep eo -ju +fk ey fz dO -ju +fk dO -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk eQ -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk cD bh cD @@ -37140,7 +36962,7 @@ dO cD bh dO -ju +fk dO cD fb @@ -37268,26 +37090,26 @@ fb bh dO dO -ju -ju -ju +fk +fk +fk im -ju +fk dO -ju -ju +fk +fk dO dO -ju +fk ax cQ -ju +fk dO -ju -ju -ju +fk +fk +fk dO -ju +fk dO dO bO @@ -37298,9 +37120,9 @@ cr cv dO dO -ju +fk dO -ju +fk be gV bh @@ -37311,21 +37133,21 @@ cD cD cD dO -ju -ju -ju +fk +fk +fk be aI -ju +fk dO aa cQ -ju +fk dO -ju +fk be -ju -ju +fk +fk aa fU dO @@ -37338,21 +37160,21 @@ cD cD im cQ -ju -ju -ju -ju +fk +fk +fk +fk cQ -ju +fk dL dL dU dU cQ -ju +fk cQ cQ -ju +fk dO ee ei @@ -37367,20 +37189,20 @@ cD dO cD cD -ju +fk cD -ju +fk cD -ju +fk cD -ju +fk cD bh -ju -ju +fk +fk dO -ju -ju +fk +fk bh cD fb @@ -37397,7 +37219,7 @@ dO cD bh dO -ju +fk cD cD fb @@ -37531,20 +37353,20 @@ cD cD cD dO -ju -ju -ju +fk +fk +fk dO dO aI ax cQ dO -ju -ju +fk +fk be dO -ju +fk be dO dO @@ -37554,7 +37376,7 @@ dO dO dO dO -ju +fk be dO cQ @@ -37573,13 +37395,13 @@ dO dO dO dO -ju +fk dO -ju -ju +fk +fk cQ dO -ju +fk dO dO dO @@ -37593,22 +37415,22 @@ cD bh bh cD -ju -ju +fk +fk cQ dO cQ -ju -ju -ju +fk +fk +fk be -ju -ju -ju +fk +fk +fk dV -ju +fk dX -ju +fk fN dO ef @@ -37624,19 +37446,19 @@ be dO cD cD -ju -ju -ju +fk +fk +fk cD dO cD -ju +fk cD cD cD -ju +fk dO -ju +fk cD cD cD @@ -37649,12 +37471,12 @@ fb fb cD dO -ju +fk cD bh bh dO -ju +fk cD cD fb @@ -37788,33 +37610,33 @@ fb fb cD dO -ju -ju -ju -ju +fk +fk +fk +fk dO dO dO -gc +de dO -ju +fk cQ cy dO dO -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk dO dO -ju +fk cQ dO dO @@ -37830,13 +37652,13 @@ cD cD cD dO -ju +fk jw cQ cQ -ju +fk jw -ju +fk dO cD cD @@ -37852,21 +37674,21 @@ cD dO dO be -ju +fk dO dO -ju +fk aI -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk dO eg ek @@ -37881,20 +37703,20 @@ cD dO cD bh -ju +fk cD -ju +fk cD bh cD -ju +fk cD bh -ju -ju +fk +fk dO -ju -ju +fk +fk bh cD fb @@ -37911,7 +37733,7 @@ cD bh bh cD -ju +fk cD bh fb @@ -38046,18 +37868,18 @@ fb cD dO dO -ju -ju +fk +fk be -ju -ju -ju -ju +fk +fk +fk +fk jw -ju +fk be cQ -ju +fk dO dO dO @@ -38071,27 +37893,27 @@ dO dO dO cM -ju +fk cQ fN dO im -ju +fk im gV -ju +fk gV im im -ju +fk im gV dO dO dO -ju +fk cQ -ju +fk dO dO dO @@ -38108,9 +37930,9 @@ gV im dO cQ -ju +fk cD -ju +fk dO iK dO @@ -38134,23 +37956,23 @@ dO dO dO dO -ju +fk dO cD bh -ju -ju +fk +fk dO -ju +fk bh cD -ju +fk cD bh cD -ju +fk dO -ju +fk cD bh cD @@ -38163,7 +37985,7 @@ fb fb bh dO -ju +fk cD bh bh @@ -38315,82 +38137,82 @@ be cQ cQ cQ -ju +fk cQ cQ -ju -ju +fk +fk be cQ -ju -ju +fk +fk cQ cQ cQ cQ be -ju -ju +fk +fk cQ -ju +fk cQ -ju +fk cQ cQ cQ -ju +fk cQ be -ju +fk cQ -ju -ju -ju +fk +fk +fk be cQ -ju +fk cQ cQ be -ju +fk cQ -ju -ju -ju +fk +fk +fk cQ cQ cQ cQ -ju +fk cQ -ju -ju +fk +fk cD cQ -ju +fk cQ -ju +fk cQ -ju -ju +fk +fk cQ cQ -ju +fk cD be cD -ju -ju +fk +fk cQ -ju +fk be cQ -ju -ju +fk +fk cQ -ju +fk cD -ju +fk cD dO cD @@ -38404,11 +38226,11 @@ cD cD cD cD -ju -ju +fk +fk dO -ju -ju +fk +fk cD cD fb @@ -38569,79 +38391,79 @@ cD cD dO cQ -ju -ju +fk +fk cQ cQ cQ -ju +fk cQ -ju +fk cQ cQ -ju +fk be cQ cQ -ju +fk aI cQ -ju +fk cD -ju +fk cQ be -ju +fk cQ -ju +fk cQ -ju +fk be cD cQ cQ -ju +fk cQ cQ -ju -ju +fk +fk cQ cQ -ju +fk cQ -ju -ju -ju +fk +fk +fk cQ cQ cQ be cQ -ju -ju +fk +fk cQ -ju +fk cQ cQ cQ be -ju -ju +fk +fk cQ cQ be cQ -ju -ju +fk +fk cD cQ cD -ju +fk cQ cQ cQ cQ -ju +fk cD cQ cQ @@ -38653,18 +38475,18 @@ dO cD bh bh -ju +fk dO -ju +fk bh cD bh cD bh cD -ju +fk dO -ju +fk cD bh cD @@ -38827,7 +38649,7 @@ cD dO cQ be -ju +fk fU dO im @@ -38841,9 +38663,9 @@ gV gV im dO -ju -ju -ju +fk +fk +fk be dO dO @@ -38860,11 +38682,11 @@ dO dO dO dO -ju +fk cQ cQ dO -ju +fk dO dO dO @@ -38878,10 +38700,10 @@ dO dO dO dO -ju -ju +fk +fk cQ -ju +fk dO im im @@ -38934,7 +38756,7 @@ fb fb bh cD -ju +fk cD bh bh @@ -39103,37 +38925,37 @@ dO dO dO dO -ju -ju -ju +fk +fk +fk be -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk be -ju +fk dO -ju +fk cQ -ju +fk dO fU -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk +fk dO im gV @@ -39356,10 +39178,10 @@ bh cD dO be -ju -ju -ju -ju +fk +fk +fk +fk be dO dO @@ -39375,7 +39197,7 @@ dO dO dO cQ -ju +fk cQ dO dO @@ -39613,14 +39435,14 @@ bh cD dO dO -ju -ju +fk +fk be -ju +fk fN dO -ju -ju +fk +fk cD cD cD @@ -39631,7 +39453,7 @@ cD cD cD dO -ju +fk cU cQ dO @@ -39675,7 +39497,7 @@ fb fb fb fb -ju +fk cD bo fb @@ -39876,9 +39698,9 @@ dO dO dO dO -ju -ju -ju +fk +fk +fk fb fb fb @@ -39889,7 +39711,7 @@ fb fb dO cQ -ju +fk cD dO cD @@ -39933,7 +39755,7 @@ fb fb fb cD -ju +fk fb fb fb @@ -40130,11 +39952,11 @@ dO fb fb fb -ju -ju +fk +fk dO -ju -ju +fk +fk cD fb fb @@ -40145,7 +39967,7 @@ fb fb fb dO -ju +fk cQ di dO @@ -40390,9 +40212,9 @@ fb cD be dO -ju +fk be -ju +fk fb fb fb @@ -40402,9 +40224,9 @@ fb fb fb cD -ju -ju -ju +fk +fk +fk dO cD fb @@ -40644,11 +40466,11 @@ bh fb fb fb -ju -ju +fk +fk dO -ju -ju +fk +fk cD fb fb @@ -40659,9 +40481,9 @@ fb fb fb cD -ju +fk cQ -ju +fk dO fb fb @@ -40902,11 +40724,11 @@ fI fI fI cD -ju +fk dO -ju -ju -ju +fk +fk +fk fb fb fb @@ -40916,9 +40738,9 @@ fb fb fb cD -ju +fk cQ -ju +fk cD fb fb @@ -41160,9 +40982,9 @@ fI fI fb cD -ju -ju -ju +fk +fk +fk cD fb fb @@ -41173,9 +40995,9 @@ fb fb fb cD -ju -ju -ju +fk +fk +fk cD fb fb @@ -41416,11 +41238,11 @@ fI fI fI fb -ju -ju -ju -ju -ju +fk +fk +fk +fk +fk fb fb fb @@ -41430,7 +41252,7 @@ fb fb fb cD -ju +fk be cQ cD @@ -41674,9 +41496,9 @@ fI fI fb cD -ju -ju -ju +fk +fk +fk cD fb fb @@ -41687,9 +41509,9 @@ fb fb fb cD -ju -ju -ju +fk +fk +fk cD fb fb @@ -41933,7 +41755,7 @@ fb cD bh be -ju +fk cD fb fb @@ -41946,7 +41768,7 @@ fb bh cQ cD -ju +fk cD fb fb @@ -42189,9 +42011,9 @@ fI fb cD cD -ju -ju -ju +fk +fk +fk fb fb fb @@ -42201,9 +42023,9 @@ fb fb fb cD -ju -ju -ju +fk +fk +fk cD fb fb @@ -42447,8 +42269,8 @@ fb cD bh cD -ju -ju +fk +fk fb fb fb @@ -42460,7 +42282,7 @@ fb cD be cD -ju +fk cD fb fb @@ -42703,8 +42525,8 @@ fI fb cD cD -ju -ju +fk +fk be fb fb @@ -42716,8 +42538,8 @@ fb fb cD bh -ju -ju +fk +fk cD fb fb @@ -42961,7 +42783,7 @@ fb cD bh cD -ju +fk cD fb fb @@ -43218,7 +43040,7 @@ fb cD cD cD -ju +fk cD fb fb @@ -43230,8 +43052,8 @@ fb fb cD cD -ju -ju +fk +fk cD fb fb @@ -43475,7 +43297,7 @@ fb cD bh cD -ju +fk cD fb fb @@ -43487,7 +43309,7 @@ fb fb cD bh -ju +fk be cD fb @@ -43744,7 +43566,7 @@ fb fb cD cD -ju +fk cD cD fb @@ -44258,7 +44080,7 @@ fb fb cD bh -ju +fk bh cD fb diff --git a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm index 5a9264f4194..d3243cbe022 100644 --- a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm +++ b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm @@ -20,8 +20,7 @@ pixel_y = 3 }, /obj/item/reagent_containers/food/drinks/waterbottle{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/item/device/radio/phone{ frequency = 1280; @@ -85,8 +84,7 @@ /area/crashed_elyran_tanker/crew) "av" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/effect/decal/cleanable/generic{ pixel_y = -6; @@ -125,8 +123,7 @@ /area/crashed_elyran_tanker/crew) "aL" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -200,8 +197,7 @@ /turf/simulated/floor/reinforced/airless, /area/crashed_elyran_tanker/engineering) "bk" = ( -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, @@ -335,7 +331,6 @@ /area/crashed_elyran_tanker/thruster) "de" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "tank_vent_l_2"; dir = 1 }, @@ -400,7 +395,6 @@ /area/crashed_elyran_tanker/crew) "du" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "tank_vent_l_3"; dir = 1 }, @@ -730,7 +724,7 @@ dir = 9 }, /obj/machinery/atmospherics/portables_connector{ - dir = 4; + dir = 4 }, /obj/item/stack/material/steel, /obj/item/tape_roll, @@ -797,8 +791,7 @@ }, /area/crashed_elyran_tanker/engineering) "hO" = ( -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 }, @@ -853,9 +846,7 @@ /area/crashed_elyran_tanker/tanks) "ij" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; - id_tag = "tank_vent_r_2"; - dir = 2 + id_tag = "tank_vent_r_2" }, /turf/simulated/floor/reinforced/carbon_dioxide, /area/crashed_elyran_tanker/tanks) @@ -883,8 +874,7 @@ /area/crashed_elyran_tanker/bridge) "iE" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/structure/cable/green{ d2 = 2; @@ -1103,8 +1093,7 @@ pixel_x = -7 }, /obj/item/device/gps{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/bridge) @@ -1551,8 +1540,7 @@ "pr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/tiled/rust/airless, /area/crashed_elyran_tanker/engineering) "pz" = ( @@ -1758,9 +1746,7 @@ pixel_x = 8; pixel_y = 7 }, -/obj/machinery/recharger{ - pixel_y = 0 - }, +/obj/machinery/recharger, /turf/simulated/floor/tiled, /area/crashed_elyran_tanker/bridge) "rD" = ( @@ -1961,8 +1947,7 @@ /turf/simulated/floor/reinforced/airless, /area/crashed_elyran_tanker/tanks) "tS" = ( -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, @@ -2089,8 +2074,7 @@ /turf/simulated/floor/airless, /area/crashed_elyran_tanker/tanks) "vI" = ( -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 @@ -2104,9 +2088,7 @@ /area/crashed_elyran_tanker/tanks) "vQ" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; - id_tag = "tank_vent_r_1"; - dir = 2 + id_tag = "tank_vent_r_1" }, /turf/simulated/floor/reinforced/airless, /area/crashed_elyran_tanker/tanks) @@ -2280,9 +2262,7 @@ "xB" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/tiled/white, /area/crashed_elyran_tanker/crew) @@ -2292,8 +2272,7 @@ /turf/simulated/floor/reinforced/airless, /area/crashed_elyran_tanker/tanks) "xF" = ( -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/warning, /obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, /turf/simulated/floor, @@ -3284,8 +3263,7 @@ /area/crashed_elyran_tanker/engineering) "Hj" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/green{ @@ -3385,8 +3363,7 @@ /area/crashed_elyran_tanker/tanks) "Ia" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/power/solar, /obj/structure/cable/green{ @@ -3543,10 +3520,6 @@ /obj/structure/foamedmetal, /turf/unsimulated/floor/asteroid/ash/rocky, /area/space) -"Js" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor, -/area/crashed_elyran_tanker/crew) "Ju" = ( /obj/machinery/atmospherics/unary/outlet_injector{ frequency = 1441; @@ -4158,9 +4131,7 @@ /area/crashed_elyran_tanker/tanks) "Pe" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; - id_tag = "tank_vent_r_3"; - dir = 2 + id_tag = "tank_vent_r_3" }, /turf/simulated/floor/reinforced/phoron, /area/crashed_elyran_tanker/tanks) @@ -4327,7 +4298,6 @@ /area/crashed_elyran_tanker/tanks) "Qp" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "tank_vent_l_4"; dir = 1 }, @@ -4345,8 +4315,7 @@ /area/crashed_elyran_tanker/tanks) "QB" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/power/solar, /obj/effect/decal/cleanable/dirt, @@ -4407,8 +4376,7 @@ }, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /turf/simulated/floor, /area/crashed_elyran_tanker/crew) @@ -4496,7 +4464,6 @@ /area/crashed_elyran_tanker/tanks) "Sm" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "tank_vent_l_1"; dir = 1 }, @@ -4748,7 +4715,6 @@ dir = 10 }, /obj/random/junk{ - pixel_y = 0; pixel_x = -6 }, /turf/simulated/floor/tiled, @@ -4818,8 +4784,7 @@ /area/crashed_elyran_tanker/engineering) "VE" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -4847,8 +4812,7 @@ /turf/simulated/floor/airless, /area/crashed_elyran_tanker/tanks) "VN" = ( -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/warning, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency{ @@ -5028,9 +4992,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; - id_tag = "tank_vent_r_4"; - dir = 2 + id_tag = "tank_vent_r_4" }, /turf/simulated/floor/reinforced/airless, /area/crashed_elyran_tanker/tanks) @@ -5133,8 +5095,7 @@ /turf/simulated/floor/airless, /area/crashed_elyran_tanker/tanks) "Yq" = ( -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, @@ -5196,8 +5157,7 @@ /area/crashed_elyran_tanker/tanks) "YH" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/power/solar, /obj/effect/decal/cleanable/dirt, @@ -5229,7 +5189,6 @@ pixel_x = 11 }, /obj/item/pipe{ - pixel_y = 0; pixel_x = 22 }, /turf/simulated/floor/reinforced/airless, @@ -42522,7 +42481,7 @@ Dg le Am LV -Js +Km JP tG Sf @@ -43291,7 +43250,7 @@ Dg Dg le wO -Js +Km Bg Lu nQ diff --git a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost.dmm b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost.dmm index 919e39dbdd5..10e9c27fabb 100644 --- a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost.dmm +++ b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost.dmm @@ -346,9 +346,7 @@ /turf/simulated/floor/plating, /area/crystal_planet_outpost/cave_entrance) "dI" = ( -/obj/structure/bed/stool/chair/sofa/right/beige{ - dir = 2 - }, +/obj/structure/bed/stool/chair/sofa/right/beige, /turf/simulated/floor/carpet/lightblue, /area/crystal_planet_outpost/living) "dK" = ( @@ -402,17 +400,13 @@ }, /area/crystal_planet_outpost/landing) "es" = ( -/obj/machinery/atmospherics/binary/pump/high_power{ - dir = 2 - }, +/obj/machinery/atmospherics/binary/pump/high_power, /obj/random/dirt_75, /turf/simulated/floor/plating, /area/crystal_planet_outpost/engineering) "et" = ( /obj/structure/flora/pottedplant/bluefern, -/obj/machinery/light/broken{ - dir = 2 - }, +/obj/machinery/light/broken, /turf/simulated/floor/tiled, /area/crystal_planet_outpost/living) "ev" = ( @@ -478,9 +472,7 @@ /area/crystal_planet_outpost/caves) "fa" = ( /obj/effect/floor_decal/corner_wide/black/diagonal, -/obj/machinery/light/colored/dying{ - dir = 2 - }, +/obj/machinery/light/colored/dying, /obj/random/dirt_75, /turf/simulated/floor/tiled/white, /area/crystal_planet_outpost/living) @@ -632,8 +624,7 @@ /obj/machinery/atmospherics/unary/outlet_injector{ frequency = 1441; id = "co2_in"; - use_power = 1; - dir = 2 + use_power = 1 }, /obj/random/dirt_75, /obj/random/dirt_75, @@ -952,8 +943,7 @@ pixel_y = 9 }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup{ - pixel_x = 6; - pixel_y = 0 + pixel_x = 6 }, /obj/random/dirt_75, /turf/simulated/floor/carpet/lightblue, @@ -1093,8 +1083,7 @@ /area/crystal_planet_outpost/living) "mB" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /obj/structure/cable{ icon_state = "0-8" @@ -1898,9 +1887,7 @@ /turf/simulated/floor/tiled, /area/crystal_planet_outpost/living) "tA" = ( -/obj/machinery/atmospherics/binary/pump/high_power{ - dir = 2 - }, +/obj/machinery/atmospherics/binary/pump/high_power, /obj/random/dirt_75, /obj/random/dirt_75, /turf/simulated/floor/plating, @@ -2087,9 +2074,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/machinery/floodlight/randomcharge{ - dir = 2 - }, +/obj/machinery/floodlight/randomcharge, /obj/structure/cable{ icon_state = "2-8" }, @@ -2966,9 +2951,7 @@ /area/crystal_planet_outpost/living) "FG" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; - id_tag = "co2_out"; - dir = 2 + id_tag = "co2_out" }, /obj/random/dirt_75, /obj/random/dirt_75, @@ -3150,8 +3133,7 @@ /area/crystal_planet_outpost/caves) "HO" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /obj/structure/table/steel, /obj/random/powercell{ @@ -3368,9 +3350,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/light/broken{ - dir = 2 - }, +/obj/machinery/light/broken, /obj/random/dirt_75, /turf/simulated/floor/tiled, /area/crystal_planet_outpost/living) @@ -3652,7 +3632,6 @@ /area/crystal_planet_outpost/living) "MJ" = ( /obj/machinery/computer/general_air_control/large_tank_control/terminal{ - dir = 2; input_tag = "co2_in"; output_tag = "co2_out"; sensors = list("co2_sensor"="Tank") @@ -4003,9 +3982,7 @@ /turf/simulated/floor/plating, /area/crystal_planet_outpost/caves) "PR" = ( -/obj/machinery/light/broken{ - dir = 2 - }, +/obj/machinery/light/broken, /turf/simulated/floor/tiled, /area/crystal_planet_outpost/living) "PS" = ( diff --git a/maps/away/away_site/cult_base/cult_base.dmm b/maps/away/away_site/cult_base/cult_base.dmm index fac509324df..cecd8341e52 100644 --- a/maps/away/away_site/cult_base/cult_base.dmm +++ b/maps/away/away_site/cult_base/cult_base.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aaa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/west_1, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 4 @@ -50,8 +48,7 @@ /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/west_2, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -111,9 +108,7 @@ /area/cult_base/docks_west) "aam" = ( /obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/west_3, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ @@ -264,9 +259,7 @@ /turf/simulated/floor/plating, /area/cult_base/atmos_waste) "aaA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, /obj/structure/cable/yellow{ @@ -286,9 +279,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -318,12 +309,8 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/cult_base/atmos_supply) "aaO" = ( @@ -432,12 +419,8 @@ /area/cult_base/maint_south) "abi" = ( /obj/random/dirt_75, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 10 @@ -445,9 +428,7 @@ /turf/simulated/floor/plating/asteroid, /area/cult_base/asteroid_inside) "abj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -471,7 +452,6 @@ name = "airlock_cult_base_5" }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -548,9 +528,7 @@ /turf/simulated/floor/tiled/dark, /area/cult_base/hallways_west) "abv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -590,9 +568,7 @@ /obj/machinery/light/broken{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/corner/grey{ dir = 9 }, @@ -612,12 +588,8 @@ /obj/effect/floor_decal/corner/grey{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -691,9 +663,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/cult_base/atmos_waste) @@ -702,12 +672,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/random/dirt_75, /turf/simulated/floor/plating, /area/cult_base/atmos_waste) @@ -731,12 +697,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/cult_base/atmos_waste) @@ -760,9 +722,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -775,9 +735,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 10 }, @@ -805,9 +763,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/dirt_75, /turf/simulated/floor/plating, /area/cult_base/maint_mid) @@ -818,12 +774,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/cult_base/atmos_waste) "acl" = ( @@ -831,21 +783,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/cult_base/hallways_south) "acm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -875,15 +819,9 @@ /obj/effect/floor_decal/corner/grey{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/cult_base/docks_south) "acp" = ( @@ -896,12 +834,8 @@ /turf/simulated/floor/tiled/dark, /area/cult_base/docks_south) "acq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -912,15 +846,12 @@ /area/cult_base/hallways_west) "acr" = ( /obj/structure/table/standard, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal{ - pixel_x = 7; - pixel_y = 0 + pixel_x = 7 }, /obj/random/pottedplant_small{ pixel_x = -5; @@ -934,12 +865,8 @@ /turf/simulated/floor/wood/ebony, /area/cult_base/lounge) "acs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -1026,9 +953,7 @@ /turf/simulated/floor/exoplanet/barren, /area/cult_base/asteroid) "acC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/cult_base/storage_two) @@ -1142,9 +1067,7 @@ /turf/simulated/floor/tiled/dark, /area/cult_base/storage_two) "acZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/dirt_75, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, @@ -1162,12 +1085,8 @@ "adb" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/cult_base/hallways_south) "adc" = ( @@ -1201,12 +1120,8 @@ /area/cult_base/hallways_north) "ade" = ( /obj/random/dirt_75, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/exoplanet/barren, /area/cult_base/asteroid_inside) "adf" = ( @@ -1370,9 +1285,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small/broken{ dir = 4 }, @@ -1391,9 +1304,7 @@ /turf/simulated/floor/plating, /area/cult_base/atmos_supply) "ady" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/decal/cleanable/blood/drip{ pixel_x = 7; pixel_y = 22 @@ -1458,12 +1369,8 @@ /turf/simulated/floor/tiled/white, /area/cult_base/medbay) "aea" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/blood/drip{ pixel_x = -11; pixel_y = 5 @@ -1539,7 +1446,6 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/south_2, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -1601,12 +1507,8 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/shuttle/cult_base/cargo) "aeo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -1626,9 +1528,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/junk, /obj/structure/cable{ @@ -1652,9 +1552,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -1731,9 +1629,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/cult_base/bridge) "aeU" = ( @@ -1997,12 +1893,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/cult_base/atmos_supply) "agi" = ( @@ -2061,9 +1953,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ icon_state = "4-8" }, @@ -2175,12 +2065,8 @@ /obj/effect/floor_decal/corner/grey{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -2206,9 +2092,7 @@ /turf/simulated/floor/plating, /area/cult_base/atmos_waste) "ahi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/generic{ pixel_x = 14; pixel_y = -9 @@ -2224,19 +2108,14 @@ "ahq" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/cult_base/hallways_east) "ahr" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_cult_base_3"; @@ -2251,12 +2130,8 @@ /obj/effect/floor_decal/corner/grey{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -2295,9 +2170,7 @@ /turf/simulated/wall/r_wall, /area/shuttle/cult_base/crew) "ahK" = ( -/obj/machinery/atmospherics/binary/pump/fuel{ - dir = 2 - }, +/obj/machinery/atmospherics/binary/pump/fuel, /obj/effect/floor_decal/industrial/hatch_tiny/yellow{ dir = 4 }, @@ -2395,12 +2268,10 @@ name = "airlock_cult_base_1" }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -2582,12 +2453,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/cult_base/docks_south) "ajK" = ( @@ -2597,12 +2464,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/cult_base/maint_north) "ajN" = ( @@ -2764,7 +2627,6 @@ name = "airlock_cult_base_4" }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -2779,12 +2641,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/cult_base/maint_mid) "akV" = ( @@ -2925,12 +2783,8 @@ /obj/effect/floor_decal/corner/grey{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/cult_base/docks_south) "alK" = ( @@ -2983,9 +2837,7 @@ /turf/simulated/floor/tiled/dark/full, /area/cult_base/crew_quarters) "amr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/slate, /area/cult_base/medbay) "amu" = ( @@ -3135,12 +2987,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/light/small/broken, /turf/simulated/floor/plating, /area/cult_base/atmos_supply) @@ -3364,12 +3212,8 @@ /obj/effect/floor_decal/corner/grey{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -3399,12 +3243,8 @@ "aoF" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -3460,12 +3300,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-8" }, @@ -3561,12 +3397,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/cult_base/atmos_waste) "apK" = ( @@ -3678,9 +3510,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 4 }, @@ -3752,8 +3582,7 @@ pixel_y = 20 }, /obj/effect/decal/cleanable/blood/drip{ - pixel_x = 10; - pixel_y = 0 + pixel_x = 10 }, /obj/structure/cable{ icon_state = "1-2" @@ -3764,12 +3593,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 1 }, @@ -3796,9 +3621,7 @@ /turf/simulated/floor/tiled/dark, /area/cult_base/hallways_east) "aqN" = ( -/obj/structure/bed/stool/chair/folding{ - dir = 2 - }, +/obj/structure/bed/stool/chair/folding, /obj/machinery/light/colored/dying{ dir = 8 }, @@ -3806,9 +3629,7 @@ /turf/simulated/floor/wood/ebony, /area/cult_base/lounge) "aqP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 8 }, @@ -3881,9 +3702,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-8" }, @@ -3922,13 +3741,9 @@ /turf/simulated/floor/plating, /area/shuttle/cult_base/cargo) "aru" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -3969,12 +3784,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small/emergency{ dir = 4 }, @@ -3989,9 +3800,7 @@ /turf/simulated/floor/tiled/dark, /area/cult_base/crew_quarters) "arE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/plating, /area/cult_base/atmos_supply) "arH" = ( @@ -4080,12 +3889,8 @@ "asr" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -4400,9 +4205,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/outline_door/red, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 4 @@ -4422,9 +4225,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 1 }, @@ -4573,9 +4374,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -4746,9 +4545,7 @@ /obj/machinery/light/broken{ dir = 1 }, -/obj/machinery/computer/ship/sensors/terminal{ - dir = 2 - }, +/obj/machinery/computer/ship/sensors/terminal, /turf/simulated/floor/tiled/dark, /area/cult_base/bridge) "avV" = ( @@ -4814,9 +4611,7 @@ }, /area/cult_base/lounge) "awt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/random/junk, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 8 @@ -4932,7 +4727,6 @@ /obj/random/junk, /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/south_2, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -4945,9 +4739,7 @@ /turf/simulated/floor/plating, /area/cult_base/docks_south) "axi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/south_2, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 8 @@ -5014,18 +4806,12 @@ /turf/simulated/floor/plating, /area/cult_base/maint_mid) "axw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/slate, /area/cult_base/medbay) "axy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -5090,9 +4876,7 @@ /area/cult_base/docks_west) "aym" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -5222,9 +5006,7 @@ /area/cult_base/hallways_south) "azb" = ( /obj/effect/floor_decal/corner/mauve/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/cult_base/crew_quarters) "azh" = ( @@ -5270,8 +5052,7 @@ /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/west_2, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -5378,9 +5159,7 @@ /area/cult_base/docks_south) "azY" = ( /obj/effect/floor_decal/corner/mauve/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/cult_base/crew_quarters) "azZ" = ( @@ -5504,12 +5283,8 @@ /turf/simulated/floor/plating, /area/cult_base/atmos_waste) "aAM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/cable{ icon_state = "1-4" @@ -5649,9 +5424,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/cult_base/hallways_south) @@ -5738,12 +5511,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/cult_base/maint_south) "aBW" = ( @@ -5841,12 +5610,8 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -5924,22 +5689,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/cult_base/maint_mid) "aDE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/cult_base/docks_south) "aDH" = ( @@ -5969,9 +5726,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/cult_base/docks_west) @@ -6196,12 +5951,8 @@ /obj/effect/floor_decal/corner/grey{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm/east{ req_one_access = null }, @@ -6304,9 +6055,7 @@ /area/cult_base/atmos_supply) "aGE" = ( /obj/structure/barricade/wooden, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/corner/grey{ dir = 9 }, @@ -6448,9 +6197,7 @@ /area/cult_base/hallways_south) "aHg" = ( /obj/effect/floor_decal/corner/grey, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -6468,9 +6215,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -6521,8 +6266,7 @@ "aHz" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker/airlock/shuttle/cult_base_shuttle, /obj/effect/map_effect/marker_helper/airlock/exterior, @@ -6651,15 +6395,9 @@ /turf/simulated/floor/tiled/dark/full, /area/cult_base/storage_one) "aIl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/cult_base/docks_south) "aIm" = ( @@ -6755,12 +6493,8 @@ /turf/simulated/floor/exoplanet/barren, /area/cult_base/asteroid_inside) "aJa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -6779,12 +6513,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small/emergency{ dir = 4 }, @@ -6870,12 +6600,8 @@ /turf/simulated/floor/plating, /area/cult_base/atmos_waste) "aJJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/cable{ icon_state = "2-8" @@ -6964,9 +6690,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -6991,12 +6715,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm/east{ req_one_access = null }, @@ -7202,8 +6922,7 @@ "aLo" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_cult_base_2"; @@ -7219,12 +6938,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/cult_base/maint_north) "aLu" = ( @@ -7308,8 +7023,7 @@ }, /obj/random/junk, /obj/effect/decal/cleanable/blood/drip{ - pixel_x = 9; - pixel_y = 0 + pixel_x = 9 }, /obj/effect/decal/cleanable/blood/drip{ pixel_x = -10; @@ -7425,12 +7139,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 4 }, @@ -7462,9 +7172,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/cult_base/hallways_east) "aMN" = ( @@ -7510,12 +7218,8 @@ pixel_x = 10; pixel_y = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -7550,9 +7254,7 @@ /turf/simulated/floor/plating, /area/cult_base/atmos_waste) "aNa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 8 }, @@ -7710,9 +7412,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -7805,12 +7505,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/junk, /turf/simulated/floor/plating, /area/cult_base/atmos_supply) @@ -7981,18 +7677,12 @@ "aPR" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/dark, /area/cult_base/bridge) @@ -8253,8 +7943,7 @@ /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/south_1, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -8360,8 +8049,7 @@ /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -8450,8 +8138,7 @@ icon_state = "1-2" }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker/airlock/shuttle/cult_base_shuttle, /obj/effect/map_effect/marker_helper/airlock/exterior, @@ -8480,9 +8167,7 @@ /area/cult_base/maint_south) "aSr" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/black{ pixel_x = -3; pixel_y = 6 @@ -8601,12 +8286,8 @@ "aSX" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -8640,12 +8321,8 @@ /area/cult_base/hallways_south) "aTi" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/cult_base/hallways_east) "aTj" = ( @@ -8676,9 +8353,7 @@ /area/cult_base/docks_south) "aTp" = ( /obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/bed/stool/chair/office/dark{ - dir = 2 - }, +/obj/structure/bed/stool/chair/office/dark, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/cult_base/bridge) @@ -8698,12 +8373,8 @@ /obj/effect/floor_decal/corner/grey{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/cult_base/docks_south) "aTC" = ( @@ -8722,12 +8393,8 @@ /turf/simulated/floor/airless, /area/cult_base/lounge) "aTF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -8773,12 +8440,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm/east{ req_one_access = null }, @@ -8852,9 +8515,7 @@ /turf/simulated/wall/r_wall, /area/cult_base/medbay) "aUA" = ( -/obj/structure/bed/stool/chair/folding{ - dir = 2 - }, +/obj/structure/bed/stool/chair/folding, /obj/machinery/power/apc/north{ req_access = null }, @@ -8952,12 +8613,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/cult_base/maint_mid) "aVb" = ( @@ -9035,12 +8692,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/dirt_75, /turf/simulated/floor/plating, /area/cult_base/atmos_waste) @@ -9184,12 +8837,8 @@ /turf/simulated/floor/tiled/dark, /area/cult_base/docks_south) "aWC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -9201,12 +8850,8 @@ /area/cult_base/asteroid) "aWM" = ( /obj/effect/floor_decal/corner/grey, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/cult_base/hallways_south) @@ -9214,12 +8859,8 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -9236,12 +8877,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 4 @@ -9338,12 +8975,8 @@ /turf/simulated/floor/plating, /area/cult_base/engineering) "aXE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-8" }, @@ -9604,9 +9237,7 @@ /turf/simulated/floor/tiled/dark, /area/cult_base/hallways_north) "aYS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/door/airlock/external, /obj/structure/cable{ icon_state = "1-2" @@ -9724,12 +9355,8 @@ /turf/simulated/floor/plating, /area/shuttle/cult_base/cargo) "aZn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/cable{ icon_state = "4-8" @@ -9909,12 +9536,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 10 @@ -10081,8 +9704,7 @@ /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = -28; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -10161,12 +9783,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 1 }, @@ -10233,8 +9851,7 @@ /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/south_1, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -10352,12 +9969,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 1 }, @@ -10382,8 +9995,7 @@ /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/west_3, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -10498,7 +10110,6 @@ name = "airlock_cult_base_4" }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -10568,12 +10179,8 @@ "gnR" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -10755,12 +10362,8 @@ /obj/effect/floor_decal/corner/grey{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -10844,12 +10447,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/dirt_75, /turf/simulated/floor/plating, /area/cult_base/maint_mid) @@ -10871,12 +10470,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 4 @@ -11067,7 +10662,6 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/west_1, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -11093,7 +10687,6 @@ name = "airlock_cult_base_5" }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -11396,12 +10989,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 1 }, @@ -11424,12 +11013,8 @@ /turf/simulated/floor/tiled/dark, /area/cult_base/storage_two) "lsH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -11521,12 +11106,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 8 }, @@ -11609,12 +11190,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 10 }, @@ -12100,12 +11677,8 @@ /obj/effect/floor_decal/corner/grey{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -12129,12 +11702,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red, /obj/random/dirt_75, /turf/simulated/floor/plating, @@ -12408,8 +11977,7 @@ /area/cult_base/hallways_east) "skG" = ( /obj/effect/decal/cleanable/blood/drip{ - pixel_x = 2; - pixel_y = 0 + pixel_x = 2 }, /turf/simulated/floor/cult, /area/shuttle/cult_base/cargo) @@ -12989,8 +12557,7 @@ /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/west_3, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -13035,7 +12602,6 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/west_1, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -13058,12 +12624,8 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -13240,9 +12802,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 5 }, -/obj/machinery/computer/ship/engines/terminal{ - dir = 2 - }, +/obj/machinery/computer/ship/engines/terminal, /turf/simulated/floor/tiled/dark, /area/shuttle/cult_base/crew) "ygX" = ( diff --git a/maps/away/away_site/first_aurora/first_aurora.dmm b/maps/away/away_site/first_aurora/first_aurora.dmm index 12854ca5d1c..dd87eac5273 100644 --- a/maps/away/away_site/first_aurora/first_aurora.dmm +++ b/maps/away/away_site/first_aurora/first_aurora.dmm @@ -336,8 +336,7 @@ /area/derelict/hallway/southwest) "bi" = ( /obj/structure/cryofeed{ - dir = 4; - icon_state = "cryo_rear" + dir = 4 }, /turf/simulated/floor/airless, /area/derelict/hallway/northeast) @@ -391,10 +390,6 @@ /obj/machinery/constructable_frame/temp_deco, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/northeast) -"bs" = ( -/obj/structure/door_assembly/door_assembly_generic, -/turf/simulated/floor/tiled/airless, -/area/derelict/hallway/northeast) "bt" = ( /obj/structure/target_stake, /obj/structure/grille/broken, @@ -587,7 +582,7 @@ dir = 4 }, /obj/item/tape/engineering{ - icon_state = "engineering_door"; + icon_state = "engineering_door" }, /turf/simulated/floor/tiled/white, /area/derelict/hallway/northeast) @@ -659,7 +654,7 @@ "cq" = ( /obj/machinery/door/blast/regular, /obj/item/tape/engineering{ - icon_state = "engineering_door"; + icon_state = "engineering_door" }, /turf/simulated/floor/airless, /area/derelict/hallway/northwest) @@ -687,7 +682,7 @@ dir = 4 }, /obj/item/tape/engineering{ - icon_state = "engineering_door"; + icon_state = "engineering_door" }, /turf/simulated/floor/tiled/dark/airless, /area/derelict/hallway/northwest) @@ -913,12 +908,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/northeast) -"dm" = ( -/obj/machinery/door/airlock/external{ - dir = 1 - }, -/turf/simulated/floor/airless, -/area/template_noop) "dn" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -1082,8 +1071,7 @@ dir = 1 }, /obj/structure/window/reinforced/tinted{ - dir = 8; - icon_state = "twindow" + dir = 8 }, /turf/template_noop, /area/derelict/hallway/northeast) @@ -1098,8 +1086,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ - dir = 4; - icon_state = "twindow" + dir = 4 }, /obj/structure/window/reinforced/tinted{ dir = 1 @@ -1112,8 +1099,7 @@ /area/derelict/hallway/northeast) "dP" = ( /obj/structure/window/reinforced/tinted{ - dir = 4; - icon_state = "twindow" + dir = 4 }, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/northeast) @@ -1205,12 +1191,6 @@ /obj/item/stack/rods, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/northeast) -"ei" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict/hallway/southeast) "ej" = ( /obj/item/bedsheet/mime, /turf/simulated/floor/airless, @@ -1467,8 +1447,7 @@ "eX" = ( /obj/machinery/power/solar_control{ id = "auxsolareast"; - name = "Fore Port Solar Control"; - track = 0 + name = "Fore Port Solar Control" }, /obj/structure/cable/yellow{ d2 = 4; @@ -1498,24 +1477,17 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/airless, /area/derelict/hallway/northwest) -"fa" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict/hallway/southeast) "fb" = ( /obj/machinery/suit_cycler/medical, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/northwest) "fc" = ( /obj/structure/table/rack{ - dir = 8; + dir = 8 }, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/northwest) @@ -1532,16 +1504,14 @@ /area/derelict/hallway/northeast) "ff" = ( /obj/machinery/shower{ - dir = 4; - icon_state = "shower" + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/northeast) "fg" = ( /obj/machinery/shower{ - dir = 8; - icon_state = "shower" + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, @@ -1598,14 +1568,12 @@ "fo" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /obj/structure/mirror{ dir = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, @@ -1625,8 +1593,7 @@ /area/derelict/hallway/northeast) "fr" = ( /obj/machinery/shower{ - dir = 8; - icon_state = "shower" + dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -1679,10 +1646,7 @@ /turf/simulated/floor/airless, /area/derelict/hallway/northwest) "fz" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "NO_TAG"; - charge = 0 - }, +/obj/machinery/power/smes/buildable, /turf/simulated/floor/airless, /area/derelict/hallway/northwest) "fA" = ( @@ -1698,7 +1662,7 @@ /area/derelict/hallway/northwest) "fE" = ( /obj/structure/table/rack{ - dir = 8; + dir = 8 }, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, @@ -1709,7 +1673,7 @@ /area/derelict/hallway/northwest) "fF" = ( /obj/structure/table/rack{ - dir = 8; + dir = 8 }, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/atmos, @@ -1740,7 +1704,6 @@ "fJ" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -1763,7 +1726,6 @@ "fN" = ( /obj/machinery/door/airlock/engineering{ icon_state = "door_closed"; - locked = 0; name = "Fore Port Solar Access"; req_access = list(11); dir = 1 @@ -1775,8 +1737,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/derelict/hallway/northwest) @@ -1810,7 +1771,6 @@ /area/derelict/hallway/northwest) "fT" = ( /obj/machinery/status_display{ - pixel_x = 0; pixel_y = 32 }, /obj/random/tech_supply, @@ -1888,12 +1848,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/rust, /area/derelict/hallway/northwest) -"ge" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict/hallway/southeast) "gf" = ( /obj/item/storage/belt/champion, /turf/simulated/floor/tiled/airless, @@ -1976,10 +1930,6 @@ /obj/random/highvalue, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/northwest) -"gt" = ( -/obj/structure/door_assembly, -/turf/simulated/floor/tiled/airless, -/area/derelict/hallway/northwest) "gu" = ( /obj/structure/table/rack, /obj/item/device/radio/off, @@ -2474,7 +2424,7 @@ /area/template_noop) "ir" = ( /obj/structure/table/rack{ - dir = 8; + dir = 8 }, /obj/item/stack/rods{ amount = 50 @@ -2487,7 +2437,7 @@ /area/derelict/hallway/southwest) "it" = ( /obj/structure/table/rack{ - dir = 8; + dir = 8 }, /obj/item/module/power_control, /obj/item/cell{ @@ -2529,9 +2479,7 @@ "iA" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 28 @@ -2588,9 +2536,7 @@ "iL" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/airless, /area/derelict/hallway/southwest) @@ -2650,9 +2596,7 @@ "iU" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 28 @@ -2780,8 +2724,7 @@ /area/derelict/hallway/southeast) "js" = ( /obj/structure/morgue{ - dir = 8; - icon_state = "morgue1" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/derelict/hallway/southeast) @@ -2820,8 +2763,7 @@ /area/derelict/hallway/southeast) "jy" = ( /obj/structure/morgue{ - dir = 2; - icon_state = "morgue1" + dir = 2 }, /turf/simulated/floor/tiled/white/airless, /area/derelict/hallway/southeast) @@ -3066,9 +3008,7 @@ "kr" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/airless, @@ -3101,10 +3041,7 @@ /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "ky" = ( -/obj/structure/sign/poster{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/structure/sign/poster, /turf/simulated/wall, /area/derelict/hallway/southwest) "kz" = ( @@ -3180,10 +3117,7 @@ /area/derelict/hallway/southeast) "kM" = ( /obj/machinery/shower{ - dir = 8; - icon_state = "shower"; - pixel_x = 0; - pixel_y = 0 + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/airless, @@ -3242,9 +3176,7 @@ dir = 4; id = "packageExternal" }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/southwest) "kW" = ( @@ -3267,8 +3199,7 @@ "ld" = ( /obj/item/material/shard, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/template_noop, /area/template_noop) @@ -3323,9 +3254,7 @@ "lm" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -3343,15 +3272,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "lo" = ( /obj/machinery/status_display{ - density = 0; - pixel_x = 0; pixel_y = 32 }, /obj/structure/closet/emcloset, @@ -3409,9 +3334,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "lw" = ( @@ -3474,10 +3397,6 @@ }, /turf/template_noop, /area/derelict/hallway/southeast) -"lF" = ( -/obj/structure/door_assembly, -/turf/simulated/floor/tiled/airless, -/area/derelict/hallway/southeast) "lG" = ( /obj/item/cell/super, /turf/simulated/floor/tiled/white/airless, @@ -3501,9 +3420,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "lK" = ( @@ -3613,9 +3530,7 @@ }, /obj/structure/window/reinforced, /obj/structure/grille, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "mb" = ( @@ -3737,9 +3652,7 @@ dir = 4; id = "QMLoad2" }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/template_noop) "mu" = ( @@ -3791,14 +3704,8 @@ /obj/random/medical, /turf/template_noop, /area/derelict/hallway/southeast) -"mC" = ( -/obj/structure/door_assembly, -/turf/simulated/floor/tiled/white/airless, -/area/derelict/hallway/southeast) "mE" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/template_noop) "mF" = ( @@ -3843,10 +3750,6 @@ }, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/southwest) -"mK" = ( -/obj/structure/door_assembly, -/turf/simulated/floor/tiled/white/airless, -/area/derelict/hallway/southeast) "mL" = ( /obj/machinery/door/airlock/glass_medical{ id_tag = "GeneticsDoor"; @@ -3902,12 +3805,9 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 - }, -/obj/machinery/door/firedoor{ - dir = 2 + name = "EXTERNAL AIRLOCK" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/template_noop) "mV" = ( @@ -3919,9 +3819,7 @@ }, /obj/structure/window/reinforced, /obj/structure/grille, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/template_noop) "mW" = ( @@ -4072,10 +3970,6 @@ }, /turf/simulated/floor/tiled/white/airless, /area/derelict/hallway/southeast) -"nt" = ( -/obj/structure/door_assembly, -/turf/simulated/floor/tiled/airless, -/area/derelict/hallway/southeast) "nu" = ( /obj/structure/door_assembly, /obj/effect/decal/cleanable/dirt, @@ -4093,9 +3987,7 @@ dir = 4; id = "QMLoad" }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/template_noop) "ny" = ( @@ -4406,9 +4298,7 @@ "oq" = ( /obj/item/clipboard, /obj/item/stamp{ - name = "Quartermaster's stamp"; - pixel_x = 0; - pixel_y = 0 + name = "Quartermaster's stamp" }, /obj/structure/table/standard{ name = "plastic table frame" @@ -4519,9 +4409,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "oJ" = ( @@ -4573,22 +4461,19 @@ /area/template_noop) "oR" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood/airless, /area/derelict/hallway/southeast) "oS" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood/airless, /area/derelict/hallway/southeast) "oT" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /turf/simulated/floor/wood/airless, /area/derelict/hallway/southeast) @@ -4698,30 +4583,25 @@ /area/derelict/hallway/southeast) "pl" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood/airless, /area/derelict/hallway/southeast) "pm" = ( /obj/structure/table/glass, /obj/item/device/radio{ - anchored = 0; - broadcasting = 0; canhear_range = 4; desc = "Are you going to make the call?"; frequency = 1347; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; - listening = 1; name = "Red Telephone" }, /turf/simulated/floor/wood/airless, /area/derelict/hallway/southeast) "pn" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood/airless, /area/derelict/hallway/southeast) @@ -4768,8 +4648,7 @@ /area/derelict/hallway/southeast) "pv" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/wood/airless, /area/derelict/hallway/southeast) @@ -4779,8 +4658,7 @@ /area/derelict/hallway/southeast) "px" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /turf/simulated/floor/wood/airless, /area/derelict/hallway/southeast) @@ -4812,15 +4690,12 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/simulated/wall, /area/derelict/hallway/southwest) "pD" = ( /obj/machinery/status_display{ - density = 0; - pixel_x = 0; pixel_y = -32 }, /obj/structure/reagent_dispensers/fueltank, @@ -4862,7 +4737,6 @@ "pK" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 5 }, @@ -4909,9 +4783,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "pT" = ( @@ -4920,9 +4792,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "pU" = ( @@ -4934,9 +4804,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "pV" = ( @@ -4967,8 +4835,7 @@ /obj/structure/grille, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; - name = "KEEP CLEAR: DOCKING AREA"; - pixel_y = 0 + name = "KEEP CLEAR: DOCKING AREA" }, /turf/template_noop, /area/template_noop) @@ -5295,12 +5162,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/derelict/hallway/southeast) -"rc" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/derelict/hallway/southeast) "rd" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -5392,8 +5253,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/derelict/hallway/southeast) @@ -5416,10 +5276,6 @@ }, /turf/template_noop, /area/template_noop) -"rv" = ( -/obj/structure/door_assembly, -/turf/simulated/floor/tiled/airless, -/area/derelict/hallway/southeast) "rw" = ( /obj/item/material/shard{ icon_state = "medium" @@ -5462,10 +5318,7 @@ /turf/simulated/floor/plating, /area/derelict/hallway/southeast) "rC" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "NO_TAG"; - charge = 0 - }, +/obj/machinery/power/smes/buildable, /turf/simulated/floor/airless, /area/derelict/hallway/southeast) "rD" = ( @@ -5505,8 +5358,7 @@ /area/derelict/hallway/southeast) "rK" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/machinery/light/small{ dir = 4 @@ -5555,8 +5407,7 @@ "rQ" = ( /obj/machinery/power/solar_control{ id = "starboardsolar"; - name = "Aft Starboard Solar Control"; - track = 0 + name = "Aft Starboard Solar Control" }, /obj/structure/cable/yellow{ d2 = 4; @@ -5582,7 +5433,6 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/airless, @@ -5639,7 +5489,6 @@ dir = 1 }, /turf/simulated/floor{ - dir = 2; icon_state = "cmo" }, /area/derelict/hallway/southeast) @@ -5654,9 +5503,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/airless, /area/derelict/hallway/southeast) "sb" = ( @@ -5859,10 +5706,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, /area/derelict/hallway/southeast) -"sB" = ( -/obj/structure/door_assembly, -/turf/simulated/floor/tiled/airless, -/area/derelict/hallway/southeast) "sC" = ( /obj/item/clipboard, /obj/effect/decal/cleanable/dirt, @@ -6454,9 +6297,7 @@ "uh" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/tiled/white/airless, /area/derelict/hallway/southeast) @@ -6558,8 +6399,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/airless, @@ -6577,19 +6417,11 @@ }, /turf/simulated/floor/airless, /area/derelict/hallway/southwest) -"uv" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "NO_TAG"; - charge = 0 - }, -/turf/simulated/floor/airless, -/area/derelict/hallway/southwest) "uw" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall/r_wall, /area/derelict/hallway/southwest) @@ -6679,9 +6511,7 @@ /area/derelict/hallway/southwest) "uG" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1379; id_tag = "robotics_solar_airlock"; - pixel_x = 0; pixel_y = -25; req_access = list(13); tag_airpump = "robotics_solar_pump"; @@ -6690,7 +6520,6 @@ tag_interior_door = "robotics_solar_inner" }, /obj/machinery/airlock_sensor{ - frequency = 1379; id_tag = "robotics_solar_sensor"; pixel_x = 12; pixel_y = -25 @@ -6801,8 +6630,7 @@ "uS" = ( /obj/machinery/power/solar_control{ id = "portsolar"; - name = "Aft Port Solar Control"; - track = 0 + name = "Aft Port Solar Control" }, /obj/structure/cable/yellow, /turf/simulated/floor/airless, @@ -7126,7 +6954,6 @@ /obj/machinery/power/emitter{ anchored = 1; dir = 8; - id = null; state = 2 }, /turf/simulated/floor/airless, @@ -7147,9 +6974,6 @@ /obj/structure/girder, /turf/simulated/floor/airless, /area/derelict/hallway/southeast) -"wb" = ( -/turf/template_noop, -/area/template_noop) "wd" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/airless, @@ -27933,7 +27757,7 @@ aa aa aa kQ -uv +vG wq wX kQ @@ -28976,9 +28800,9 @@ aa aa aa aa -wb aa -wb +aa +aa aa aa aa @@ -29154,10 +28978,10 @@ ax aH ba av -gt +hm av au -gt +hm aa aa ac @@ -30260,11 +30084,11 @@ ac wq wq wq -wb -wb aa -wb -wb +aa +aa +aa +aa kQ aa aa @@ -37428,7 +37252,7 @@ aa ik ij ij -rv +sZ ij in rX @@ -37606,7 +37430,7 @@ ac bb bb bb -bs +ce bb bb bb @@ -38485,7 +38309,7 @@ in in vH ni -ei +fj in aa aa @@ -38890,7 +38714,7 @@ aa aa bb bb -bs +ce bb bb be @@ -38992,7 +38816,7 @@ aa aa aa in -fa +fj in aa aa @@ -41000,11 +40824,11 @@ ac aa aa ik -lF +sZ BS yi BS -mK +HF BS np ij @@ -45149,7 +44973,7 @@ ij tn ij in -rc +cj ij in in @@ -45652,7 +45476,7 @@ aa aa yi BS -lF +sZ ik aa ac @@ -46171,13 +45995,13 @@ aa aa ij qv -sB +sZ ij jd to ij ij -rc +cj ij in ik @@ -47688,7 +47512,7 @@ ij ij ij ij -nt +sZ ij ij ij @@ -52332,11 +52156,11 @@ ac ac aa yi -nt +sZ aP ac aa -mC +HF Aa ik aa @@ -54624,7 +54448,7 @@ in in in in -mC +HF BS in in @@ -58242,7 +58066,7 @@ aa aa aa ij -ge +fj ij aa aa @@ -63114,7 +62938,7 @@ aa oj ar ar -dm +ea az az az diff --git a/maps/away/away_site/idris_wreck/idris_wreck.dmm b/maps/away/away_site/idris_wreck/idris_wreck.dmm index d1465df523c..e03c8ea1678 100644 --- a/maps/away/away_site/idris_wreck/idris_wreck.dmm +++ b/maps/away/away_site/idris_wreck/idris_wreck.dmm @@ -132,9 +132,7 @@ /obj/structure/closet/crate/rad, /obj/item/stack/material/uranium/full, /obj/item/stack/material/uranium/full, -/obj/effect/floor_decal/industrial/warning{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor, /area/idris_wreck/vault) "bp" = ( diff --git a/maps/away/away_site/magshield/magshield.dmm b/maps/away/away_site/magshield/magshield.dmm index ef2f11d71be..08b8c02e36c 100644 --- a/maps/away/away_site/magshield/magshield.dmm +++ b/maps/away/away_site/magshield/magshield.dmm @@ -226,8 +226,7 @@ "aF" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/airless, /area/magshield/engine) @@ -357,7 +356,6 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - icon_state = "pdoor0"; id = "prototype_chamber_blast" }, /turf/simulated/floor/airless, @@ -371,7 +369,6 @@ /area/magshield/engine) "bb" = ( /obj/machinery/door/blast/regular/open{ - icon_state = "pdoor0"; id = "prototype_chamber_blast" }, /turf/simulated/floor/airless, @@ -478,8 +475,7 @@ /area/magshield/engine) "bs" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /turf/simulated/floor/airless, /area/magshield/engine) @@ -932,7 +928,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1441; - icon_state = "map_injector"; id = "n2o_in"; pixel_y = 1; use_power = 1 @@ -1202,8 +1197,7 @@ /area/magshield/north) "dk" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/airless, /area/magshield/north) @@ -1365,8 +1359,7 @@ /area/magshield/west) "dX" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /obj/random/toolbox, /turf/simulated/floor/airless, @@ -2034,7 +2027,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1441; - icon_state = "map_injector"; id = "d_n2_in"; use_power = 1 }, @@ -2098,8 +2090,7 @@ /area/magshield/east) "gi" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 5; - icon_state = "warning" + dir = 5 }, /turf/simulated/floor/airless, /area/magshield/east) @@ -2213,8 +2204,7 @@ /area/magshield/east) "gC" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /obj/machinery/portable_atmospherics/canister, /turf/simulated/floor/airless, @@ -2905,7 +2895,6 @@ /area/magshield/south) "iy" = ( /obj/machinery/door/blast/regular/open{ - icon_state = "pdoor0"; id = "prototype_chamber_blast" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, @@ -3163,7 +3152,6 @@ /area/magshield/south) "ju" = ( /obj/machinery/door/blast/regular/open{ - icon_state = "pdoor0"; id = "prototype_chamber_blast" }, /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced, @@ -4004,7 +3992,6 @@ "Ji" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - icon_state = "pdoor0"; id = "prototype_chamber_blast" }, /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced, diff --git a/maps/away/away_site/orion/orion_automated_station.dmm b/maps/away/away_site/orion/orion_automated_station.dmm index e2890c20843..e94a282a57d 100644 --- a/maps/away/away_site/orion/orion_automated_station.dmm +++ b/maps/away/away_site/orion/orion_automated_station.dmm @@ -33,8 +33,7 @@ dir = 4 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock/docking{ @@ -76,8 +75,7 @@ "bH" = ( /obj/structure/table/standard, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tcfl{ - pixel_x = 6; - pixel_y = 0 + pixel_x = 6 }, /turf/simulated/floor/tiled, /area/orion_automated_station/east) @@ -200,8 +198,7 @@ dir = 1 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock/docking{ @@ -420,9 +417,7 @@ "gp" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/door/airlock/glass{ - dir = 2 - }, +/obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/orion_automated_station/storage) "gR" = ( @@ -439,7 +434,6 @@ dir = 1 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -553,8 +547,7 @@ dir = 1 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock/docking{ @@ -1144,9 +1137,7 @@ "uQ" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/door/airlock/glass{ - dir = 2 - }, +/obj/machinery/door/airlock/glass, /obj/structure/cable{ icon_state = "1-2" }, @@ -1241,7 +1232,6 @@ "xq" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -1365,8 +1355,7 @@ dir = 8 }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock/docking{ @@ -1777,7 +1766,6 @@ "Fq" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -1819,9 +1807,7 @@ "Gq" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/door/airlock/glass{ - dir = 2 - }, +/obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/orion_automated_station/packages) "GA" = ( @@ -2333,8 +2319,7 @@ }, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock/docking{ @@ -2455,9 +2440,7 @@ "PO" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/door/airlock/glass{ - dir = 2 - }, +/obj/machinery/door/airlock/glass, /obj/structure/cable{ icon_state = "1-2" }, @@ -2538,8 +2521,7 @@ dir = 8 }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock/docking{ @@ -2725,8 +2707,7 @@ dir = 8 }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock/docking{ @@ -2768,8 +2749,7 @@ dir = 8 }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock/docking{ @@ -2840,7 +2820,6 @@ dir = 10 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -6 }, diff --git a/maps/away/away_site/pirate_base/pirate_base.dmm b/maps/away/away_site/pirate_base/pirate_base.dmm index e3ebaf8b24e..97e9578edb5 100644 --- a/maps/away/away_site/pirate_base/pirate_base.dmm +++ b/maps/away/away_site/pirate_base/pirate_base.dmm @@ -455,7 +455,6 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled, @@ -517,12 +516,10 @@ name = "airlock_pirate_base_maint" }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -795,7 +792,6 @@ /obj/random/dirt_75, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, @@ -997,7 +993,6 @@ /obj/effect/floor_decal/corner/lime/diagonal, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, @@ -1151,9 +1146,7 @@ /area/shuttle/pirate_shuttle/storage) "fp" = ( /obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/floodlight/randomcharge{ - dir = 2 - }, +/obj/machinery/floodlight/randomcharge, /obj/machinery/light/small/emergency{ dir = 1 }, @@ -1473,7 +1466,6 @@ /obj/item/storage/box/produce, /obj/item/storage/box/produce, /obj/machinery/button/remote/airlock{ - dir = 2; id = "pirate_base_freezer_door"; specialfunctions = 4; pixel_y = -19 @@ -1577,9 +1569,7 @@ /turf/unsimulated/floor/asteroid/ash/rocky, /area/mine) "hp" = ( -/obj/machinery/floodlight/randomcharge{ - dir = 2 - }, +/obj/machinery/floodlight/randomcharge, /turf/simulated/floor/airless/ceiling, /area/mine) "hq" = ( @@ -1703,7 +1693,6 @@ /obj/structure/bed/roller, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, @@ -1766,8 +1755,7 @@ pixel_y = -15 }, /obj/item/reagent_containers/food/drinks/waterbottle{ - pixel_x = 1; - pixel_y = 0 + pixel_x = 1 }, /obj/item/reagent_containers/food/drinks/waterbottle{ pixel_x = -9; @@ -1855,7 +1843,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/yellow, @@ -2031,8 +2018,7 @@ pixel_y = 1 }, /obj/item/clothing/suit/armor/carrier/heavy{ - pixel_x = -6; - pixel_y = 0 + pixel_x = -6 }, /obj/item/clothing/head/helmet/merc{ pixel_x = 4 @@ -2416,7 +2402,6 @@ /obj/random/dirt_75, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /obj/random/voidsuit/freebooter, @@ -2634,7 +2619,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /obj/structure/closet/crate, @@ -3106,9 +3090,7 @@ /turf/simulated/floor/tiled/full, /area/piratebase/eva) "oL" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/warning/dust, /turf/unsimulated/floor/asteroid/ash, /area/mine) "oM" = ( @@ -3186,7 +3168,6 @@ /obj/random/dirt_75, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, @@ -3256,8 +3237,7 @@ "pn" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/toilet{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/random/dirt_75, /turf/simulated/floor/tiled/white, @@ -3571,7 +3551,6 @@ }, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled, @@ -3804,7 +3783,6 @@ /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/plating, @@ -3834,7 +3812,6 @@ name = "airlock_pirate_base_main" }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -4157,7 +4134,6 @@ /obj/effect/floor_decal/corner/yellow/diagonal, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled, @@ -4672,7 +4648,6 @@ /obj/effect/decal/cleanable/spiderling_remains, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, @@ -5021,7 +4996,6 @@ /obj/item/bedsheet/black, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/yellow, @@ -5137,7 +5111,6 @@ /obj/structure/closet/crate, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, @@ -5169,9 +5142,7 @@ /turf/simulated/floor/tiled, /area/piratebase/hallway_north) "zQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/random/dirt_75, /turf/simulated/floor/plating, /area/piratebase/maint_airlock) @@ -5343,9 +5314,7 @@ /turf/unsimulated/floor/asteroid/ash/rocky, /area/mine) "AI" = ( -/obj/structure/bed/stool/padded/orange{ - dir = 2 - }, +/obj/structure/bed/stool/padded/orange, /turf/simulated/floor/carpet/red, /area/piratebase/living) "AL" = ( @@ -5525,7 +5494,6 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled, @@ -5563,7 +5531,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled, @@ -5923,7 +5890,6 @@ /obj/random/dirt_75, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, @@ -5978,7 +5944,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled, @@ -6008,17 +5973,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/piratebase/maint_south) -"Ew" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, -/obj/random/dirt_75, -/obj/effect/map_effect/marker/airlock{ - master_tag = "airlock_pirate_base_main"; - name = "airlock_pirate_base_main" - }, -/turf/simulated/floor/plating, -/area/piratebase/hallway_south) "Ex" = ( /obj/structure/bed/stool/padded/orange{ dir = 8 @@ -6477,9 +6431,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/structure/bed/stool/chair/sofa/right/red{ - dir = 2 - }, +/obj/structure/bed/stool/chair/sofa/right/red, /turf/simulated/floor/wood, /area/piratebase/living) "GM" = ( @@ -6676,9 +6628,7 @@ /turf/simulated/floor/wood, /area/piratebase/quarters) "HK" = ( -/obj/effect/floor_decal/corner/red{ - dir = 2 - }, +/obj/effect/floor_decal/corner/red, /turf/simulated/floor/tiled/dark, /area/piratebase/equipment) "HO" = ( @@ -6687,11 +6637,8 @@ /turf/simulated/floor/tiled, /area/piratebase/quarters) "HU" = ( -/obj/structure/closet/cabinet{ - pixel_y = 0 - }, +/obj/structure/closet/cabinet, /obj/item/reagent_containers/food/drinks/bottle/whitewine{ - pixel_y = 0; pixel_x = -4 }, /obj/item/reagent_containers/food/drinks/bottle/rum{ @@ -6958,7 +6905,6 @@ /area/piratebase/hallway_south) "IX" = ( /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = -21; pixel_x = -6 }, @@ -7031,7 +6977,6 @@ /obj/item/bedsheet/black, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/yellow, @@ -7662,7 +7607,6 @@ }, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled, @@ -8056,7 +8000,6 @@ }, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled, @@ -8592,7 +8535,6 @@ /obj/random/dirt_75, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, @@ -8720,8 +8662,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /turf/simulated/floor/plating, /area/piratebase/hallway_south) @@ -9003,7 +8944,6 @@ name = "airlock_pirate_base_main" }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -9268,8 +9208,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /turf/simulated/floor/plating, /area/piratebase/hallway_south) @@ -9473,7 +9412,6 @@ /obj/random/dirt_75, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /obj/item/pen/fountain/silver{ @@ -9619,7 +9557,6 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled, @@ -10174,7 +10111,6 @@ }, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/dark, @@ -45152,7 +45088,7 @@ ws Tg GG JH -Ew +Df GG GG cN diff --git a/maps/away/away_site/racers/racers.dmm b/maps/away/away_site/racers/racers.dmm index b329ed46aba..3c6020e89b7 100644 --- a/maps/away/away_site/racers/racers.dmm +++ b/maps/away/away_site/racers/racers.dmm @@ -1125,9 +1125,7 @@ /area/racers) "fnY" = ( /obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, +/obj/structure/disposalpipe/trunk, /obj/item/trash/ramen, /turf/simulated/floor/lino/diamond, /area/racers) @@ -1475,7 +1473,6 @@ /area/racers) "hiw" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor/grate, @@ -1948,7 +1945,6 @@ /area/racers) "jmo" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/item/trash/ramen, @@ -4022,9 +4018,7 @@ /area/racers) "tmd" = ( /obj/machinery/disposal/small/west, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/wood, /area/racers) "tmG" = ( @@ -4266,9 +4260,7 @@ /area/racers) "uwM" = ( /obj/machinery/disposal/small/south, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, +/obj/structure/disposalpipe/trunk, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/wood, /area/racers) diff --git a/maps/away/away_site/romanovich/grand_romanovich.dmm b/maps/away/away_site/romanovich/grand_romanovich.dmm index 4b102788a08..f53dae237b7 100644 --- a/maps/away/away_site/romanovich/grand_romanovich.dmm +++ b/maps/away/away_site/romanovich/grand_romanovich.dmm @@ -25,13 +25,6 @@ /obj/structure/closet/secure_closet/freezer/money, /turf/simulated/floor/tiled/dark, /area/grand_romanovich) -"af" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" - }, -/turf/simulated/floor/wood, -/area/grand_romanovich) "ag" = ( /obj/effect/floor_decal/corner/red{ dir = 5; @@ -54,8 +47,7 @@ "ak" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/machinery/computer/slot_machine, /turf/simulated/floor/carpet/art, @@ -70,8 +62,7 @@ "am" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/computer/slot_machine, /turf/simulated/floor/carpet/art, @@ -81,8 +72,6 @@ /area/grand_romanovich/outdoors) "ao" = ( /obj/machinery/light{ - dir = 2; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/carpet/art, @@ -108,8 +97,7 @@ "ar" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/light/small{ dir = 8 @@ -159,8 +147,7 @@ "aB" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/machinery/computer/slot_machine, /turf/simulated/floor/carpet/art, @@ -176,15 +163,13 @@ /area/grand_romanovich) "aD" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "aF" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/structure/casino/roulette_chart, /turf/simulated/floor/carpet/art, @@ -201,16 +186,13 @@ /area/grand_romanovich) "aH" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -240,8 +222,7 @@ /area/grand_romanovich) "aP" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/structure/casino/roulette, /turf/simulated/floor/carpet/art, @@ -254,8 +235,7 @@ /area/grand_romanovich) "aR" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/table/wood, /obj/item/storage/bag/money/casino, @@ -318,14 +298,12 @@ /area/grand_romanovich) "aY" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/table/wood, /obj/item/storage/box/fancy/cigarettes/cigar, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/item/flame/lighter/adhomai, /turf/simulated/floor/wood, @@ -351,8 +329,7 @@ /area/grand_romanovich) "bc" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/overmap/visitable/sector/grand_romanovich, /turf/simulated/floor/wood, @@ -368,12 +345,10 @@ "bh" = ( /obj/machinery/light{ dir = 1; - pixel_y = 0; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/machinery/vending/casino, /turf/simulated/floor/wood, @@ -388,12 +363,10 @@ "bl" = ( /obj/machinery/light{ dir = 1; - pixel_y = 0; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/machinery/vending/casino, /turf/simulated/floor/wood, @@ -410,12 +383,10 @@ /area/grand_romanovich) "bo" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/light{ dir = 4; @@ -452,13 +423,11 @@ /area/grand_romanovich) "bv" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/item/device/radio/intercom/east, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/vending/casino, /turf/simulated/floor/wood, @@ -469,21 +438,18 @@ "bx" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /obj/structure/mirror{ dir = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/tiled/freezer, /area/grand_romanovich) "by" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/machinery/light{ dir = 4; @@ -495,28 +461,22 @@ "bz" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ - dir = 8; - icon_state = "shower"; - pixel_x = 0; - pixel_y = 0 + dir = 8 }, /obj/random/soap, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/door/window/westleft, /turf/simulated/floor/tiled/freezer, /area/grand_romanovich) "bA" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/item/device/radio/intercom/east, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -542,24 +502,20 @@ /area/grand_romanovich) "bE" = ( /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /obj/machinery/vending/casino, /turf/simulated/floor/wood, /area/grand_romanovich) "bF" = ( /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/machinery/vending/casino, /turf/simulated/floor/wood, @@ -574,8 +530,7 @@ /area/grand_romanovich) "bI" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/machinery/vending/casino, /turf/simulated/floor/wood, @@ -588,8 +543,7 @@ /area/grand_romanovich) "bK" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/atm{ pixel_x = -32 @@ -607,15 +561,13 @@ dir = 4 }, /obj/structure/toilet{ - dir = 8; - icon_state = "toilet00" + dir = 8 }, /turf/simulated/floor/tiled/freezer, /area/grand_romanovich) "bN" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/computer/security/telescreen{ pixel_x = -32 @@ -625,8 +577,7 @@ /area/grand_romanovich) "bO" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/item/storage/secure/safe{ pixel_y = 32 @@ -636,8 +587,7 @@ /area/grand_romanovich) "bP" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -647,16 +597,13 @@ /area/grand_romanovich) "bQ" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/cryopod{ - dir = 4; - icon_state = "body_scanner" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -673,8 +620,7 @@ /area/grand_romanovich) "bT" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/computer/security/telescreen{ pixel_x = -32 @@ -683,8 +629,7 @@ /area/grand_romanovich) "bU" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -709,8 +654,7 @@ /area/grand_romanovich) "bY" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/messa_mead, @@ -719,8 +663,7 @@ /area/grand_romanovich) "bZ" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/machinery/vending/casino, /turf/simulated/floor/wood, @@ -728,69 +671,59 @@ "ca" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/item/reagent_containers/food/snacks/chipplate/tajcandy, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "cb" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/table/wood, /obj/item/device/flashlight/lamp, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) "cc" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/table/wood, /obj/item/device/radio/phone, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "cd" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/bed/padded, /obj/structure/curtain/open/bed, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/item/bedsheet/brown, /turf/simulated/floor/wood, /area/grand_romanovich) "ce" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/machinery/vending/casino, /turf/simulated/floor/wood, /area/grand_romanovich) "cf" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /obj/item/reagent_containers/food/snacks/chipplate/tajcandy, /turf/simulated/floor/wood, @@ -808,9 +741,7 @@ "ci" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 32 @@ -819,13 +750,11 @@ /area/grand_romanovich) "cj" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -925,8 +854,7 @@ /obj/item/target, /obj/item/target, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -937,8 +865,7 @@ }, /obj/structure/closet/crate, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/item/target, /obj/item/target, @@ -952,8 +879,7 @@ /area/grand_romanovich) "ct" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /obj/random/pottedplant, /turf/simulated/floor/wood, @@ -964,8 +890,7 @@ }, /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -976,7 +901,6 @@ "cw" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -984,12 +908,10 @@ "cx" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/button/remote/airlock{ id = "r10"; @@ -1001,8 +923,7 @@ "cy" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/computer/security/telescreen{ pixel_x = -32 @@ -1010,18 +931,9 @@ /obj/item/reagent_containers/food/snacks/chipplate/tajcandy, /turf/simulated/floor/wood, /area/grand_romanovich) -"cz" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" - }, -/obj/machinery/vending/casino, -/turf/simulated/floor/wood, -/area/grand_romanovich) "cA" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor, @@ -1030,20 +942,17 @@ /obj/structure/target_stake, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) "cC" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/button/remote/airlock{ id = "crime"; @@ -1055,12 +964,10 @@ "cD" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/button/remote/airlock{ id = "r9"; @@ -1069,17 +976,6 @@ }, /turf/simulated/floor/wood, /area/grand_romanovich) -"cE" = ( -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" - }, -/turf/simulated/floor/wood, -/area/grand_romanovich) "cF" = ( /obj/effect/floor_decal/corner/yellow/full{ dir = 1; @@ -1103,8 +999,7 @@ /obj/structure/target_stake, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -1171,7 +1066,6 @@ /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/stone/marble, /obj/machinery/appliance/mixer/cereal{ - pixel_x = 0; pixel_y = 7 }, /turf/simulated/floor/tiled/white, @@ -1179,13 +1073,11 @@ "cR" = ( /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /obj/structure/table/rack, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -1195,8 +1087,7 @@ icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -1204,7 +1095,6 @@ /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/sink/kitchen{ dir = 4; - icon_state = "sink_alt"; pixel_x = -18 }, /turf/simulated/floor/tiled/white, @@ -1224,8 +1114,7 @@ "cV" = ( /obj/structure/table/rack, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -1238,26 +1127,22 @@ /area/grand_romanovich) "cX" = ( /obj/effect/floor_decal/industrial/loading{ - dir = 1; - icon_state = "loadingarea" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) "cY" = ( /obj/effect/floor_decal/industrial/loading{ - dir = 1; - icon_state = "loadingarea" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "cZ" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 @@ -1280,20 +1165,10 @@ "dc" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) -"dd" = ( -/obj/machinery/light{ - dir = 2; - pixel_y = 0; - icon_state = "tube_empty" - }, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, -/area/grand_romanovich) "de" = ( /obj/effect/floor_decal/corner/yellow{ dir = 5; @@ -1304,8 +1179,7 @@ /area/grand_romanovich) "df" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass, @@ -1319,8 +1193,7 @@ /area/grand_romanovich) "dh" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/table/wood, /obj/machinery/light{ @@ -1331,8 +1204,7 @@ /area/grand_romanovich) "dj" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/table/wood, /obj/item/tray, @@ -1346,19 +1218,16 @@ "dl" = ( /obj/structure/bed/stool/chair/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood, /area/grand_romanovich) "dm" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -1387,8 +1256,7 @@ /area/grand_romanovich) "dq" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/vending/casino, /turf/simulated/floor/wood, @@ -1401,7 +1269,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /obj/random/pottedplant, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -1412,8 +1279,7 @@ /area/grand_romanovich) "du" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/chipplate/tajcandy, @@ -1421,8 +1287,7 @@ /area/grand_romanovich) "dv" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/structure/closet/cabinet, /turf/simulated/floor/wood, @@ -1438,7 +1303,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/item/material/kitchen/utensil/fork, @@ -1451,15 +1315,13 @@ dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) "dz" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/random/pottedplant, /turf/simulated/floor/wood, @@ -1516,7 +1378,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/item/material/kitchen/utensil/fork, @@ -1528,12 +1389,10 @@ /area/grand_romanovich) "dJ" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/light{ dir = 4; @@ -1568,7 +1427,6 @@ /obj/structure/table/stone/marble, /obj/machinery/chemical_dispenser/coffeemaster/full, /obj/structure/sign/double/barsign{ - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/lino, @@ -1583,13 +1441,11 @@ /area/grand_romanovich) "dQ" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/bed/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -1626,8 +1482,7 @@ /area/grand_romanovich) "dW" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /obj/machinery/atm{ pixel_x = -32 @@ -1648,8 +1503,7 @@ "ea" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -1659,18 +1513,10 @@ /area/grand_romanovich) "ec" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /turf/simulated/floor/wood, /area/grand_romanovich) -"ed" = ( -/obj/machinery/light{ - dir = 2; - icon_state = "tube_empty" - }, -/turf/simulated/floor/carpet/art, -/area/grand_romanovich) "ee" = ( /obj/item/chess_piece/black, /turf/simulated/floor/marble/dark, @@ -1686,9 +1532,7 @@ "eh" = ( /obj/structure/sign/directions/evac{ dir = 8; - icon_state = "direction_evac"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/wall/shuttle/raider, /area/grand_romanovich) @@ -1697,16 +1541,14 @@ pixel_x = -32 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood, /area/grand_romanovich) "ej" = ( /obj/structure/bed/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -1715,8 +1557,7 @@ pixel_x = 32 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -1726,8 +1567,7 @@ "em" = ( /obj/structure/bed/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -1742,9 +1582,7 @@ dir = 8; req_one_access = list(150) }, -/obj/item/device/radio/intercom/north{ - pixel_x = 0 - }, +/obj/item/device/radio/intercom/north, /turf/simulated/floor/lino, /area/grand_romanovich) "ep" = ( @@ -1753,8 +1591,7 @@ /area/grand_romanovich) "eq" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/structure/bed/stool/padded, /obj/effect/ghostspawpoint{ @@ -1778,20 +1615,17 @@ "et" = ( /obj/structure/bed/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/wood, /area/grand_romanovich) "eu" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/structure/bed/stool/padded, /turf/simulated/floor/carpet/art, @@ -1818,8 +1652,7 @@ /area/grand_romanovich) "eA" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/atm{ pixel_y = 32 @@ -1915,18 +1748,15 @@ /area/grand_romanovich) "eN" = ( /obj/effect/floor_decal/spline/plain{ - dir = 9; - icon_state = "spline_plain" + dir = 9 }, /turf/simulated/floor/beach/water/pool{ - name = "pool"; temperature = 303.15 }, /area/grand_romanovich) "eO" = ( /obj/effect/floor_decal/spline/plain{ - dir = 1; - icon_state = "spline_plain" + dir = 1 }, /obj/effect/decal{ anchored = 1; @@ -1937,27 +1767,22 @@ pixel_y = 14 }, /turf/simulated/floor/beach/water/pool{ - name = "pool"; temperature = 303.15 }, /area/grand_romanovich) "eP" = ( /obj/effect/floor_decal/spline/plain{ - dir = 1; - icon_state = "spline_plain" + dir = 1 }, /turf/simulated/floor/beach/water/pool{ - name = "pool"; temperature = 303.15 }, /area/grand_romanovich) "eQ" = ( /obj/effect/floor_decal/spline/plain{ - dir = 5; - icon_state = "spline_plain" + dir = 5 }, /turf/simulated/floor/beach/water/pool{ - name = "pool"; temperature = 303.15 }, /area/grand_romanovich) @@ -1969,26 +1794,16 @@ /obj/machinery/vending/casino, /turf/simulated/floor/tiled/dark, /area/grand_romanovich) -"eS" = ( -/obj/machinery/light{ - dir = 1; - pixel_y = 0; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/dark, -/area/grand_romanovich) "eT" = ( /obj/structure/bed/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/computer/security/telescreen{ pixel_x = -32 }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -2007,17 +1822,14 @@ /area/grand_romanovich/outdoors) "eV" = ( /turf/simulated/floor/beach/water/pool{ - name = "pool"; temperature = 303.15 }, /area/grand_romanovich) "eW" = ( /obj/effect/floor_decal/spline/plain{ - dir = 4; - icon_state = "spline_plain" + dir = 4 }, /turf/simulated/floor/beach/water/pool{ - name = "pool"; temperature = 303.15 }, /area/grand_romanovich) @@ -2026,16 +1838,13 @@ /area/grand_romanovich) "eY" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /obj/machinery/vending/casino, @@ -2051,23 +1860,20 @@ dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "fb" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) "fc" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/random/pottedplant, /turf/simulated/floor/wood, @@ -2078,12 +1884,10 @@ /area/grand_romanovich) "fe" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2094,30 +1898,25 @@ /area/grand_romanovich) "fg" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "fh" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) "fi" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/random/pottedplant, /turf/simulated/floor/wood, @@ -2125,12 +1924,10 @@ "fj" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/button/remote/airlock{ id = "r6"; @@ -2144,12 +1941,10 @@ pixel_x = -32 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -2163,8 +1958,7 @@ pixel_x = 32 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/light{ dir = 4; @@ -2175,7 +1969,6 @@ "fn" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/beach/water/pool{ - name = "pool"; temperature = 303.15 }, /area/grand_romanovich) @@ -2186,12 +1979,10 @@ /area/grand_romanovich) "fp" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /obj/structure/table/wood, @@ -2201,31 +1992,26 @@ "fq" = ( /obj/structure/table/wood/gamblingtable, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/item/paper_bin, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "fr" = ( /obj/effect/floor_decal/spline/plain{ - dir = 8; - icon_state = "spline_plain" + dir = 8 }, /turf/simulated/floor/beach/water/pool{ - name = "pool"; temperature = 303.15 }, /area/grand_romanovich) "fs" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/button/remote/airlock{ id = "r5"; @@ -2237,12 +2023,10 @@ "ft" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/button/remote/airlock{ id = "r4"; @@ -2298,21 +2082,17 @@ /area/grand_romanovich) "fy" = ( /obj/effect/floor_decal/spline/plain{ - dir = 10; - icon_state = "spline_plain" + dir = 10 }, /turf/simulated/floor/beach/water/pool{ - name = "pool"; temperature = 303.15 }, /area/grand_romanovich) "fz" = ( /obj/effect/floor_decal/spline/plain{ - dir = 6; - icon_state = "spline_plain" + dir = 6 }, /turf/simulated/floor/beach/water/pool{ - name = "pool"; temperature = 303.15 }, /area/grand_romanovich) @@ -2345,16 +2125,12 @@ /area/grand_romanovich) "fD" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /obj/random/pottedplant, -/obj/item/device/radio/intercom/south{ - pixel_x = 0 - }, +/obj/item/device/radio/intercom/south, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -2365,8 +2141,7 @@ /area/grand_romanovich) "fF" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/random/pottedplant, /obj/machinery/light{ @@ -2392,8 +2167,7 @@ /area/grand_romanovich) "fJ" = ( /obj/effect/floor_decal/spline/plain{ - dir = 9; - icon_state = "spline_plain" + dir = 9 }, /turf/simulated/floor/snow, /area/grand_romanovich) @@ -2404,7 +2178,6 @@ }, /obj/machinery/light{ dir = 1; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/dark, @@ -2427,12 +2200,10 @@ "fN" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/button/remote/airlock{ id = "r3"; @@ -2444,8 +2215,7 @@ "fO" = ( /obj/machinery/vending/coffee, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2461,12 +2231,10 @@ /area/grand_romanovich) "fR" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2479,27 +2247,23 @@ /area/grand_romanovich) "fT" = ( /obj/effect/floor_decal/spline/plain{ - dir = 1; - icon_state = "spline_plain" + dir = 1 }, /turf/simulated/floor/snow, /area/grand_romanovich) "fU" = ( /obj/effect/floor_decal/spline/plain{ - dir = 5; - icon_state = "spline_plain" + dir = 5 }, /turf/simulated/floor/snow, /area/grand_romanovich) "fV" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/button/remote/airlock{ id = "r2"; @@ -2513,8 +2277,7 @@ pixel_y = 32 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/item/device/radio/intercom/east, /obj/machinery/vending/casino, @@ -2530,11 +2293,9 @@ /area/grand_romanovich) "fY" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/machinery/vending/casino, @@ -2547,12 +2308,10 @@ "ga" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/button/remote/airlock{ id = "r1"; @@ -2585,8 +2344,7 @@ /area/grand_romanovich) "ge" = ( /obj/effect/floor_decal/spline/plain{ - dir = 8; - icon_state = "spline_plain" + dir = 8 }, /obj/effect/floor_decal/industrial/loading, /obj/vehicle/bike/casino, @@ -2599,8 +2357,7 @@ /area/grand_romanovich) "gg" = ( /obj/effect/floor_decal/spline/plain{ - dir = 4; - icon_state = "spline_plain" + dir = 4 }, /obj/effect/floor_decal/industrial/loading, /obj/vehicle/bike/casino, @@ -2637,15 +2394,13 @@ /area/grand_romanovich) "gk" = ( /obj/effect/floor_decal/spline/plain{ - dir = 10; - icon_state = "spline_plain" + dir = 10 }, /turf/simulated/floor/snow, /area/grand_romanovich) "gl" = ( /obj/effect/floor_decal/spline/plain{ - dir = 6; - icon_state = "spline_plain" + dir = 6 }, /turf/simulated/floor/snow, /area/grand_romanovich) @@ -2692,9 +2447,7 @@ /area/grand_romanovich) "gu" = ( /obj/effect/floor_decal/spline/fancy/wood, -/obj/item/device/radio/intercom/south{ - pixel_x = 0 - }, +/obj/item/device/radio/intercom/south, /turf/simulated/floor/wood, /area/grand_romanovich) "gv" = ( @@ -2705,11 +2458,8 @@ /area/grand_romanovich/outdoors) "gw" = ( /obj/effect/floor_decal/spline/fancy/wood, -/obj/item/device/radio/intercom/south{ - pixel_x = 0 - }, +/obj/item/device/radio/intercom/south, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -2722,8 +2472,7 @@ "gy" = ( /obj/machinery/vending/snack, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2735,8 +2484,7 @@ pixel_y = 30 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2745,8 +2493,7 @@ pixel_y = 32 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2761,8 +2508,7 @@ req_one_access = list(150) }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2771,20 +2517,17 @@ /obj/item/clothing/accessory/badge/hadii_card, /obj/item/device/versebook/pra, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/wood, /area/grand_romanovich) "gE" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/closet/secure_closet/guncabinet{ req_access = list(150) @@ -2803,8 +2546,7 @@ /obj/structure/table/wood, /obj/item/melee/classic_baton, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2814,8 +2556,7 @@ }, /obj/item/gun/projectile/pistol/adhomai, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/light{ dir = 4; @@ -2837,15 +2578,13 @@ /obj/random/pottedplant, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/wood, /area/grand_romanovich) "gP" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, @@ -2855,8 +2594,7 @@ pixel_y = 32 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2881,9 +2619,7 @@ "gV" = ( /obj/structure/table/wood, /obj/item/phone, -/obj/item/device/radio/intercom/north{ - pixel_x = 0 - }, +/obj/item/device/radio/intercom/north, /turf/simulated/floor/lino, /area/grand_romanovich) "gW" = ( @@ -2891,8 +2627,7 @@ /obj/item/melee/baton/cattleprod, /obj/item/melee/baton, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2902,15 +2637,13 @@ }, /obj/item/gun/projectile/colt/detective, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "gY" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/plating, /area/grand_romanovich) @@ -2920,27 +2653,23 @@ /area/grand_romanovich) "ha" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor, /area/grand_romanovich) "hb" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor, /area/grand_romanovich) "hd" = ( /obj/machinery/light{ dir = 1; - pixel_y = 0; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2965,8 +2694,7 @@ /obj/structure/table/wood, /obj/item/storage/wallet, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2975,8 +2703,7 @@ req_access = list(150) }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/item/gun/energy/stunrevolver, /turf/simulated/floor/wood, @@ -3016,8 +2743,7 @@ /obj/structure/table/wood, /obj/item/clothing/accessory/holster, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -3027,15 +2753,13 @@ }, /obj/item/gun/energy/blaster/revolver, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "hs" = ( /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/carpet/art, @@ -3050,12 +2774,10 @@ /obj/structure/table/wood, /obj/item/handcuffs/ziptie, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -3063,12 +2785,10 @@ "hv" = ( /obj/machinery/light{ dir = 1; - pixel_y = 0; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -3087,8 +2807,7 @@ /area/grand_romanovich) "hy" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/machinery/light{ dir = 4; @@ -3116,12 +2835,10 @@ /obj/item/reagent_containers/inhaler/space_drugs, /obj/item/reagent_containers/glass/bottle/mutagen, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -3130,7 +2847,6 @@ /obj/machinery/porta_turret/ballistic, /obj/effect/floor_decal/spline/fancy/wood/full, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -3144,8 +2860,7 @@ "hE" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -3155,8 +2870,7 @@ dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood, /obj/effect/floor_decal/spline/fancy/wood, @@ -3164,12 +2878,10 @@ /area/grand_romanovich) "hG" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -3180,8 +2892,7 @@ dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, @@ -3192,14 +2903,6 @@ /obj/item/reagent_containers/syringe/drugs, /turf/simulated/floor/wood, /area/grand_romanovich) -"hJ" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = 0; - icon_state = "tube_empty" - }, -/turf/simulated/floor/carpet/art, -/area/grand_romanovich) "hK" = ( /obj/random/pottedplant, /turf/simulated/floor/tiled/dark, @@ -3220,7 +2923,6 @@ /obj/random/pottedplant, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/carpet/art, @@ -3228,12 +2930,10 @@ "hO" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/button/remote/airlock{ id = "r8"; @@ -3263,8 +2963,7 @@ /area/grand_romanovich) "hQ" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/machinery/atm{ pixel_y = 32 @@ -3273,15 +2972,13 @@ /area/grand_romanovich) "hR" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /turf/simulated/floor, /area/grand_romanovich) "hS" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/structure/bed/stool/chair/wood, /obj/item/device/radio/intercom/north, @@ -3326,8 +3023,7 @@ /area/grand_romanovich) "ij" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/light{ dir = 4; @@ -3352,12 +3048,10 @@ "in" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/button/remote/airlock{ id = "r7"; @@ -3452,12 +3146,10 @@ /area/grand_romanovich) "iE" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -3503,19 +3195,16 @@ /area/grand_romanovich) "iK" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) "iL" = ( /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -3531,8 +3220,7 @@ "iO" = ( /obj/structure/bed/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -3544,8 +3232,7 @@ "iQ" = ( /obj/structure/bed/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -3564,24 +3251,21 @@ /obj/structure/table/wood/gamblingtable, /obj/item/deck/cards, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "iU" = ( /obj/structure/table/wood/gamblingtable, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "iV" = ( /obj/structure/table/wood/gamblingtable, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -3593,16 +3277,14 @@ dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "iX" = ( /obj/structure/table/wood/gamblingtable, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -3611,32 +3293,19 @@ /area/grand_romanovich) "jc" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/wood, /area/grand_romanovich) -"jd" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" - }, -/obj/item/device/radio/intercom/north{ - pixel_x = 0 - }, -/turf/simulated/floor/wood, -/area/grand_romanovich) "je" = ( /obj/structure/table/stone/marble, /obj/item/reagent_containers/food/snacks/tajaran_bread, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/light{ dir = 1; @@ -3656,8 +3325,7 @@ dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/bed/stool/chair/sofa/right/brown{ dir = 8 @@ -3666,8 +3334,7 @@ /area/grand_romanovich) "jh" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/random/pottedplant, /turf/simulated/floor/wood, @@ -3680,7 +3347,6 @@ "jm" = ( /obj/structure/table/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/simulated/floor/carpet/art, @@ -3690,8 +3356,7 @@ dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /obj/structure/bed/stool/chair/sofa/left/brown{ dir = 8 @@ -3700,8 +3365,7 @@ /area/grand_romanovich) "jo" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/random/pottedplant, @@ -3715,8 +3379,7 @@ /obj/structure/table/stone/marble, /obj/item/reagent_containers/food/drinks/cans/adhomai_milk, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -3726,20 +3389,8 @@ }, /turf/simulated/floor/wood, /area/grand_romanovich) -"js" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" - }, -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" - }, -/turf/simulated/floor/wood, -/area/grand_romanovich) "jt" = ( /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/simulated/floor/wood, @@ -3760,15 +3411,13 @@ "jw" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/wood, /area/grand_romanovich) "jx" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -3789,8 +3438,7 @@ dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -3799,8 +3447,7 @@ dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -3821,16 +3468,14 @@ anchored = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/wood, /area/grand_romanovich) "jJ" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, @@ -3840,23 +3485,20 @@ dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "jL" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/grand_romanovich) "jM" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/bed/stool/padded, @@ -3875,16 +3517,14 @@ "jQ" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) "jR" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -3894,8 +3534,7 @@ dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -3904,7 +3543,6 @@ /obj/effect/floor_decal/corner/lime/diagonal, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, @@ -3912,8 +3550,7 @@ "jX" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -3922,24 +3559,21 @@ dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) "jZ" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) "ka" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 @@ -3959,12 +3593,10 @@ dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/bed/stool/chair/sofa/left/brown{ dir = 4 @@ -3996,7 +3628,6 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/dark, @@ -4008,7 +3639,6 @@ /area/grand_romanovich) "km" = ( /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/dark, @@ -4019,8 +3649,7 @@ /area/grand_romanovich) "ko" = ( /obj/effect/floor_decal/spline/plain{ - dir = 8; - icon_state = "spline_plain" + dir = 8 }, /turf/simulated/floor/snow, /area/grand_romanovich) @@ -4039,8 +3668,7 @@ /area/grand_romanovich) "kr" = ( /obj/effect/floor_decal/spline/plain{ - dir = 4; - icon_state = "spline_plain" + dir = 4 }, /turf/simulated/floor/snow, /area/grand_romanovich) @@ -4059,46 +3687,38 @@ "kI" = ( /obj/machinery/light{ dir = 1; - pixel_y = 0; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) "kK" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) "kL" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "kM" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -4209,8 +3829,7 @@ /obj/structure/closet, /obj/item/reagent_containers/glass/bottle/stoxin, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/item/reagent_containers/inhaler/space_drugs, /turf/simulated/floor/wood, @@ -4242,15 +3861,13 @@ icon_state = "corner_white" }, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "lj" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -4309,18 +3926,6 @@ }, /turf/simulated/floor/tiled/dark, /area/grand_romanovich) -"lr" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = 0; - icon_state = "tube_empty" - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 9; - icon_state = "corner_white" - }, -/turf/simulated/floor/tiled/dark, -/area/grand_romanovich) "ls" = ( /obj/effect/floor_decal/corner/red{ dir = 6; @@ -4330,7 +3935,6 @@ /area/grand_romanovich) "lt" = ( /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/corner/yellow{ @@ -4376,18 +3980,6 @@ }, /turf/simulated/floor/tiled/dark, /area/grand_romanovich) -"ly" = ( -/obj/machinery/light{ - dir = 2; - pixel_y = 0; - icon_state = "tube_empty" - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 10; - icon_state = "corner_white" - }, -/turf/simulated/floor/tiled/dark, -/area/grand_romanovich) "lz" = ( /obj/effect/floor_decal/corner/yellow{ dir = 8; @@ -4422,14 +4014,6 @@ }, /turf/simulated/floor/tiled/dark, /area/grand_romanovich) -"lE" = ( -/obj/machinery/light{ - dir = 8; - pixel_y = 0; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/dark, -/area/grand_romanovich) "lF" = ( /obj/structure/closet/athletic_mixed, /turf/simulated/floor/tiled/dark, @@ -4480,9 +4064,7 @@ /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "lL" = ( -/obj/item/device/radio/intercom/north{ - pixel_x = 0 - }, +/obj/item/device/radio/intercom/north, /obj/effect/floor_decal/corner/yellow{ dir = 5; icon_state = "corner_white" @@ -4505,8 +4087,7 @@ "lP" = ( /obj/structure/bed/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/ghostspawpoint{ identifier = "casino_staff"; @@ -4543,41 +4124,28 @@ }, /turf/simulated/floor/tiled/dark, /area/grand_romanovich) -"lU" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 8; - icon_state = "spline_fancy_corner" - }, -/turf/simulated/floor/wood, -/area/grand_romanovich) "lV" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled/ramp{ - dir = 4; - icon_state = "ramptop" + dir = 4 }, /area/grand_romanovich) "lW" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled/ramp/bottom{ - dir = 4; - icon_state = "rampbot" + dir = 4 }, /area/grand_romanovich) "lX" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled/ramp/bottom{ - dir = 8; - icon_state = "rampbot" + dir = 8 }, /area/grand_romanovich) "lY" = ( @@ -4586,8 +4154,7 @@ icon_state = "corner_white_full" }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -4600,8 +4167,7 @@ icon_state = "corner_white" }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/fixed, /area/grand_romanovich) @@ -4611,8 +4177,7 @@ icon_state = "corner_white_full" }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/fixed, /area/grand_romanovich) @@ -4623,8 +4188,7 @@ icon_state = "corner_white" }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/fixed, /area/grand_romanovich) @@ -4634,8 +4198,7 @@ icon_state = "corner_white_full" }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/fixed, /area/grand_romanovich) @@ -4645,8 +4208,7 @@ icon_state = "corner_white_full" }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -4655,8 +4217,7 @@ /area/grand_romanovich) "me" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled/ramp{ dir = 8 @@ -4664,20 +4225,17 @@ /area/grand_romanovich) "mf" = ( /turf/simulated/floor/tiled/ramp{ - dir = 4; - icon_state = "ramptop" + dir = 4 }, /area/grand_romanovich) "mg" = ( /turf/simulated/floor/tiled/ramp/bottom{ - dir = 4; - icon_state = "rampbot" + dir = 4 }, /area/grand_romanovich) "mh" = ( /turf/simulated/floor/tiled/ramp/bottom{ - dir = 8; - icon_state = "rampbot" + dir = 8 }, /area/grand_romanovich) "mi" = ( @@ -4721,12 +4279,10 @@ "mo" = ( /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/ramp{ - dir = 4; - icon_state = "ramptop" + dir = 4 }, /area/grand_romanovich) "mp" = ( @@ -4875,7 +4431,6 @@ "mG" = ( /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/ramp{ @@ -4885,8 +4440,7 @@ "mH" = ( /obj/structure/window/reinforced, /turf/simulated/floor/tiled/ramp{ - dir = 4; - icon_state = "ramptop" + dir = 4 }, /area/grand_romanovich) "mI" = ( @@ -4943,15 +4497,13 @@ "mO" = ( /obj/structure/window/reinforced, /turf/simulated/floor/tiled/ramp/bottom{ - dir = 4; - icon_state = "rampbot" + dir = 4 }, /area/grand_romanovich) "mP" = ( /obj/structure/window/reinforced, /turf/simulated/floor/tiled/ramp/bottom{ - dir = 8; - icon_state = "rampbot" + dir = 8 }, /area/grand_romanovich) "mR" = ( @@ -4976,7 +4528,6 @@ /area/grand_romanovich) "mU" = ( /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood, @@ -4985,8 +4536,7 @@ "mV" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 8; - icon_state = "spline_fancy_corner" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -5107,16 +4657,14 @@ /area/grand_romanovich) "np" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/item/device/radio/intercom/east, /turf/simulated/floor/wood, /area/grand_romanovich) "nq" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -5127,8 +4675,7 @@ /area/grand_romanovich) "nt" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/structure/bed/stool/padded, /turf/simulated/floor/carpet/art, @@ -5157,7 +4704,6 @@ "ny" = ( /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /obj/effect/floor_decal/corner/yellow{ @@ -5238,7 +4784,6 @@ dir = 5 }, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/dark, @@ -5271,7 +4816,6 @@ }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/dark, @@ -5443,9 +4987,7 @@ /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "oc" = ( -/obj/item/device/radio/intercom/south{ - pixel_x = 0 - }, +/obj/item/device/radio/intercom/south, /obj/effect/floor_decal/corner/yellow{ dir = 10; icon_state = "corner_white" @@ -5463,7 +5005,6 @@ "oe" = ( /obj/structure/table/wood, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/item/reagent_containers/food/snacks/chipplate/tajcandy, @@ -5560,16 +5101,14 @@ /area/grand_romanovich) "op" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/structure/coatrack, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "os" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -5580,8 +5119,7 @@ /area/grand_romanovich) "oD" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/structure/bed/stool/padded, /turf/simulated/floor/wood, @@ -5610,14 +5148,10 @@ "oP" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ - dir = 8; - icon_state = "shower"; - pixel_x = 0; - pixel_y = 0 + dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/door/window/westleft, /turf/simulated/floor/tiled/freezer, @@ -5645,8 +5179,7 @@ /area/grand_romanovich) "pE" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/closet/cabinet, /obj/item/gun/projectile/automatic/tommygun, @@ -5665,8 +5198,7 @@ /area/grand_romanovich) "pH" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/wood, @@ -5675,15 +5207,13 @@ /obj/structure/bed/padded, /obj/item/bedsheet/brown, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "qj" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor/plating, /area/grand_romanovich) @@ -5693,15 +5223,13 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /obj/effect/floor_decal/corner/lime/diagonal, /obj/item/storage/firstaid/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /obj/structure/sign/nosmoking_1{ pixel_y = 30 }, @@ -5713,15 +5241,6 @@ temperature = 278 }, /area/grand_romanovich/outdoors) -"qr" = ( -/obj/machinery/porta_turret/ballistic, -/obj/structure/sign/flag/dpra{ - pixel_x = 0; - pixel_y = 32 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, -/area/grand_romanovich) "qt" = ( /obj/structure/closet/crate/plastic, /obj/item/clothing/gloves/yellow, @@ -5740,19 +5259,16 @@ "qE" = ( /obj/structure/bed/stool/chair/sofa/left/brown, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "qP" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/drinks/bottle/messa_mead, @@ -5821,7 +5337,6 @@ "ss" = ( /obj/structure/closet/crate/rad, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/item/storage/box/lights/mixed, @@ -5833,8 +5348,7 @@ /area/grand_romanovich) "sD" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /turf/simulated/floor/plating, /area/grand_romanovich) @@ -5871,19 +5385,16 @@ dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) "tk" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/table/wood, /turf/simulated/floor/wood, @@ -5905,12 +5416,10 @@ /area/grand_romanovich) "tS" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /obj/random/pottedplant, @@ -5935,8 +5444,7 @@ /area/grand_romanovich/outdoors) "uq" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/structure/closet/cabinet, /obj/item/gun/projectile/pistol/adhomai, @@ -5949,8 +5457,7 @@ "uA" = ( /obj/effect/decal/fake_object/light_source/invisible, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -5961,8 +5468,7 @@ dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -5979,7 +5485,6 @@ "uJ" = ( /obj/machinery/door/window/northright{ name = "dispensary"; - req_access = null; req_one_access = list(33,104) }, /obj/effect/floor_decal/corner/orange/diagonal, @@ -5988,27 +5493,16 @@ "uR" = ( /obj/effect/decal/fake_object/light_source/invisible, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood, /area/grand_romanovich) -"uW" = ( -/obj/structure/table/standard, -/obj/item/storage/box/fancy/tray{ - }, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/grand_romanovich) "uY" = ( /obj/structure/table/wood, /obj/item/storage/box/fancy/cigarettes/cigar, /obj/item/flame/lighter/adhomai, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -6023,8 +5517,7 @@ /obj/item/reagent_containers/food/drinks/bottle/messa_mead, /obj/item/reagent_containers/food/drinks/bottle/messa_mead, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -6042,12 +5535,10 @@ dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -6057,22 +5548,6 @@ temperature = 268 }, /area/grand_romanovich/outdoors) -"vS" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" - }, -/obj/machinery/light{ - dir = 8; - pixel_y = 0; - icon_state = "tube_empty" - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" - }, -/turf/simulated/floor/wood, -/area/grand_romanovich) "vV" = ( /obj/machinery/door/airlock/command{ id_tag = "suittwo"; @@ -6082,8 +5557,7 @@ /area/grand_romanovich) "wd" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/structure/bed/stool/chair/wood, /turf/simulated/floor/wood, @@ -6110,8 +5584,7 @@ dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/structure/window/reinforced, /turf/simulated/floor/carpet/art, @@ -6145,8 +5618,7 @@ /area/grand_romanovich/outdoors) "wP" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/curtain/black, /turf/simulated/floor/wood, @@ -6172,8 +5644,7 @@ /area/grand_romanovich) "xj" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/carpet/art, @@ -6196,8 +5667,7 @@ /area/grand_romanovich) "xq" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/closet/secure_closet/refrigerator/standard, /obj/item/reagent_containers/food/snacks/tajaran_bread, @@ -6210,20 +5680,17 @@ "xE" = ( /obj/structure/bed/stool/chair/sofa/brown, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "xP" = ( /obj/machinery/vending/casino, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 @@ -6234,8 +5701,7 @@ /obj/structure/bed/padded, /obj/item/bedsheet/brown, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -6255,8 +5721,7 @@ "yv" = ( /obj/machinery/light/small, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -6289,12 +5754,10 @@ /area/grand_romanovich/outdoors) "zf" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /obj/structure/filingcabinet/filingcabinet, @@ -6314,16 +5777,14 @@ /area/grand_romanovich/outdoors) "zE" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/curtain/black, /turf/simulated/floor/wood, /area/grand_romanovich) "zJ" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/structure/safe, /turf/simulated/floor/wood, @@ -6341,15 +5802,6 @@ temperature = 278 }, /area/grand_romanovich/outdoors) -"AH" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/light{ - dir = 2; - pixel_y = 0; - icon_state = "tube_empty" - }, -/turf/simulated/floor/wood, -/area/grand_romanovich) "AS" = ( /obj/structure/boulder, /turf/simulated/floor/snow{ @@ -6359,8 +5811,7 @@ "Bf" = ( /obj/structure/simple_door/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -6378,8 +5829,7 @@ /area/grand_romanovich) "Bx" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/structure/table/wood, /obj/item/storage/box/fancy/cigarettes/cigar, @@ -6387,12 +5837,10 @@ /area/grand_romanovich) "By" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -6404,8 +5852,7 @@ dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -6483,12 +5930,10 @@ "Cm" = ( /obj/structure/bed/stool/chair/sofa/brown, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -6505,8 +5950,7 @@ /area/grand_romanovich) "CO" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /mob/living/simple_animal/schlorrgo, /turf/simulated/floor/wood, @@ -6522,8 +5966,7 @@ dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -6541,15 +5984,13 @@ pixel_y = -32 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /turf/simulated/floor/wood, /area/grand_romanovich) "DP" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/filingcabinet/filingcabinet, /turf/simulated/floor/wood, @@ -6563,7 +6004,6 @@ "DX" = ( /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /obj/machinery/button/remote/airlock{ @@ -6573,30 +6013,19 @@ }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) -"Ev" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 0; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/dark, -/area/grand_romanovich) "EF" = ( /obj/structure/toilet{ - dir = 8; - icon_state = "toilet00" + dir = 8 }, /turf/simulated/floor/tiled/freezer, /area/grand_romanovich) "EM" = ( /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/machinery/vending/casino, @@ -6618,8 +6047,7 @@ "EZ" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -6680,8 +6108,7 @@ /area/grand_romanovich/outdoors) "FA" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/table/wood, /obj/item/storage/box/fancy/cigarettes/cigar, @@ -6690,16 +6117,14 @@ /area/grand_romanovich) "FO" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/light{ dir = 4; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -6710,8 +6135,7 @@ "FR" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -6726,12 +6150,10 @@ "FX" = ( /obj/structure/curtain/black, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -6755,8 +6177,7 @@ /area/grand_romanovich) "GL" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 @@ -6795,15 +6216,13 @@ dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "HK" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/bed/stool/chair/wood{ dir = 4 @@ -6839,8 +6258,7 @@ "Iw" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/atm{ pixel_y = -32 @@ -6860,8 +6278,7 @@ /area/grand_romanovich) "IJ" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/wood, @@ -6882,20 +6299,17 @@ "IY" = ( /obj/structure/closet/cabinet, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) "Jb" = ( /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -6923,8 +6337,7 @@ /area/grand_romanovich) "Jx" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/random/pottedplant, /obj/machinery/light{ @@ -6944,12 +6357,10 @@ /area/grand_romanovich) "JY" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/door/airlock/command{ id_tag = "r5"; @@ -6992,8 +6403,7 @@ /area/grand_romanovich/outdoors) "Kv" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/vending/casino, /turf/simulated/floor/wood, @@ -7012,7 +6422,6 @@ }, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, @@ -7025,8 +6434,7 @@ /obj/item/reagent_containers/food/snacks/cone_cake, /obj/item/reagent_containers/food/snacks/cone_cake, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -7067,7 +6475,6 @@ /obj/item/device/flashlight, /obj/machinery/light{ dir = 4; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/dark, @@ -7080,7 +6487,6 @@ /area/grand_romanovich) "LD" = ( /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood/cee{ @@ -7094,8 +6500,7 @@ /area/grand_romanovich) "LU" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/door/airlock/command{ @@ -7109,8 +6514,7 @@ dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -7128,8 +6532,7 @@ dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -7157,7 +6560,6 @@ }, /obj/effect/floor_decal/corner/orange/diagonal, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, @@ -7172,8 +6574,7 @@ "MG" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/light/small{ dir = 4 @@ -7185,20 +6586,17 @@ /area/grand_romanovich) "ML" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/wood, /area/grand_romanovich) "Nn" = ( /obj/structure/bed/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, @@ -7206,35 +6604,29 @@ "Np" = ( /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "NA" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/machinery/appliance/cooker/oven, /turf/simulated/floor/wood, /area/grand_romanovich) "ND" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1; - icon_state = "spline_fancy_corner" + dir = 1 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -7252,7 +6644,6 @@ /obj/effect/floor_decal/corner/orange/diagonal, /obj/machinery/door/window/eastleft{ name = "dispensary"; - req_access = null; req_one_access = list(33,104) }, /obj/item/reagent_containers/glass/beaker/large, @@ -7269,7 +6660,6 @@ "Ol" = ( /obj/machinery/light{ dir = 8; - pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/dark, @@ -7287,12 +6677,10 @@ icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -7301,12 +6689,10 @@ /area/grand_romanovich) "OH" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /obj/machinery/vending/casino, /obj/machinery/atm{ @@ -7316,8 +6702,7 @@ /area/grand_romanovich) "Pa" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/structure/closet/cabinet, /obj/item/gun/projectile/automatic/x9, @@ -7340,15 +6725,13 @@ "Pu" = ( /obj/structure/bed/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "Pv" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/machinery/computer/security/telescreen{ pixel_x = -32 @@ -7382,8 +6765,7 @@ "Qw" = ( /obj/effect/decal/fake_object/light_source/invisible, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -7430,8 +6812,7 @@ /area/grand_romanovich) "Rf" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/light{ dir = 4; @@ -7464,8 +6845,7 @@ /area/grand_romanovich/outdoors) "Ry" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 @@ -7479,8 +6859,7 @@ /area/grand_romanovich) "RK" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/machinery/atm{ pixel_y = 32 @@ -7497,8 +6876,7 @@ "Sg" = ( /obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -7581,8 +6959,7 @@ /area/grand_romanovich) "Tu" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -7608,7 +6985,6 @@ /obj/effect/floor_decal/corner/orange/diagonal, /obj/machinery/door/window/eastright{ name = "dispensary"; - req_access = null; req_one_access = list(33,104) }, /obj/item/reagent_containers/dropper, @@ -7631,12 +7007,10 @@ /area/grand_romanovich/outdoors) "Uq" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/machinery/light{ dir = 8; - pixel_y = 0; icon_state = "tube_empty" }, /obj/structure/table/wood, @@ -7672,15 +7046,13 @@ dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4; - icon_state = "spline_fancy_corner" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "UU" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/table/wood, /obj/item/flame/lighter/adhomai, @@ -7718,12 +7090,10 @@ "Vn" = ( /obj/structure/curtain/black, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -7742,8 +7112,7 @@ /area/grand_romanovich) "Vv" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/item/storage/secure/safe{ pixel_y = 32 @@ -7752,8 +7121,7 @@ /obj/machinery/button/remote/blast_door{ id = "lockdown"; name = "casino lockdown"; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -7774,8 +7142,7 @@ /area/grand_romanovich) "VE" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/structure/filingcabinet/filingcabinet, /turf/simulated/floor/wood, @@ -7784,16 +7151,14 @@ /obj/structure/table/wood, /obj/item/device/flashlight/lamp, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /turf/simulated/floor/wood, /area/grand_romanovich) "VW" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/machinery/light/small{ dir = 1 @@ -7850,8 +7215,7 @@ "Wz" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) @@ -7871,9 +7235,7 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/unsimulated/floor{ icon_state = "white" @@ -7891,12 +7253,10 @@ /area/grand_romanovich/outdoors) "Xy" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/machinery/light{ dir = 4; @@ -7918,8 +7278,7 @@ icon_state = "tube_empty" }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1; - icon_state = "spline_fancy" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, @@ -7927,8 +7286,7 @@ "XN" = ( /obj/structure/closet/cabinet, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -7937,8 +7295,7 @@ dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /obj/structure/window/reinforced, /turf/simulated/floor/carpet/art, @@ -7946,12 +7303,10 @@ "XR" = ( /obj/structure/curtain/black, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -7968,8 +7323,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/freezer, @@ -7992,8 +7346,7 @@ /area/grand_romanovich) "Ya" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 @@ -8017,8 +7370,7 @@ "Ym" = ( /obj/effect/decal/fake_object/light_source/invisible, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -8031,8 +7383,7 @@ /area/grand_romanovich/outdoors) "YJ" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/machinery/turretid{ locked = 0; @@ -8046,8 +7397,7 @@ /area/grand_romanovich) "Zb" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /obj/structure/table/wood, /obj/item/storage/secure/briefcase/money, @@ -8074,8 +7424,7 @@ /area/grand_romanovich) "Zz" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /obj/structure/closet/cabinet, /obj/item/gun/projectile/revolver, @@ -8092,7 +7441,6 @@ "ZM" = ( /obj/machinery/optable, /obj/machinery/light{ - dir = 2; icon_state = "tube_empty" }, /turf/unsimulated/floor{ @@ -8109,8 +7457,7 @@ /area/grand_romanovich) "ZY" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -18584,7 +17931,7 @@ lB nC nC nC -lr +ny nC nC nC @@ -19292,7 +18639,7 @@ gP lO lO TV -af +hx ja yr yr @@ -19549,7 +18896,7 @@ jJ lO lO WO -af +hx Ix db db @@ -19580,7 +18927,7 @@ lO cu eJ lO -ed +ao XU dv jc @@ -19593,7 +18940,7 @@ lO cu fw lO -ed +ao XU IP OF @@ -19609,7 +18956,7 @@ lO cu gi lO -ed +ao XU OF IP @@ -19806,7 +19153,7 @@ xn lO lO WO -af +hx Ix db db @@ -20063,7 +19410,7 @@ jL lO lO WO -af +hx Ix sr db @@ -20320,14 +19667,14 @@ gP lO lO Ml -af +hx ja Md Md fE jx dI -af +hx Ll dI kZ @@ -21328,7 +20675,7 @@ iE lO lO lO -af +hx Mo XU lO @@ -21379,7 +20726,7 @@ lO cu eM lO -ed +ao XU dv jc @@ -21392,7 +20739,7 @@ lO cu fx lO -ed +ao XU OF OF @@ -21408,7 +20755,7 @@ lO cu hA lO -ed +ao XU OF IP @@ -21585,7 +20932,7 @@ Jh lO lO lO -af +hx JI XU lO @@ -21613,7 +20960,7 @@ kZ kZ XU lO -ed +ao XU kZ kZ @@ -21843,7 +21190,7 @@ Si lO aK bc -AH +cw XU lO lO @@ -22099,7 +21446,7 @@ Gg lO lO lO -af +hx JI XU aK @@ -22356,7 +21703,7 @@ ML lO lO lO -af +hx TA sL lO @@ -24206,7 +23553,7 @@ lO cu fu lO -ed +ao XU dv jc @@ -24219,7 +23566,7 @@ lO cu gc lO -ed +ao XU OF IP @@ -24235,7 +23582,7 @@ lO cu iS lO -ed +ao XU OF OF @@ -24440,7 +23787,7 @@ kZ kZ XU lO -ed +ao XU kZ kZ @@ -25165,7 +24512,7 @@ lS lS iC XU -qr +Og lS kN lO @@ -25686,17 +25033,17 @@ lO lO lO lS -Ev +iA lS ah lS lS -Ev +iA lS ah lS lS -Ev +iA lS ah XU @@ -25974,7 +25321,7 @@ kZ kZ kZ XU -af +hx Md Md ja @@ -26005,7 +25352,7 @@ lO cu fv lO -ed +ao XU dv jc @@ -26018,7 +25365,7 @@ lO cu gh lO -ed +ao XU OF OF @@ -26034,7 +25381,7 @@ lO cu kh lO -ed +ao XU IP OF @@ -26231,7 +25578,7 @@ aI aI aI XU -af +hx ja fE aD @@ -26454,7 +25801,7 @@ XU XU XU lS -Ev +iA lS lS XU @@ -27303,7 +26650,7 @@ XU cg XU gr -ed +ao XU IP ik @@ -27773,7 +27120,7 @@ aI aI aI XU -af +hx ja JI XU @@ -27783,7 +27130,7 @@ lO lO lO lO -af +hx cw XU OF @@ -27844,7 +27191,7 @@ fq iV eZ aI -af +hx ak iO ja @@ -27872,7 +27219,7 @@ kZ aI sH lO -ed +ao aI kZ kZ @@ -28101,7 +27448,7 @@ iT aQ eZ aI -af +hx am iP ja @@ -28335,7 +27682,7 @@ jI fR fR fR -vS +kL iB XU ec @@ -28358,7 +27705,7 @@ iU iX eZ aI -af +hx am iP ja @@ -28605,7 +27952,7 @@ lO lO lO lO -af +hx ep ep ja @@ -28615,7 +27962,7 @@ ep ep JI aI -af +hx am iP ja @@ -28840,7 +28187,7 @@ il IP OF ki -af +hx ja ja ja @@ -28862,7 +28209,7 @@ lO lO lO lO -af +hx ep ep ja @@ -28872,7 +28219,7 @@ ep ep JI aI -af +hx am iP ja @@ -29129,7 +28476,7 @@ fq iV eZ aI -af +hx am iP ja @@ -29366,7 +28713,7 @@ jQ fd jm XU -js +EN ak iO ja @@ -29386,7 +28733,7 @@ iT aQ eZ aI -af +hx am iP ja @@ -29623,7 +28970,7 @@ jY jg jn XU -af +hx am iP ja @@ -29643,7 +28990,7 @@ iU iX eZ aI -cz +MF aB iQ ja @@ -29880,7 +29227,7 @@ jZ kc kp XU -af +hx am iP ja @@ -29928,7 +29275,7 @@ XU hL sH lO -ed +ao XU aI aI @@ -30137,7 +29484,7 @@ jQ fd jm cg -js +EN am iP ja @@ -30394,7 +29741,7 @@ jY jg jn XU -af +hx am iP ja @@ -30429,7 +29776,7 @@ lO lO lO lO -ed +ao XU aK lO @@ -30620,7 +29967,7 @@ XU XD lO lO -af +hx Fv Fv Fv @@ -30651,7 +29998,7 @@ jZ kc kp XU -af +hx am iP ja @@ -30663,7 +30010,7 @@ lO lO lO lO -hJ +hs lO lO lO @@ -30671,7 +30018,7 @@ lO lO lO lO -hJ +hs lO lO lO @@ -30877,7 +30224,7 @@ CJ gP lO lO -af +hx Fv Fv Fv @@ -30908,7 +30255,7 @@ jQ fd jm XU -af +hx am iP ja @@ -31134,7 +30481,7 @@ CJ gP lO lO -af +hx Fv Fv Fv @@ -31165,7 +30512,7 @@ jY jg jn XU -js +EN ca kY jt @@ -31175,7 +30522,7 @@ kY JI lO lO -af +hx eu nq ja @@ -31185,7 +30532,7 @@ eu nq JI aI -cz +MF ak iO ja @@ -31207,7 +30554,7 @@ gV ht ht kx -af +hx ja JI XU @@ -31391,7 +30738,7 @@ CJ gP lO lO -af +hx Fv Fv zX @@ -31422,7 +30769,7 @@ jZ kc kp XU -af +hx am iP ja @@ -31432,7 +30779,7 @@ iP JI lO lO -af +hx aF ns ja @@ -31442,7 +30789,7 @@ aF ns JI aI -af +hx am iP ja @@ -31464,7 +30811,7 @@ hf dB dB dB -af +hx ja fP XU @@ -31648,7 +30995,7 @@ XU XD lO lO -af +hx Fv Fv Fv @@ -31679,7 +31026,7 @@ jQ fd jm cg -af +hx am iP ja @@ -31699,7 +31046,7 @@ aP nt JI aI -af +hx am iP ja @@ -31905,7 +31252,7 @@ CJ gP lO lO -af +hx Fv Fv Fv @@ -31936,7 +31283,7 @@ jY jg jn XU -af +hx am iP ja @@ -31946,7 +31293,7 @@ iP JI lO lO -af +hx ja ja ja @@ -31956,7 +31303,7 @@ ja ja JI aI -af +hx am iP ja @@ -32162,7 +31509,7 @@ CJ gP lO lO -af +hx Fv Fv Fv @@ -32193,7 +31540,7 @@ jZ kc kp XU -js +EN am iP ja @@ -32203,7 +31550,7 @@ iP JI lO lO -af +hx ja ja ja @@ -32213,7 +31560,7 @@ ja ja JI aI -af +hx am iP ja @@ -32450,7 +31797,7 @@ jQ fd jm XU -af +hx am iP ja @@ -32460,7 +31807,7 @@ iP JI lO lO -af +hx eu nq ja @@ -32470,7 +31817,7 @@ eu nq JI aI -af +hx am iP ja @@ -32707,7 +32054,7 @@ ka jg jn XU -af +hx am iP ja @@ -32717,7 +32064,7 @@ iP JI lO lO -af +hx aF ns ja @@ -32727,7 +32074,7 @@ aF ns JI aI -af +hx am iP ja @@ -32964,7 +32311,7 @@ Iw XU XU XU -af +hx aB iQ ja @@ -32984,7 +32331,7 @@ aP nt JI aI -af +hx aB iQ ja @@ -33787,7 +33134,7 @@ kZ kZ kZ XU -uW +FZ Sy WY Ww @@ -33988,7 +33335,7 @@ lO jQ lO lO -af +hx JI XU nc @@ -34245,7 +33592,7 @@ hn jQ lO lO -af +hx dn ac nc @@ -34502,7 +33849,7 @@ hn jQ lO lO -af +hx do ac nc @@ -34759,7 +34106,7 @@ lO jQ lO lO -af +hx dp ac nc @@ -35016,7 +34363,7 @@ lO jQ lO lO -af +hx ds XU nc @@ -35273,7 +34620,7 @@ hn jQ lO lO -af +hx JI XU nc @@ -35530,7 +34877,7 @@ hn jQ lO lO -af +hx JI jv nc @@ -35787,7 +35134,7 @@ lO jQ lO lO -af +hx JI jv nc @@ -36044,7 +35391,7 @@ kK ea lO lO -af +hx JI XU nc @@ -36291,7 +35638,7 @@ XU iJ XU XU -jd +Pp ja ja ja @@ -36301,7 +35648,7 @@ jB jR lO lO -af +hx dw ac nc @@ -36558,7 +35905,7 @@ fd jS lO lO -af +hx dx ac nc @@ -36571,7 +35918,7 @@ XU kZ XU lC -lE +Ol lS lG nc @@ -36805,7 +36152,7 @@ dL dL dL iD -af +hx ja yT ja @@ -36815,7 +36162,7 @@ pD jS lO lO -af +hx dp ac nc @@ -37062,7 +36409,7 @@ dL dL dL iG -af +hx ja jp ja @@ -37072,7 +36419,7 @@ fd jS lO lO -af +hx JI XU nc @@ -37329,7 +36676,7 @@ jC ea lO lO -af +hx JI XU nc @@ -37576,7 +36923,7 @@ dL dL dV XU -js +EN ja jp ja @@ -37586,7 +36933,7 @@ ja JI lO lO -af +hx dF XU nc @@ -37843,7 +37190,7 @@ jB jR lO lO -af +hx dw ac nc @@ -38093,14 +37440,14 @@ XU XU XU XU -af +hx jy fd fd jS lO lO -af +hx dx ac nc @@ -38350,14 +37697,14 @@ kZ kZ kZ XU -js +EN jy pD fd jS lO lO -af +hx dG ac nc @@ -38607,14 +37954,14 @@ kZ kZ kZ XU -af +hx jy fd fd jS lO lO -af +hx dF XU nc @@ -38864,14 +38211,14 @@ XU XU XU XU -af +hx dA jC jC ea lO lO -af +hx JI XU nc @@ -39121,14 +38468,14 @@ OF OF OF ki -af +hx ja ja ja JI lO lO -af +hx dw ac nc @@ -39385,7 +38732,7 @@ aK JI lO lO -af +hx dH ac nc @@ -39411,7 +38758,7 @@ OF OF ki nc -lE +Ol lh XU iv @@ -39635,14 +38982,14 @@ XU XU OF XU -af +hx ja ja ja JI lO lO -af +hx dG ac nc @@ -40909,7 +40256,7 @@ kZ kZ kZ XU -af +hx ja ja ja @@ -40954,7 +40301,7 @@ kZ XU ln lS -ly +lt XU kZ kZ @@ -41173,7 +40520,7 @@ ja cX db ja -dd +mU XU kZ XU @@ -41423,7 +40770,7 @@ kZ kZ kZ XU -cE +kI ja ja ja @@ -41687,7 +41034,7 @@ ja cX db ja -dd +mU XU kZ aI @@ -41937,7 +41284,7 @@ kZ kZ kZ XU -cE +kI ja ja ja @@ -42215,25 +41562,25 @@ kZ aI fI nC -lr +ny nC nC nC nC nC -lr +ny nC nC nC nC nC -lr +ny nC nC nC nC nC -lr +ny nC nC dP @@ -42243,17 +41590,17 @@ lh ah fI nC -lr +ny nC nC nC nC nC -lr +ny nC nC nC -lr +ny qY aI kZ @@ -42451,7 +41798,7 @@ kZ kZ kZ XU -af +hx ja ja ja @@ -43282,7 +42629,7 @@ kq kq fZ al -ly +lt aI kZ kZ @@ -45047,7 +44394,7 @@ kq kq fZ al -ly +lt aI kZ kZ @@ -45338,7 +44685,7 @@ kq kq fZ al -ly +lt aI kZ kZ @@ -46300,7 +45647,7 @@ kZ kZ kZ aI -af +hx JI lW mg @@ -46312,7 +45659,7 @@ mg mg mg mO -af +hx JI aI kZ @@ -46557,8 +45904,8 @@ kZ kZ kZ aI -af -lU +hx +dA kK kK kK @@ -47071,7 +46418,7 @@ kZ kZ kZ XU -af +hx ja lZ mj @@ -47328,7 +46675,7 @@ kZ kZ kZ aI -af +hx ja ma mk @@ -47360,7 +46707,7 @@ kq kq fZ al -ly +lt aI kZ kZ @@ -47394,7 +46741,7 @@ kq kq fZ al -ly +lt ac kZ kZ @@ -47585,7 +46932,7 @@ kZ kZ kZ aI -af +hx aK mb mj @@ -47842,7 +47189,7 @@ kZ kZ kZ aI -af +hx ja mc ml @@ -48099,7 +47446,7 @@ kZ kZ kZ XU -af +hx ja lZ mj @@ -48613,7 +47960,7 @@ kZ kZ kZ aI -af +hx fE aD aD @@ -48870,7 +48217,7 @@ kZ kZ kZ aI -af +hx JI lX mh @@ -48882,7 +48229,7 @@ mh mh mh mP -af +hx JI aI kZ @@ -49450,7 +48797,7 @@ kq kq fZ al -ly +lt ac kZ kZ @@ -49673,7 +49020,7 @@ kq kq fZ al -ly +lt aI kZ kZ @@ -51506,7 +50853,7 @@ kq kq fZ al -ly +lt ac kZ kZ @@ -51986,7 +51333,7 @@ kq kq fZ al -ly +lt aI kZ kZ @@ -52213,7 +51560,7 @@ kZ kZ kZ aI -af +hx JI lW mg @@ -52223,7 +51570,7 @@ mg mg mg mO -af +hx JI aI kZ @@ -52470,8 +51817,8 @@ kZ kZ kZ aI -af -lU +hx +dA kK kK kK @@ -52984,7 +52331,7 @@ kZ kZ kZ XU -af +hx ja aw eg @@ -53241,7 +52588,7 @@ kZ kZ kZ aI -af +hx ja cv ee @@ -53498,7 +52845,7 @@ kZ kZ kZ aI -af +hx ja dg eg @@ -53562,7 +52909,7 @@ kq kq fZ al -ly +lt ac kZ kZ @@ -53755,7 +53102,7 @@ kZ kZ kZ aI -af +hx ja dk ee @@ -54012,7 +53359,7 @@ kZ kZ kZ aI -af +hx ja dr eg @@ -54269,7 +53616,7 @@ kZ kZ kZ XU -af +hx ja dt ee @@ -54299,7 +53646,7 @@ kq kq fZ al -ly +lt aI kZ kZ @@ -54783,7 +54130,7 @@ kZ kZ kZ aI -af +hx fE aD aD @@ -55040,7 +54387,7 @@ kZ kZ kZ aI -af +hx JI lX mh @@ -55050,7 +54397,7 @@ mh mh mh mP -af +hx JI aI kZ @@ -55071,31 +54418,31 @@ kq fZ al lz -lr +ny nC nC nC nC nC -lr +ny nC nC nC nC nC -lr +ny nC nC nC nC nC -lr +ny nC nC nC nC nC -lr +ny nC gn iy @@ -55618,7 +54965,7 @@ kq kq fZ al -ly +lt ac kZ kZ @@ -56646,7 +55993,7 @@ kr kr gl al -ly +lt ac kZ kZ @@ -58126,7 +57473,7 @@ XU XU XU XU -eS +lR lS hx lS @@ -60188,7 +59535,7 @@ hx lS lS lS -lE +Ol lS lS mV @@ -61210,7 +60557,7 @@ XU XU XU XU -eS +lR lS hx lS diff --git a/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint.dmm b/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint.dmm index b8047a33b83..fdab6bc5dc8 100644 --- a/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint.dmm +++ b/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint.dmm @@ -663,8 +663,7 @@ /area/hegemony_waypoint/monitoring) "mD" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /obj/item/hullbeacon/green, /turf/simulated/floor/reinforced/airless, @@ -1429,7 +1428,6 @@ /area/hegemony_waypoint/engineering) "Bs" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 26; pixel_x = 5 }, @@ -1510,7 +1508,6 @@ dir = 4 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 26; pixel_x = 5 }, @@ -2014,8 +2011,7 @@ /area/hegemony_waypoint/hydroponics) "KX" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/reinforced/airless, /area/hegemony_waypoint/monitoring) @@ -2534,8 +2530,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/random/dirt_75, @@ -2756,7 +2751,6 @@ }, /obj/machinery/light/small, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 26; pixel_x = 5 }, diff --git a/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm b/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm index f5181ddfb88..33222768e0e 100644 --- a/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm +++ b/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm @@ -465,8 +465,7 @@ /area/hegemony_waypoint/eva) "lA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -2671,8 +2670,7 @@ /area/hegemony_waypoint/hydroponics) "Pv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -2805,8 +2803,7 @@ /area/hegemony_waypoint/atmos) "RQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 diff --git a/maps/away/away_site/sol_bunker/bunker.dmm b/maps/away/away_site/sol_bunker/bunker.dmm index 890ea93988b..79a5fd102da 100644 --- a/maps/away/away_site/sol_bunker/bunker.dmm +++ b/maps/away/away_site/sol_bunker/bunker.dmm @@ -1,28 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/obj/machinery/door/airlock/centcom{ - opacity = 1; - dir = 1 - }, -/turf/simulated/floor/wood, -/area/derelict) "ab" = ( /obj/machinery/door/airlock/centcom{ - opacity = 1; - dir = 1 - }, -/turf/simulated/floor/wood, -/area/derelict) -"ac" = ( -/obj/machinery/door/airlock/centcom{ - opacity = 1; - dir = 1 - }, -/turf/simulated/floor/wood, -/area/derelict) -"ad" = ( -/obj/machinery/door/airlock/centcom{ - opacity = 1; dir = 1 }, /turf/simulated/floor/wood, @@ -162,7 +140,6 @@ /area/derelict) "hS" = ( /obj/machinery/door/airlock/centcom{ - opacity = 1; dir = 4 }, /turf/simulated/floor/wood, @@ -34166,7 +34143,7 @@ ML gd Mf gd -aa +ab Fn li fJ @@ -34423,14 +34400,14 @@ ML Mf gd Mf -ac +ab li Xd fJ fJ TN Xd -ad +ab gd sJ gd diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm index 3fec0fe15eb..7349b89b3dd 100644 --- a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm +++ b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm @@ -583,8 +583,7 @@ /area/shuttle/mining_jack/engines) "hl" = ( /obj/machinery/power/terminal{ - dir = 8; - icon_state = "term" + dir = 8 }, /obj/structure/cable/green{ d2 = 4; @@ -762,8 +761,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ d1 = 4; @@ -794,8 +792,7 @@ /area/mining_jack_outpost/smelter) "kR" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ d2 = 2; @@ -980,8 +977,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -1110,8 +1106,7 @@ "pQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -1232,7 +1227,6 @@ /area/shuttle/mining_jack/engines) "sJ" = ( /obj/machinery/computer/ship/helm{ - req_access = null; dir = 1 }, /turf/simulated/floor/tiled/rust{ @@ -1310,8 +1304,7 @@ /area/mining_jack_outpost/quarters) "ug" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -1772,8 +1765,7 @@ /obj/machinery/button/remote/blast_door{ id = "mining_jack_bridge"; name = "Bridge Shutters"; - req_access = list(202); - req_one_access = null + req_access = list(202) }, /obj/machinery/light/small{ dir = 4 @@ -1809,8 +1801,7 @@ /area/shuttle/mining_jack/engines) "Du" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -2165,7 +2156,6 @@ /area/mining_jack_outpost/hangar) "LK" = ( /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -2209,8 +2199,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ d1 = 2; @@ -2435,7 +2424,6 @@ "SQ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -2491,8 +2479,7 @@ /area/shuttle/mining_jack/bridge) "UJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -2623,7 +2610,6 @@ /area/mining_jack_outpost/smelter) "Xq" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -2707,7 +2693,6 @@ "YK" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm index 85ae84e0e46..4ef1d9cfd42 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm @@ -23,8 +23,7 @@ /area/peoples_station/training) "ai" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/tank, /turf/simulated/floor/plating{ @@ -225,7 +224,6 @@ "be" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -277,8 +275,7 @@ dir = 1 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/fore, @@ -425,7 +422,6 @@ /area/peoples_station/mess_hall) "bH" = ( /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -866,8 +862,7 @@ /area/peoples_station/robotics_bay) "dv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -1015,8 +1010,7 @@ /area/peoples_station/fang) "dP" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -1127,8 +1121,7 @@ /area/peoples_station/solars) "en" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -1287,8 +1280,7 @@ /area/peoples_station/transport_hangar) "eQ" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/effect/floor_decal/corner_wide/red/full{ dir = 6 @@ -1526,8 +1518,7 @@ /area/peoples_station/atmos) "fx" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -2010,9 +2001,7 @@ }, /area/peoples_station/barracks) "hc" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/storage/box/produce{ pixel_x = 3; pixel_y = -11 @@ -2045,8 +2034,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -2137,8 +2125,7 @@ /area/peoples_station) "hx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -4311,8 +4298,7 @@ /area/peoples_station) "px" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -4706,8 +4692,7 @@ /area/peoples_station) "ra" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -4849,8 +4834,7 @@ /area/peoples_station/robotics_bay) "rF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -4863,14 +4847,6 @@ temperature = 278.15 }, /area/peoples_station/ammo_storage) -"rH" = ( -/obj/structure/ship_weapon_dummy, -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" - }, -/turf/simulated/floor/reinforced/airless, -/area/peoples_station/defenses) "rJ" = ( /obj/structure/cable/green{ d2 = 2; @@ -5567,8 +5543,7 @@ /area/peoples_station/medbay) "um" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -5662,7 +5637,6 @@ }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 4; - pixel_y = 0; pixel_x = -20 }, /obj/machinery/airlock_sensor{ @@ -5866,7 +5840,6 @@ /area/peoples_station/visitor) "vt" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -6007,8 +5980,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -6050,8 +6022,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/peoples_station/ammo_storage) @@ -6406,8 +6377,7 @@ /area/peoples_station/medbay) "xB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable/green{ d1 = 4; @@ -6879,8 +6849,7 @@ /area/peoples_station) "zr" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/effect/floor_decal/corner/red{ dir = 5 @@ -6974,8 +6943,7 @@ /area/peoples_station/atmos) "zU" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/shower{ dir = 8; @@ -7027,8 +6995,7 @@ /area/peoples_station/fang) "zY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -7276,8 +7243,7 @@ /area/peoples_station/visitor) "Bi" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/shower{ dir = 4 @@ -7719,8 +7685,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -7737,8 +7702,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -9000,10 +8964,6 @@ "HB" = ( /turf/simulated/wall/shuttle/raider, /area/peoples_station/training) -"HD" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating/cooled, -/area/peoples_station/transport_hangar) "HE" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -9114,15 +9074,6 @@ temperature = 278.15 }, /area/peoples_station/transport_hangar) -"Ig" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/peoples_station/fang) "Ih" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 4 @@ -9236,8 +9187,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -9696,8 +9646,7 @@ "KI" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/visible/red, /turf/simulated/floor/plating{ @@ -10000,7 +9949,6 @@ /area/peoples_station/transport_hangar) "LP" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -10060,8 +10008,7 @@ /area/peoples_station) "Mc" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/effect/floor_decal/corner_wide/black/full{ dir = 6 @@ -10134,8 +10081,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/item/ship_ammunition/francisca/frag, /obj/item/ship_ammunition/francisca/frag, @@ -10154,8 +10100,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/effect/floor_decal/corner_wide/red/full{ dir = 6 @@ -10273,8 +10218,7 @@ weapon_id = "Fang Rotary Gun" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -10703,8 +10647,7 @@ /area/peoples_station/armory) "ON" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -10789,8 +10732,7 @@ /area/peoples_station) "OZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/wall/shuttle/raider, /area/shuttle/peoples_station_transport) @@ -10900,8 +10842,7 @@ /area/peoples_station/atmos) "Pt" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/door/window{ dir = 8; @@ -11728,8 +11669,7 @@ /area/peoples_station/mess_hall) "SK" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/red, /turf/simulated/floor/plating{ @@ -12569,8 +12509,7 @@ /obj/structure/table/steel, /obj/machinery/door/window/brigdoor/westright, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -12825,8 +12764,7 @@ req_access = "peoples_station_fang" }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/plating{ @@ -13345,8 +13283,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/aux, @@ -13365,8 +13302,7 @@ /area/peoples_station/bridge) "YW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -13569,8 +13505,7 @@ /area/peoples_station/mess_hall) "ZH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm/west, @@ -40301,8 +40236,8 @@ mN Uy aQ Pg -rH -rH +Pg +Pg EC Kn Kn @@ -42099,9 +42034,9 @@ QX uD Uy fE -rH -rH -rH +Pg +Pg +Pg EC Kn Kn @@ -45205,7 +45140,7 @@ vM AB AB xE -Ig +FA NU eu WF @@ -59311,7 +59246,7 @@ zw UO Go qI -HD +uu ll ec Cu diff --git a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm index ca8bc7a6918..644c4d283f2 100644 --- a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm +++ b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm @@ -99,8 +99,7 @@ /area/pra_satellite) "aR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -468,8 +467,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -529,8 +527,7 @@ /area/pra_satellite) "hD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -1063,8 +1060,7 @@ /area/pra_satellite) "tJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -1097,8 +1093,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -1187,8 +1182,7 @@ /area/space) "wj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor{ temperature = 278.15 @@ -2043,8 +2037,7 @@ }, /obj/machinery/light, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor{ temperature = 278.15 @@ -2062,8 +2055,7 @@ /area/pra_satellite) "Yt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/effect/floor_decal/corner/red{ dir = 8 diff --git a/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm b/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm index 64b0d696e2e..350daaeadbc 100644 --- a/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm +++ b/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm @@ -8,14 +8,6 @@ temperature = 278.15 }, /area/saniorios_outpost/medbay) -"at" = ( -/obj/structure/ship_weapon_dummy, -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" - }, -/turf/simulated/floor/reinforced/airless, -/area/saniorios_outpost/gun) "au" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -104,7 +96,6 @@ "cc" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 8; - frequency = 1441; id_tag = "saniorios_co2_out" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -185,8 +176,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/plating/cooled, /area/saniorios_outpost) @@ -751,12 +741,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -950,12 +938,10 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/table/rack, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -1264,8 +1250,7 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/table/rack, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -1285,8 +1270,7 @@ /obj/machinery/pipedispenser/disposal, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/plating/cooled, /area/saniorios_outpost/atmos) @@ -1407,8 +1391,7 @@ "sq" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, @@ -1636,8 +1619,7 @@ /area/saniorios_outpost/hangar) "wf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -1822,8 +1804,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -2119,8 +2100,7 @@ /area/saniorios_outpost/atmos) "DM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/plating/cooled, /area/saniorios_outpost/hangar) @@ -2371,8 +2351,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ icon_state = "2-4" @@ -3231,8 +3210,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /turf/simulated/floor/plating/cooled, /area/saniorios_outpost/atmos) @@ -22862,8 +22840,8 @@ SL lz Fs UK -at -at +UK +UK ix Kn Kn diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dmm b/maps/away/away_site/tajara/scrapper/scrapper.dmm index c452b41a414..f2f02be6c52 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper.dmm +++ b/maps/away/away_site/tajara/scrapper/scrapper.dmm @@ -279,8 +279,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -394,9 +393,7 @@ }, /area/shuttle/scrapper_ship/workshop) "er" = ( -/obj/machinery/vending/tool{ - req_access = null - }, +/obj/machinery/vending/tool, /obj/structure/window/reinforced{ dir = 1 }, @@ -424,8 +421,7 @@ /obj/machinery/button/remote/blast_door{ id = "scrapper_bridge"; name = "Bridge Shutters"; - req_access = list(202); - req_one_access = null + req_access = list(202) }, /obj/effect/floor_decal/corner/beige{ dir = 10 @@ -492,8 +488,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -930,8 +925,7 @@ "la" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/visible/red, /turf/simulated/floor/plating{ @@ -1260,8 +1254,7 @@ /area/scrapper_base/quarters) "ov" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/cable/green{ d1 = 1; @@ -1520,8 +1513,7 @@ "sr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -1744,8 +1736,7 @@ /area/scrapper_base/quarters) "us" = ( /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/lattice/catwalk, /turf/template_noop, @@ -1861,8 +1852,7 @@ /area/shuttle/scrapper_ship/bridge) "vI" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -1891,8 +1881,7 @@ /area/scrapper_base) "vQ" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ d2 = 2; @@ -1930,8 +1919,7 @@ /area/scrapper_base) "wk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -2106,8 +2094,7 @@ /area/scrapper_base) "yH" = ( /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /obj/structure/lattice/catwalk, /turf/template_noop, @@ -2240,8 +2227,7 @@ /area/scrapper_base/solars) "zU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable/green{ d1 = 2; @@ -2343,7 +2329,6 @@ "Cb" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -2372,8 +2357,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/engineering, @@ -2768,9 +2752,7 @@ }, /area/shuttle/scrapper_ship/power_station) "Hp" = ( -/obj/machinery/vending/tool{ - req_access = null - }, +/obj/machinery/vending/tool, /obj/structure/window/reinforced{ dir = 1 }, @@ -2789,7 +2771,6 @@ /area/shuttle/scrapper_ship/workshop) "HA" = ( /obj/machinery/computer/ship/helm{ - req_access = null; dir = 1 }, /obj/effect/floor_decal/corner/beige{ @@ -2973,8 +2954,7 @@ /area/scrapper_base/quarters) "JM" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/red, /turf/simulated/floor/plating{ @@ -3074,8 +3054,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -3164,8 +3143,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /obj/structure/dispenser/oxygen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -3393,8 +3371,7 @@ /area/scrapper_base) "OX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -4328,8 +4305,7 @@ /area/shuttle/scrapper_ship/storage) "ZF" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/tank, /turf/simulated/floor/plating{ diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm index ac880cb00ca..341b1f773d4 100644 --- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm +++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm @@ -1,7 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( -/obj/structure/extinguisher_cabinet/west{ - }, +/obj/structure/extinguisher_cabinet/west, /turf/simulated/floor/tiled/dark, /area/tajara_safehouse) "ac" = ( @@ -42,8 +41,7 @@ "aY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /turf/simulated/floor/wood, /area/tajara_safehouse) @@ -305,8 +303,7 @@ /area/tajara_safehouse) "iy" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5; - icon_state = "spline_fancy" + dir = 5 }, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/wood, @@ -611,8 +608,7 @@ /area/tajara_safehouse) "sb" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /turf/simulated/floor/wood, /area/tajara_safehouse) @@ -632,8 +628,7 @@ /area/tajara_safehouse/hangar) "sE" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/bed/stool/bar/padded/black, /obj/machinery/light/small{ @@ -663,8 +658,7 @@ /turf/simulated/floor/tiled/dark, /area/tajara_safehouse/hangar) "th" = ( -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/shuttle/black, /area/shuttle/tajara_safehouse_shuttle) @@ -796,9 +790,7 @@ /turf/simulated/floor/tiled/dark, /area/tajara_safehouse) "yu" = ( -/obj/machinery/computer/ship/helm{ - req_access = null - }, +/obj/machinery/computer/ship/helm, /turf/simulated/floor/shuttle/black, /area/shuttle/tajara_safehouse_shuttle) "yw" = ( @@ -1060,11 +1052,6 @@ /obj/machinery/vending/hydronutrients, /turf/simulated/floor/tiled/dark, /area/tajara_safehouse) -"JI" = ( -/obj/structure/extinguisher_cabinet/east{ - }, -/turf/simulated/floor/tiled/dark, -/area/tajara_safehouse) "JZ" = ( /obj/structure/table/wood/gamblingtable, /obj/item/reagent_containers/food/snacks/hardbread, @@ -1101,15 +1088,13 @@ /area/tajara_safehouse) "Lh" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9; - icon_state = "spline_fancy" + dir = 9 }, /turf/simulated/floor/wood, /area/tajara_safehouse) "Lt" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8; - icon_state = "spline_fancy" + dir = 8 }, /obj/structure/bed/stool/bar/padded/black, /obj/effect/ghostspawpoint{ @@ -1228,10 +1213,6 @@ /obj/machinery/vending/cigarette, /turf/simulated/floor/tiled/dark, /area/tajara_safehouse) -"RB" = ( -/obj/structure/extinguisher_cabinet/west, -/turf/simulated/floor/tiled/dark, -/area/tajara_safehouse) "RS" = ( /obj/structure/extinguisher_cabinet/east, /turf/simulated/floor/wood, @@ -1258,7 +1239,6 @@ /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/stone/marble, /obj/machinery/appliance/mixer/cereal{ - pixel_x = 0; pixel_y = 7 }, /turf/simulated/floor/tiled/white, @@ -1272,8 +1252,7 @@ dir = 1 }, /obj/structure/toilet{ - dir = 8; - icon_state = "toilet00" + dir = 8 }, /turf/simulated/floor/tiled/freezer, /area/tajara_safehouse) @@ -1363,8 +1342,7 @@ /area/tajara_safehouse/hangar) "WV" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4; - icon_state = "spline_fancy" + dir = 4 }, /obj/structure/bed/stool/bar/padded/black, /obj/effect/ghostspawpoint{ @@ -29304,7 +29282,7 @@ Hc lH nk ot -RB +ab ot qK ot @@ -30063,7 +30041,7 @@ lH lH lH lH -JI +iK lH lH lH diff --git a/maps/away/away_site/uueoaesa/omgolo/omgolo_tourist.dmm b/maps/away/away_site/uueoaesa/omgolo/omgolo_tourist.dmm index de017659b70..a6fd942e2b8 100644 --- a/maps/away/away_site/uueoaesa/omgolo/omgolo_tourist.dmm +++ b/maps/away/away_site/uueoaesa/omgolo/omgolo_tourist.dmm @@ -39,12 +39,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/junction, /turf/simulated/floor/wood/ebony, /area/omgolo_tourist/dining) @@ -52,17 +48,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/omgolo_tourist/roomhallway) "aaf" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/wood, @@ -71,12 +62,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/omgolo_tourist/roomhallway) @@ -84,9 +71,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -151,9 +136,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -233,12 +216,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/lino, /area/omgolo_tourist/dining) "aax" = ( @@ -257,9 +236,7 @@ /area/omgolo_tourist/hallway) "aay" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -282,23 +259,15 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/floor_damage/rust, /turf/simulated/floor/tiled/white, /area/omgolo_tourist/kitchen) "abb" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/floor_damage/rust, /turf/simulated/floor/tiled/white, /area/omgolo_tourist/kitchen) @@ -439,12 +408,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/multi_tile/glass{ name = "Dining Room" }, @@ -554,12 +519,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/omgolo_tourist/engineering) @@ -645,12 +606,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/freezer, /area/omgolo_tourist/kitchen) "agC" = ( @@ -898,9 +855,7 @@ /turf/simulated/floor/carpet/purple, /area/omgolo_tourist/dining) "ali" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/dark, /area/omgolo_tourist/hallway) "alJ" = ( @@ -970,12 +925,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -1078,12 +1029,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, @@ -1278,12 +1225,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood/ebony, /area/omgolo_tourist/dining) @@ -1510,7 +1453,6 @@ dir = 10 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/wood/ebony, @@ -1660,12 +1602,8 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/floor_damage/rust, /turf/simulated/floor/tiled/white, /area/omgolo_tourist/kitchen) @@ -1784,9 +1722,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -1843,12 +1779,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/junction, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, @@ -1912,7 +1844,6 @@ /area/omgolo_tourist/hallway) "aGg" = ( /obj/machinery/atmospherics/binary/pump/on{ - dir = 2; name = "Scrubbers to Waste" }, /turf/simulated/floor/tiled/dark, @@ -2145,12 +2076,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/omgolo_tourist/hallway) @@ -2451,7 +2378,6 @@ dir = 9 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/effect/decal/cleanable/floor_damage/rust, @@ -2536,9 +2462,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/omgolo_tourist/roomhallway) "aRS" = ( @@ -2676,8 +2600,7 @@ /area/omgolo_tourist/atmos) "aTT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/omgolo_tourist/atmos) @@ -3112,12 +3035,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/random/dirt_75, /turf/simulated/floor/wood/ebony, @@ -3176,7 +3095,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -3210,8 +3128,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /obj/structure/window/reinforced, /obj/machinery/door/window/eastleft{ @@ -3272,9 +3189,7 @@ /turf/simulated/floor/tiled/dark, /area/omgolo_tourist/hallway) "jfp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/decal/cleanable/floor_damage/rust, /turf/simulated/floor/tiled/dark, /area/omgolo_tourist/hallway) @@ -3314,9 +3229,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -3391,12 +3304,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/dirt_75, /turf/simulated/floor/wood, /area/omgolo_tourist/roomhallway) @@ -3519,9 +3428,7 @@ /turf/simulated/floor/tiled/dark, /area/omgolo_tourist/atmos) "qoL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/random/dirt_75, /obj/item/trash/meatsnack, /turf/simulated/floor/tiled/dark, @@ -3684,9 +3591,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/omgolo_tourist/roomhallway) @@ -3696,8 +3601,7 @@ /area/omgolo_tourist/dining) "vvr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, @@ -3755,7 +3659,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/junction{ - dir = 2; icon_state = "pipe-j2" }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -3785,9 +3688,7 @@ /turf/simulated/floor/wood, /area/omgolo_tourist/roomhallway) "yfI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/light{ dir = 4; status = 2 diff --git a/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm b/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm index 65eb19c5c78..62a39a89d7b 100644 --- a/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm +++ b/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm @@ -189,8 +189,7 @@ }, /obj/structure/table/standard, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/item/paper_bin, /turf/simulated/floor/tiled/dark, @@ -399,19 +398,15 @@ /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/standard, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /obj/machinery/door/window{ - dir = 2; name = "KLAXAN ONLY!!" }, /obj/item/reagent_containers/food/snacks/koissteak, @@ -1251,8 +1246,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/door/window{ name = "Hazardous Specimen"; @@ -1268,8 +1262,7 @@ /area/ihss_reclamation/envirosim) "gs" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /obj/structure/bed/handrail{ dir = 8 @@ -2107,8 +2100,7 @@ /obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/effect/shuttle_landmark/nav_ihss_reclamation/dock1{ dir = 1 @@ -2229,8 +2221,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/table/rack, /obj/effect/floor_decal/corner/red/diagonal{ @@ -2269,7 +2260,6 @@ /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4; - icon_state = "rwindow"; maxhealth = 80 }, /obj/item/stamp/ce{ @@ -2401,8 +2391,7 @@ /area/ihss_reclamation/westhall) "mh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -2578,8 +2567,7 @@ /obj/item/clothing/shoes/magboots/hegemony, /obj/item/clothing/shoes/magboots/vaurca, /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /obj/structure/window/reinforced, /obj/machinery/door/window{ @@ -2740,12 +2728,10 @@ /area/ihss_reclamation/mess) "nH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ icon_state = "2-8" @@ -3109,8 +3095,7 @@ dir = 5 }, /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor/plating, /area/shuttle/ihss_reclamation) @@ -3226,7 +3211,6 @@ "pP" = ( /obj/structure/window/reinforced{ dir = 4; - icon_state = "rwindow"; maxhealth = 80 }, /obj/structure/window/reinforced, @@ -3317,7 +3301,6 @@ /area/ihss_reclamation/equipment) "qc" = ( /obj/machinery/vending/tool{ - req_access = null; req_one_access = list(113) }, /obj/effect/floor_decal/industrial/outline/operations, @@ -3411,8 +3394,7 @@ icon_state = "0-2" }, /obj/machinery/power/terminal{ - dir = 8; - icon_state = "term" + dir = 8 }, /obj/structure/bed/handrail{ dir = 1 @@ -3522,7 +3504,6 @@ dir = 8 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -3648,7 +3629,6 @@ /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4; - icon_state = "rwindow"; maxhealth = 80 }, /obj/structure/table/standard, @@ -3790,8 +3770,7 @@ /area/ihss_reclamation/plantroom) "sK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/plating, /area/ihss_reclamation/atmos) @@ -4710,8 +4689,7 @@ /area/ihss_reclamation/fuel) "wQ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/plating, /area/ihss_reclamation/atmos) @@ -4786,8 +4764,7 @@ /obj/structure/window/reinforced, /obj/machinery/door/window/northleft, /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/dock) @@ -5063,7 +5040,6 @@ /area/ihss_reclamation/hangarhall) "yi" = ( /obj/machinery/computer/general_air_control/large_tank_control{ - input_tag = null; name = "Hydrogen Supply Monitor"; output_tag = "ihss_h2_out"; sensors = list("h_sensor"="Tank") @@ -5423,8 +5399,7 @@ /area/ihss_reclamation/crew) "Ac" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/white{ temperature = 303.15 @@ -5501,8 +5476,7 @@ /area/ihss_reclamation/plantroom) "At" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /obj/effect/floor_decal/industrial/warning, /obj/effect/map_effect/marker/airlock/shuttle{ @@ -5547,8 +5521,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /obj/machinery/door/window{ dir = 4; @@ -5789,7 +5762,6 @@ /area/ihss_reclamation/solars) "Bt" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "ihss_co2_out" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -6222,8 +6194,7 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/airless, @@ -6925,8 +6896,7 @@ }, /obj/structure/table/standard, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/item/stamp/warden, /obj/machinery/firealarm/west, @@ -7040,7 +7010,6 @@ /area/ihss_reclamation/hangar1) "Im" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "ihss_h2_out" }, /turf/simulated/floor/reinforced/hydrogen, @@ -7084,8 +7053,7 @@ color = "#941307" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/dock) @@ -7301,8 +7269,7 @@ color = "#ba9122" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/southhall) @@ -7858,8 +7825,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/effect/floor_decal/corner/red/diagonal{ dir = 4; @@ -8258,7 +8224,6 @@ "Of" = ( /obj/structure/window/reinforced{ dir = 4; - icon_state = "rwindow"; maxhealth = 80 }, /obj/structure/filingcabinet/chestdrawer, @@ -8643,8 +8608,7 @@ /area/ihss_reclamation/atmos) "Qd" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/exoplanet/grass/moghes, /area/ihss_reclamation/envirosim) @@ -8718,8 +8682,7 @@ /area/shuttle/ihss_reclamation) "Qu" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /turf/simulated/floor, @@ -8862,8 +8825,7 @@ }, /obj/structure/table/standard, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/item/pen/black, /turf/simulated/floor/tiled/dark, @@ -8900,8 +8862,7 @@ color = "#ba9122" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/dock) @@ -9346,8 +9307,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -9436,8 +9396,7 @@ /area/ihss_reclamation/northhall) "Ty" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/easthall) @@ -9470,7 +9429,6 @@ dir = 4 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -9575,7 +9533,6 @@ /obj/structure/table/standard, /obj/structure/window/reinforced{ dir = 4; - icon_state = "rwindow"; maxhealth = 80 }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony, @@ -9591,8 +9548,7 @@ /obj/structure/window/reinforced, /obj/machinery/door/window/northright, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/dock) @@ -10123,8 +10079,7 @@ /area/ihss_reclamation/mess) "WF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/westhall) @@ -10446,8 +10401,7 @@ "XX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/cable{ icon_state = "2-8" diff --git a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm index 9dd8dfbe29b..ac9602d73d7 100644 --- a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm +++ b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm @@ -60,9 +60,7 @@ /turf/simulated/floor/plating, /area/shuttle/tret_industrial/main) "aai" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/wall/r_wall, /area/tret_industrial/inside/hallway_docks) "aaj" = ( @@ -78,9 +76,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_botany) "aan" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /turf/simulated/wall/r_wall, /area/tret_industrial/inside/hallway_docks) "aao" = ( @@ -102,9 +98,7 @@ /turf/simulated/wall/r_wall, /area/tret_industrial/inside/hallway_smelting) "aas" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/wall/r_wall, /area/tret_industrial/inside/hallway_smelting) "aat" = ( @@ -283,19 +277,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_docks) "abr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -306,9 +294,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_medical) "abs" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -452,12 +438,8 @@ /turf/simulated/floor/exoplanet/basalt/tret, /area/tret_industrial/outside/surface) "ach" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/cable{ icon_state = "4-8" @@ -474,19 +456,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/random/dirt_75, /turf/simulated/floor/plating, /area/tret_industrial/inside/smelting_west) "acl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -494,9 +470,7 @@ /turf/simulated/floor/tiled/ridged, /area/tret_industrial/inside/smelting_west) "acp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 1 }, @@ -556,15 +530,9 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/smelting_west) "acx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -645,9 +613,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/crew) "adc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -664,9 +630,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_smelting) "add" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/outline_straight/red{ dir = 4 }, @@ -757,12 +721,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/smelting_east) "adq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -839,12 +799,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/engineering) "ady" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -938,12 +894,8 @@ /turf/simulated/floor/tiled/slate, /area/tret_industrial/inside/comms) "adW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -984,12 +936,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/engi_storage) "aec" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -1026,9 +974,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/eva) "aeg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -1131,9 +1077,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_medical) "aes" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -1147,12 +1091,8 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_medical) "aet" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/cable{ icon_state = "1-2" @@ -1161,24 +1101,19 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_medical) "aev" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/structure/shuttle/engine/heater, /turf/simulated/floor/plating, /area/shuttle/tret_industrial/propulsion) "aew" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/map_effect/marker/airlock/shuttle/tret_industrial_shuttle, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -1269,18 +1204,12 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_smelting) "aeR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_smelting) @@ -1289,9 +1218,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/botany) "afc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -1302,9 +1229,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red, /obj/effect/floor_decal/industrial/outline_straight/red{ dir = 8 @@ -1324,9 +1249,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_medical) "afh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/random/dirt_75, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 1 @@ -1382,12 +1305,8 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_botany) "afv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/cable{ icon_state = "1-2" @@ -1535,12 +1454,8 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_comms) "agi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -1836,9 +1751,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/yellow{ dir = 9 }, @@ -1889,12 +1802,8 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_botany) "ahx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ icon_state = "4-8" }, @@ -1968,9 +1877,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/crew) "aie" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -1983,9 +1890,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red, /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/crew) @@ -1993,21 +1898,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/crew) "aik" = ( /obj/effect/floor_decal/corner/yellow{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -2173,9 +2072,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_smelting) "aja" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/orange{ dir = 10 }, @@ -2184,9 +2081,7 @@ /area/tret_industrial/inside/hallway_botany) "ajb" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -2214,9 +2109,7 @@ /turf/simulated/floor/tiled/gunmetal, /area/tret_industrial/inside/comms) "ajd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/eva) "aje" = ( @@ -2224,19 +2117,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_botany) "ajh" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 1 }, @@ -2289,9 +2176,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_botany) "ajo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_tret_industrial_outpost_east_3"; name = "airlock_tret_industrial_outpost_east_3"; @@ -2333,12 +2218,8 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/tret_industrial/main) "ajK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/door/firedoor/noid, /obj/effect/floor_decal/industrial/hatch_door/red{ @@ -2458,21 +2339,13 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/tret_industrial/inside/engineering) "akC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -2671,12 +2544,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/smelting_west) "amT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -2847,9 +2716,7 @@ pixel_x = 4; pixel_y = 3 }, -/obj/machinery/light/colored/decayed{ - dir = 2 - }, +/obj/machinery/light/colored/decayed, /obj/item/vaurca/box{ pixel_x = -10; pixel_y = 8 @@ -2876,12 +2743,8 @@ req_one_access = list(216); name = "Engineering" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -3034,12 +2897,8 @@ }, /obj/machinery/door/firedoor/noid, /obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/botany) "aqO" = ( @@ -3066,12 +2925,8 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_docks) "aqV" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_tret_industrial_outpost_west_4"; name = "airlock_tret_industrial_outpost_west_4"; @@ -3090,12 +2945,8 @@ /area/tret_industrial/inside/storage_smelting) "aqW" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -3103,8 +2954,7 @@ /obj/machinery/button/remote/blast_door{ id = "tret_shutters_engineering_storage"; pixel_x = 28; - pixel_y = -20; - dir = 2 + pixel_y = -20 }, /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_medical) @@ -3251,8 +3101,7 @@ pixel_y = 4 }, /obj/item/clothing/head/helmet/space{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/structure/cable{ icon_state = "4-8" @@ -3282,9 +3131,7 @@ /turf/simulated/lava/tret, /area/tret_industrial/outside/surface) "asm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -3412,9 +3259,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "2-4" }, @@ -3634,12 +3479,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -3655,7 +3496,6 @@ /area/tret_industrial/outside/surface) "awj" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; use_power = 1 }, /turf/simulated/floor/exoplanet/plating/tret, @@ -3775,9 +3615,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/maint_center) "axj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -3923,7 +3761,6 @@ id = "tret_shutters_smelting_west"; pixel_x = -28; pixel_y = -20; - dir = 2; req_one_access = list(216) }, /obj/effect/floor_decal/industrial/warning, @@ -3970,12 +3807,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/random/dirt_75, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 1 @@ -4088,12 +3921,8 @@ }, /obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -4249,8 +4078,7 @@ "aBo" = ( /obj/structure/table/standard, /obj/item/reagent_containers/inhaler/phoron_special{ - pixel_x = 3; - pixel_y = 0 + pixel_x = 3 }, /obj/item/reagent_containers/inhaler/phoron_special{ pixel_x = 4; @@ -4307,12 +4135,8 @@ dir = 1 }, /obj/machinery/door/firedoor/noid, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -4356,12 +4180,8 @@ }, /obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/crew) "aCo" = ( @@ -4385,9 +4205,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_botany) "aCA" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/structure/cable{ icon_state = "1-2" @@ -4425,12 +4243,8 @@ dir = 1 }, /obj/machinery/door/firedoor/noid, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -4445,7 +4259,6 @@ cycle_to_external_air = 1 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -4514,9 +4327,7 @@ /turf/simulated/floor/tiled/slate, /area/tret_industrial/inside/comms) "aDq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -4584,23 +4395,19 @@ }, /obj/item/clothing/shoes/vaurca/brown{ pixel_y = 9; - pixel_x = -4; - color = "#784020" + pixel_x = -4 }, /obj/item/clothing/shoes/vaurca/brown{ pixel_y = 9; - pixel_x = -4; - color = "#784020" + pixel_x = -4 }, /obj/item/clothing/shoes/vaurca/red{ pixel_y = 9; - pixel_x = -4; - color = "#d62b2b" + pixel_x = -4 }, /obj/item/clothing/shoes/vaurca/red{ pixel_y = 9; - pixel_x = -4; - color = "#d62b2b" + pixel_x = -4 }, /obj/machinery/light/colored/decayed{ dir = 1 @@ -4615,9 +4422,7 @@ /area/tret_industrial/inside/hallway_docks) "aDE" = ( /obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_tret_industrial_outpost_east_2"; name = "airlock_tret_industrial_outpost_east_2"; @@ -4626,8 +4431,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/random/dirt_75, /obj/effect/floor_decal/industrial/hatch/red, @@ -4660,9 +4464,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/engineering) "aEf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/structure/cable{ icon_state = "1-2" }, @@ -4681,15 +4483,9 @@ /turf/simulated/floor/exoplanet/basalt/tret, /area/tret_industrial/outside/surface) "aEn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/hatch_door/red{ dir = 1 }, @@ -4878,12 +4674,8 @@ /area/tret_industrial/inside/hallway_smelting) "aFx" = ( /obj/structure/table/stone/marble, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable{ icon_state = "4-8" }, @@ -5011,21 +4803,13 @@ name = "East Smeltery"; req_one_access = list(216) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/smelting_east) "aGM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -5043,7 +4827,6 @@ dir = 8 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 5 }, @@ -5116,12 +4899,8 @@ /turf/simulated/floor/tiled/white, /area/tret_industrial/inside/botany) "aHH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -5189,9 +4968,7 @@ /turf/simulated/floor/tiled/gunmetal, /area/tret_industrial/inside/engineering) "aHY" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_1, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ @@ -5291,12 +5068,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/engineering) "aIM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -5338,7 +5111,6 @@ pixel_x = 5 }, /obj/random/powercell{ - pixel_y = 0; pixel_x = -8 }, /obj/random/dirt_75, @@ -5394,12 +5166,10 @@ cycle_to_external_air = 1 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -5553,8 +5323,7 @@ }, /obj/machinery/access_button{ pixel_x = 27; - pixel_y = 29; - dir = 2 + pixel_y = 29 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/full, @@ -5643,12 +5412,8 @@ /turf/simulated/floor/tiled/ridged, /area/tret_industrial/inside/smelting_west) "aLS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -5766,9 +5531,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/crew) "aMS" = ( -/obj/machinery/computer/ship/engines/terminal{ - dir = 2 - }, +/obj/machinery/computer/ship/engines/terminal, /obj/machinery/alarm/west{ req_one_access = null }, @@ -5816,9 +5579,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 8 }, @@ -5846,12 +5607,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/engineering) "aNJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -5934,9 +5691,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ icon_state = "4-8" }, @@ -5980,9 +5735,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/storage_smelting) "aPj" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/visible/blue, /obj/item/pipewrench{ pixel_x = 5 }, @@ -6027,9 +5780,7 @@ /turf/simulated/floor/exoplanet/basalt/tret, /area/tret_industrial/outside/surface) "aPy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -6185,12 +5936,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/engineering) "aRg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -6237,12 +5984,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/item/storage/bag/inflatable{ pixel_x = 18; @@ -6251,9 +5994,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/engineering) "aRO" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_5, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -6303,7 +6044,6 @@ /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_4, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -6371,12 +6111,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, @@ -6477,12 +6213,8 @@ /obj/effect/floor_decal/corner/yellow{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_straight/red{ dir = 8 }, @@ -6593,12 +6325,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/botany) "aUq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -6649,7 +6377,6 @@ /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_5, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -6956,9 +6683,7 @@ /turf/simulated/floor/tiled/white, /area/tret_industrial/inside/canteen) "aWY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/structure/cable{ icon_state = "2-8" }, @@ -7159,9 +6884,7 @@ /turf/simulated/floor/airless, /area/tret_industrial/inside/comms) "aZA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -7178,12 +6901,8 @@ /turf/space/transit/north, /area/space) "aZP" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/structure/cable{ icon_state = "1-2" }, @@ -7229,9 +6948,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_docks) "bdX" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_2, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ @@ -7249,9 +6966,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/smelting_east) "bhb" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/shuttle_landmark/tret_industrial/dock/outpost_2, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_2, /obj/effect/map_effect/marker_helper/airlock/exterior, @@ -7339,9 +7054,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_medical) "btn" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, @@ -7399,9 +7112,7 @@ /turf/simulated/floor/plating, /area/shuttle/tret_industrial/main) "bDN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/random/dirt_75, /turf/simulated/floor/plating, /area/shuttle/tret_industrial/main) @@ -7431,9 +7142,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/smelting_west) "bHQ" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_tret_industrial_outpost_west_1"; name = "airlock_tret_industrial_outpost_west_1"; @@ -7446,9 +7155,7 @@ pixel_y = 12; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, @@ -7550,9 +7257,7 @@ /turf/simulated/floor/tiled/slate, /area/tret_industrial/inside/canteen) "cgU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_tret_industrial_outpost_west_1"; name = "airlock_tret_industrial_outpost_west_1"; @@ -7736,9 +7441,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/canteen) "cWG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/structure/shuttle/engine/heater, /obj/random/dirt_75, /turf/simulated/floor/plating, @@ -7941,12 +7644,10 @@ "dMQ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = 6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -8018,12 +7719,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/storage_smelting) "ecL" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_tret_industrial_outpost_east_4"; name = "airlock_tret_industrial_outpost_east_4"; @@ -8181,17 +7878,14 @@ /turf/simulated/floor/tiled/gunmetal, /area/tret_industrial/inside/engi_storage) "eLL" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/shuttle_landmark/tret_industrial/dock/outpost_5{ dir = 1 }, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_5, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 @@ -8228,7 +7922,6 @@ "eRo" = ( /obj/structure/table/reinforced/steel, /obj/item/folder/yellow{ - pixel_y = 0; pixel_x = -1 }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony{ @@ -8298,12 +7991,8 @@ /turf/simulated/floor/exoplanet/plating/tret, /area/tret_industrial/outside/surface) "fiU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -8440,9 +8129,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/maint_center) "fRP" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_tret_industrial_outpost_west_4"; name = "airlock_tret_industrial_outpost_west_4"; @@ -8451,8 +8138,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/effect/floor_decal/industrial/hatch/red, @@ -8611,9 +8297,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_docks) "gkr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -8647,7 +8331,6 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -8690,7 +8373,6 @@ id = "tret_shutters_smelting_storage"; pixel_x = 28; pixel_y = -20; - dir = 2; req_one_access = list(216) }, /obj/random/dirt_75, @@ -8705,12 +8387,8 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_botany) "gwg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -8817,12 +8495,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_medical) "gTZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -8834,9 +8508,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/maint_center) "gWd" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_1, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ @@ -8877,12 +8549,8 @@ name = "Smeltery Storage"; req_one_access = list(216) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -8970,9 +8638,7 @@ /area/shuttle/tret_industrial/main) "hkA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/shuttle/tret_industrial_shuttle, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ @@ -9016,7 +8682,6 @@ /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_3, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -9109,12 +8774,8 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_medical) "hZW" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_tret_industrial_outpost_west_2"; name = "airlock_tret_industrial_outpost_west_2"; @@ -9132,12 +8793,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_docks) "ibN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -9189,7 +8846,6 @@ id = "tret_shutters_smelting_east"; pixel_x = -28; pixel_y = -20; - dir = 2; req_one_access = list(216) }, /turf/simulated/floor/tiled/ridged, @@ -9416,12 +9072,8 @@ /obj/machinery/door/airlock/maintenance_hatch{ req_one_access = list(216) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -9580,15 +9232,9 @@ /turf/simulated/floor/exoplanet/basalt/tret, /area/tret_industrial/outside/surface) "jxK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -9635,17 +9281,14 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_docks) "jKX" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/shuttle_landmark/tret_industrial/dock/outpost_4{ dir = 1 }, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_4, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 @@ -9684,8 +9327,7 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = 29; - dir = 2 + pixel_y = 29 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 @@ -9729,9 +9371,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/storage_smelting) "jRW" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_tret_industrial_outpost_west_3"; name = "airlock_tret_industrial_outpost_west_3"; @@ -9811,12 +9451,8 @@ /turf/simulated/floor/plating, /area/shuttle/tret_industrial/main) "jZh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 1 }, @@ -9852,12 +9488,8 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_comms) "kkD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -9927,7 +9559,6 @@ dir = 4 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28 }, /turf/simulated/floor/exoplanet/plating/tret, @@ -9940,12 +9571,8 @@ /turf/unsimulated/marker/red, /area/tret_industrial/outside/surface) "kCE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_medical) "kFI" = ( @@ -10027,17 +9654,14 @@ /turf/simulated/floor/exoplanet/basalt/tret, /area/tret_industrial/outside/surface) "kYo" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_2, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -10134,9 +9758,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/random/dirt_75, /obj/effect/floor_decal/industrial/outline_door/red{ dir = 8 @@ -10233,12 +9855,8 @@ name = "Engineering Storage"; req_one_access = list(216) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -10334,9 +9952,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_medical) "mvH" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_2, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ @@ -10487,7 +10103,6 @@ /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_3, /obj/effect/map_effect/marker_helper/airlock/out, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -10627,12 +10242,8 @@ /turf/simulated/floor/plating, /area/shuttle/tret_industrial/propulsion) "nGu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -10734,12 +10345,8 @@ /obj/machinery/door/airlock/maintenance_hatch{ req_one_access = list(216) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -10837,12 +10444,8 @@ /turf/simulated/floor/plating, /area/shuttle/tret_industrial/main) "okb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -10991,18 +10594,13 @@ /turf/simulated/floor/plating, /area/shuttle/tret_industrial/propulsion) "oYs" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_5, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 + pixel_x = -28 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 @@ -11022,9 +10620,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/tret_industrial/main) "oYS" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_4, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/floor_decal/industrial/hatch/red, @@ -11052,12 +10648,8 @@ /turf/simulated/floor/exoplanet/basalt/tret, /area/tret_industrial/outside/surface) "ppZ" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_4, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ @@ -11081,9 +10673,7 @@ /turf/simulated/floor/tiled/slate, /area/tret_industrial/inside/botany) "psW" = ( -/obj/machinery/atmospherics/portables_connector/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/portables_connector/supply, /obj/machinery/portable_atmospherics/canister/air, /obj/random/dirt_75, /turf/simulated/floor/plating, @@ -11208,7 +10798,6 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 26 }, @@ -11367,8 +10956,7 @@ pixel_y = 27 }, /obj/item/clothing/head/helmet/space{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /turf/simulated/floor/exoplanet/basalt/tret, /area/tret_industrial/outside/surface) @@ -11381,7 +10969,6 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 26 }, @@ -11412,9 +10999,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/crew) "qyX" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_tret_industrial_outpost_west_2"; name = "airlock_tret_industrial_outpost_west_2"; @@ -11423,12 +11008,9 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 + pixel_x = -28 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, @@ -11439,7 +11021,6 @@ dir = 4 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -11518,9 +11099,7 @@ /turf/simulated/floor/exoplanet/plating/tret, /area/tret_industrial/inside/hallway_botany) "qQk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, /turf/simulated/floor/plating, /area/shuttle/tret_industrial/main) "qRq" = ( @@ -11675,7 +11254,6 @@ /obj/effect/map_effect/marker/airlock/shuttle/tret_industrial_shuttle, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -11734,9 +11312,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_docks) "ryk" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/structure/cable{ icon_state = "1-2" }, @@ -11845,12 +11421,8 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_comms) "rGu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -11905,12 +11477,8 @@ /area/tret_industrial/outside/surface) "rLt" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 8 }, @@ -11937,9 +11505,7 @@ /turf/simulated/floor/exoplanet/basalt/tret, /area/tret_industrial/outside/landing) "rPQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/binary/pump/supply/on{ dir = 1 }, @@ -11969,9 +11535,7 @@ "rSK" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /turf/simulated/floor/exoplanet/plating/tret, /area/tret_industrial/inside/hallway_botany) "rUb" = ( @@ -12044,12 +11608,8 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_medical) "siE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -12059,9 +11619,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/eva) "sjT" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_5, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ @@ -12087,12 +11645,9 @@ /turf/simulated/floor/exoplanet/plating/tret, /area/tret_industrial/outside/surface) "snM" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/effect/floor_decal/industrial/hatch/red, @@ -12273,7 +11828,6 @@ cycle_to_external_air = 1 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -12376,14 +11930,11 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/smelting_east) "tfJ" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_4, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 @@ -12395,12 +11946,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_docks) "tlJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -12432,12 +11979,8 @@ req_one_access = list(216); name = "EVA Storage" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -12496,9 +12039,7 @@ /turf/simulated/floor/plating, /area/shuttle/tret_industrial/main) "txa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/structure/cable{ icon_state = "1-2" }, @@ -12535,12 +12076,8 @@ /obj/machinery/door/airlock/maintenance_hatch{ req_one_access = list(216) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -12755,9 +12292,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_botany) "uVh" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 4 }, @@ -12918,15 +12453,9 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/tret_industrial/main) "vCY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -12951,12 +12480,10 @@ }, /obj/effect/map_effect/marker_helper/airlock/out, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -13031,9 +12558,7 @@ /turf/simulated/floor/exoplanet/plating/tret, /area/tret_industrial/outside/surface) "vUX" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_tret_industrial_outpost_west_3"; name = "airlock_tret_industrial_outpost_west_3"; @@ -13041,8 +12566,7 @@ cycle_to_external_air = 1 }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 8 @@ -13068,9 +12592,7 @@ /turf/simulated/floor/tiled/ridged, /area/tret_industrial/inside/storage_smelting) "vXE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/orange{ dir = 10 }, @@ -13103,14 +12625,11 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_docks) "wbs" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/shuttle/tret_industrial_shuttle, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -13155,12 +12674,10 @@ }, /obj/effect/map_effect/marker_helper/airlock/out, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -13204,8 +12721,7 @@ }, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -13233,12 +12749,8 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_comms) "wFr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/orange{ dir = 5 }, @@ -13250,9 +12762,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/eva) "wFU" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking/tret_industrial/dock/outpost_1, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ @@ -13408,12 +12918,8 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_botany) "xeq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_comms) diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm index 758b727afd7..9949347a836 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm @@ -30,8 +30,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -77,8 +76,7 @@ /area/tcaf_corvette/grauwolf) "ao" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/tiled/dark/full, /area/turbolift/tcaf_corvette/tcaf_lift) @@ -349,8 +347,7 @@ dir = 10 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, @@ -541,8 +538,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -683,8 +679,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -753,8 +748,7 @@ /area/tcaf_corvette/engine) "co" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, @@ -852,8 +846,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -1305,8 +1298,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -1659,8 +1651,7 @@ pixel_x = -4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /turf/simulated/floor/reinforced, /area/tcaf_corvette/central_ring) @@ -1678,8 +1669,7 @@ /area/tcaf_corvette/hangar) "fK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/wall/shuttle/legion, /area/shuttle/tcaf) @@ -2258,8 +2248,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -2279,8 +2268,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -2362,8 +2350,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -2389,8 +2376,7 @@ /area/tcaf_corvette/central_ring) "iD" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/machinery/alarm/west{ req_one_access = list(204) @@ -2465,8 +2451,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ d1 = 1; @@ -2492,8 +2477,7 @@ /area/tcaf_corvette/exterior) "iR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /turf/simulated/floor/tiled/gridded, /area/tcaf_corvette/engineering) @@ -2717,8 +2701,7 @@ /area/tcaf_corvette/messhall) "jZ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor, /area/tcaf_corvette/hangar) @@ -2796,12 +2779,10 @@ "kk" = ( /obj/structure/ship_weapon_dummy, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/reinforced, /area/shuttle/tcaf) @@ -3062,8 +3043,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -3607,8 +3587,7 @@ /area/tcaf_corvette/hangar) "ng" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/reinforced, /area/tcaf_corvette/central_ring) @@ -4120,8 +4099,7 @@ /area/tcaf_corvette/hangar) "pp" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/gridded, /area/tcaf_corvette/engine) @@ -4301,8 +4279,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -4342,8 +4319,7 @@ /area/tcaf_corvette/storage) "qk" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/full, /area/tcaf_corvette/hydroponics) @@ -4450,8 +4426,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled/full, /area/tcaf_corvette/forensics) @@ -4488,8 +4463,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) @@ -4635,8 +4609,7 @@ dir = 9 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) @@ -4938,12 +4911,10 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, @@ -4988,8 +4959,7 @@ /area/tcaf_corvette/cargo_bay) "td" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/machinery/portable_atmospherics/powered/scrubber, /obj/effect/floor_decal/industrial/outline/red, @@ -5054,8 +5024,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled/freezer, /area/tcaf_corvette/freezer) @@ -5107,8 +5076,7 @@ /area/tcaf_corvette/washroom) "tA" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, @@ -5353,8 +5321,7 @@ /area/tcaf_corvette/workshop) "uA" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/effect/floor_decal/industrial/outline/emergency_closet, @@ -5581,8 +5548,7 @@ /area/tcaf_corvette/messhall) "vw" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /turf/simulated/floor/tiled/dark/full, /area/turbolift/tcaf_corvette/tcaf_lift) @@ -5835,8 +5801,7 @@ /area/tcaf_corvette/central_ring) "wB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/gunmetal, /area/tcaf_corvette/cic) @@ -5967,8 +5932,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, @@ -6078,8 +6042,7 @@ "xF" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /obj/item/ship_ammunition/grauwolf_bundle/ap, /obj/item/ship_ammunition/grauwolf_bundle/ap, @@ -6160,8 +6123,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gridded, @@ -6472,8 +6434,7 @@ }, /obj/effect/floor_decal/industrial/hatch_tiny/yellow, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/button/remote/airlock{ dir = 10; @@ -6604,8 +6565,7 @@ /area/tcaf_corvette/medical) "zM" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/structure/ship_weapon_dummy, /turf/simulated/floor/reinforced, @@ -6684,8 +6644,7 @@ dir = 9 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/machinery/computer/guestpass{ pixel_x = -32 @@ -6746,8 +6705,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/tcaf_corvette/brig) @@ -6968,24 +6926,12 @@ /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/half, -/obj/item/clothing/glasses/safety/goggles/tactical{ - icon_state = "military_goggles" - }, -/obj/item/clothing/glasses/safety/goggles/tactical{ - icon_state = "military_goggles" - }, -/obj/item/clothing/glasses/safety/goggles/tactical{ - icon_state = "military_goggles" - }, -/obj/item/clothing/glasses/safety/goggles/tactical{ - icon_state = "military_goggles" - }, -/obj/item/clothing/glasses/safety/goggles/tactical{ - icon_state = "military_goggles" - }, -/obj/item/clothing/glasses/safety/goggles/tactical{ - icon_state = "military_goggles" - }, +/obj/item/clothing/glasses/safety/goggles/tactical, +/obj/item/clothing/glasses/safety/goggles/tactical, +/obj/item/clothing/glasses/safety/goggles/tactical, +/obj/item/clothing/glasses/safety/goggles/tactical, +/obj/item/clothing/glasses/safety/goggles/tactical, +/obj/item/clothing/glasses/safety/goggles/tactical, /obj/item/storage/belt/security/full/alt, /obj/item/storage/belt/security/full/alt, /obj/item/storage/belt/security/full/alt, @@ -7126,8 +7072,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/full, /area/tcaf_corvette/forensics) @@ -7139,8 +7084,7 @@ dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled, /area/tcaf_corvette/captain) @@ -7207,8 +7151,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -7273,8 +7216,7 @@ /area/tcaf_corvette/messhall) "CI" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/carpet/rubber, /area/tcaf_corvette/engineering) @@ -7529,8 +7471,7 @@ "Eb" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -7725,8 +7666,7 @@ /area/tcaf_corvette/central_ring) "EP" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/effect/decal/cleanable/floor_damage/broken4, /obj/effect/decal/cleanable/dirt, @@ -7965,8 +7905,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled, /area/tcaf_corvette/hangar) @@ -7982,8 +7921,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -8344,8 +8282,7 @@ dir = 6 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 @@ -8412,8 +8349,7 @@ /area/tcaf_corvette/hangar) "HD" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -8913,8 +8849,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -9230,8 +9165,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -9309,8 +9243,7 @@ /area/tcaf_corvette/cic) "Lb" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/reinforced, /area/tcaf_corvette/central_ring) @@ -9344,8 +9277,7 @@ /area/tcaf_corvette/engine) "Ln" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor, /area/tcaf_corvette/hangar) @@ -9454,8 +9386,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -9711,8 +9642,7 @@ /area/space) "Mw" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, @@ -9736,8 +9666,7 @@ dir = 9 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -9903,8 +9832,7 @@ /area/tcaf_corvette/exterior) "Np" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/machinery/atmospherics/binary/passive_gate/on{ dir = 8; @@ -10114,8 +10042,7 @@ dir = 10 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -10585,8 +10512,7 @@ /obj/structure/ship_weapon_dummy, /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/reinforced, /area/shuttle/tcaf) @@ -10693,8 +10619,7 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, @@ -10878,8 +10803,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -10963,8 +10887,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -11210,8 +11133,7 @@ target_pressure = 15000 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/carpet/rubber, /area/tcaf_corvette/engineering) @@ -11246,8 +11168,7 @@ /area/tcaf_corvette/hangar) "SS" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/reinforced, /area/tcaf_corvette/grauwolf) @@ -11533,8 +11454,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -11883,8 +11803,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -11930,8 +11849,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -11967,8 +11885,7 @@ /area/tcaf_corvette/messhall) "VJ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/iff_beacon/name_change{ pixel_y = 5; @@ -12637,8 +12554,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -12688,8 +12604,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -12837,8 +12752,7 @@ /area/tcaf_corvette/central_lift) "YY" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/alarm/east{ req_one_access = list(204) @@ -12941,8 +12855,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 1 @@ -12969,8 +12882,7 @@ }, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 diff --git a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm index c77ee92bf10..266b93ff5e8 100644 --- a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm +++ b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm @@ -245,9 +245,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/dark, /area/ship/tcfl_peacekeeper_ship) -"cdt" = ( -/turf/simulated/wall/shuttle/legion, -/area/shuttle/tcfl_shuttle) "cnD" = ( /obj/item/modular_computer/console/preset/civilian{ dir = 1 @@ -3802,9 +3799,6 @@ }, /turf/simulated/floor/plating, /area/ship/tcfl_peacekeeper_ship) -"yjk" = ( -/turf/simulated/wall/shuttle/legion, -/area/ship/tcfl_peacekeeper_ship) "ykM" = ( /obj/structure/bedsheetbin{ pixel_y = 4 @@ -24987,18 +24981,18 @@ xRX xRX xRX xRX -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY ozV -yjk -yjk -yjk +oAY +oAY +oAY qtX jQY -yjk +oAY xRX xRX xRX @@ -25251,11 +25245,11 @@ hZq oYH hZq aTI -yjk +oAY dCR mxc bYX -yjk +oAY xRX xRX xRX @@ -25508,11 +25502,11 @@ atj atj rxc pPl -yjk +oAY kSQ mEc xji -yjk +oAY xRX xRX xRX @@ -25765,11 +25759,11 @@ sTl pPl xFD sfQ -yjk +oAY pLb mEc jWO -yjk +oAY xRX xRX xRX @@ -26015,18 +26009,18 @@ xRX xRX xRX xRX -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY kaR -yjk -yjk +oAY +oAY lak mEc jWO -yjk +oAY xRX xRX xRX @@ -26283,7 +26277,7 @@ erL mEc mEc jWO -yjk +oAY xRX xRX xRX @@ -26521,16 +26515,16 @@ xRX xRX xRX xRX -yjk -yjk +oAY +oAY qtX tSB -yjk +oAY qtX qtX -yjk -yjk -yjk +oAY +oAY +oAY fEr lCc xcE @@ -26540,7 +26534,7 @@ wdh xji jWO xji -yjk +oAY xRX xRX xRX @@ -26778,16 +26772,16 @@ xRX xRX xRX xRX -yjk +oAY efU eCV eYX -yjk +oAY kqK fpQ frC fQq -yjk +oAY hiw lCc gRK @@ -26797,7 +26791,7 @@ arF xji xji hRT -yjk +oAY xRX xRX xRX @@ -27027,41 +27021,41 @@ xRX xRX xRX xRX -yjk -yjk -yjk +oAY +oAY +oAY vrh -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY yge tUb xji -yjk +oAY xAs tUb tUb fQL -yjk -yjk -yjk +oAY +oAY +oAY jrJ -yjk -yjk -yjk -yjk -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY +oAY +oAY +oAY +oAY qtX pfg qtX -yjk -yjk +oAY +oAY xRX xRX xRX @@ -27280,19 +27274,19 @@ xRX xRX xRX xRX -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY lAV bge cNY -yjk +oAY eaJ cYw nBU -yjk +oAY ehg xji uZC @@ -27308,17 +27302,17 @@ ilM kgR hud kwV -yjk +oAY mET nfi -yjk +oAY kiO opS pxn pAh xfS cPY -yjk +oAY dze dze dze @@ -27537,7 +27531,7 @@ xRX xRX xRX xRX -yjk +oAY sWY aac sWY @@ -27549,7 +27543,7 @@ coZ sWY sWY sWY -yjk +oAY ehA xji uZC @@ -27565,17 +27559,17 @@ tUb hXr vLQ oAp -yjk +oAY mLa ngE -yjk +oAY jMm orP bdV bdV xfS ewn -yjk +oAY taa tpL dze @@ -27793,7 +27787,7 @@ xRX xRX xRX xRX -yjk +oAY oAY aaa aaI @@ -27806,26 +27800,26 @@ arp qBg ddH sWY -yjk +oAY eib sKP xji -yjk +oAY qPL cJw cJw xji -yjk -yjk +oAY +oAY iaK quF oAY lYs oAp -yjk +oAY mNF npn -yjk +oAY iyR bdV bdV @@ -27836,10 +27830,10 @@ qfE xji rXT oAY -yjk +oAY wns -yjk -yjk +oAY +oAY xRX xRX xRX @@ -28063,7 +28057,7 @@ uCI pPl dfd sWY -yjk +oAY eiL xji xji @@ -28072,31 +28066,31 @@ iVq jWO jWO fRD -yjk +oAY hjH vRm vRm kkV lYs oAp -yjk -yjk +oAY +oAY npq -yjk -yjk +oAY +oAY aab -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY xji oAp wuK xji uaE vdz -yjk +oAY ymi xRX xRX @@ -28320,29 +28314,29 @@ wJV wJV dfd sWY -yjk +oAY eiR xyB xyB -yjk +oAY cFC uZC fws fTp -yjk +oAY hsz iaO eKS kkV lYs kye -yjk +oAY ykM uwT lnU nVi uwT -yjk +oAY pIz qlz rgX @@ -28570,22 +28564,22 @@ sWY ive wJV abb -cdt +wJV dcm eKc gaB gvM dfd sWY -yjk +oAY qtX eDP eDP -yjk +oAY eDP eDP qtX -yjk +oAY gHC hsG xdz @@ -28593,13 +28587,13 @@ eKS vrU bWS oAp -yjk +oAY mPM uwT uwT uwT oyy -yjk +oAY qtP tUb tUb @@ -28856,14 +28850,14 @@ uwT uwT uwT uwT -yjk -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY +oAY tra -yjk +oAY oAY ucw sKP @@ -29104,24 +29098,24 @@ gJE eKS eKS jvL -yjk +oAY bWS vWV -yjk +oAY xfS xfS uwT xfS xfS -yjk +oAY pJZ qHm rhz sxG -yjk +oAY uwT trs -yjk +oAY upC xji tYP @@ -29344,7 +29338,7 @@ aUf cBz cBz frB -cdt +wJV wJV wJV abb @@ -29357,20 +29351,20 @@ wJV pPl xjG sWY -yjk +oAY hyn ibU fHl -yjk +oAY ltf kzm -yjk +oAY mSl mSl nFw mSl sbb -yjk +oAY xji xji xji @@ -29378,7 +29372,7 @@ xji pNl uwT uwT -yjk +oAY urZ xji vwF @@ -29615,19 +29609,19 @@ pPl xjG fVv oAY -yjk -yjk -yjk +oAY +oAY +oAY oAY lYs kAt -yjk -yjk -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY +oAY +oAY pKl qHO rrF @@ -29635,7 +29629,7 @@ xji pNl dkk ktN -yjk +oAY usV jWO vxN @@ -29878,21 +29872,21 @@ jAE cJw ksI oAp -yjk +oAY stK sKP sKP sKP oAV -yjk +oAY xji qMx rtf xji -yjk +oAY dkk uwT -yjk +oAY uCl imC vAg @@ -30124,7 +30118,7 @@ jmw jnZ dcm dcm -cdt +wJV wJV dfd sWY @@ -30135,21 +30129,21 @@ imC kpR oge oAp -yjk +oAY hBS xji jWO jWO oAp -yjk +oAY pNl pNl -yjk +oAY szY oAY uwT uwT -yjk +oAY uIP cJw cJw @@ -30386,9 +30380,9 @@ lej dfd fVv oAY -yjk -yjk -yjk +oAY +oAY +oAY xsR oge xyB @@ -30406,7 +30400,7 @@ uwT tkU uwT tuA -yjk +oAY aEJ vgp dze @@ -30642,7 +30636,7 @@ kJI lej kQl sWY -yjk +oAY hzX irX whf @@ -30663,10 +30657,10 @@ uwT uwT uwT twq -yjk +oAY kfX vgx -yjk +oAY wji xRX xRX @@ -30886,7 +30880,7 @@ bty dcC dcm frB -cdt +wJV wJV wJV abb @@ -30895,36 +30889,36 @@ wJV wJV wJV wJV -cdt +wJV wJV xjG sWY -yjk +oAY hEj hFK jEu sBp lLn -yjk -yjk +oAY +oAY qtX qtX qtX qtX -yjk -yjk -yjk +oAY +oAY +oAY lmc lva -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY oAY uNk vnW -yjk -yjk +oAY +oAY xRX xRX xRX @@ -31156,7 +31150,7 @@ aow vEx fLz sWY -yjk +oAY hFC iCG uwT @@ -31169,19 +31163,19 @@ ntt nJs lwj oNi -yjk +oAY pRO qUf uwT sEq tmI -yjk +oAY tCH pim uNN xji pim -yjk +oAY xRX xRX xRX @@ -31413,20 +31407,20 @@ eMT eMT fNN fZq -yjk +oAY hFK hFK uwT uwT oLC -yjk +oAY lri lwj lwj lwj lwj pfE -yjk +oAY pUq uwT uwT @@ -31654,22 +31648,22 @@ sWY ive wJV wJV -cdt +wJV dcm fQo gaB gvM dfd sWY -yjk -yjk +oAY +oAY eOz eOz eOz eOz mnC -yjk -yjk +oAY +oAY gHC hFX uwT @@ -31683,13 +31677,13 @@ lwj lwj lwj piw -yjk +oAY gHC uwT uwT uwT uwT -yjk +oAY pke xji sKP @@ -31918,7 +31912,7 @@ wJV wJV dfd sWY -yjk +oAY euz xyB uZC @@ -31927,26 +31921,26 @@ xyB xyB fNZ gcq -yjk +oAY hGt xfS xfS uwT tOF -yjk +oAY lKK lwj lwj lwj lwj ppZ -yjk +oAY pVN qXw ryh sFI tnP -yjk +oAY tNm tYP xji @@ -32175,7 +32169,7 @@ jeJ pPl dfd sWY -yjk +oAY ewW eQn jWO @@ -32184,7 +32178,7 @@ xji xji xji ghV -yjk +oAY hNH iDc jNr @@ -32197,19 +32191,19 @@ nty nKm lwj pqU -yjk -yjk +oAY +oAY qYw rWf sGi qYw -yjk -yjk +oAY +oAY dze ttR dze -yjk -yjk +oAY +oAY xRX xRX xRX @@ -32419,7 +32413,7 @@ xRX xRX xRX xRX -yjk +oAY oAY aaa ado @@ -32432,7 +32426,7 @@ azW aow dTw sWY -yjk +oAY ewZ xji jWO @@ -32441,20 +32435,20 @@ jWO xji xji gkc -yjk +oAY hQA iNo -yjk +oAY kqx sQT -yjk -yjk -yjk -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY +oAY +oAY +oAY xRX qYw siz @@ -32677,7 +32671,7 @@ xRX xRX xRX xRX -yjk +oAY sWY agx sWY @@ -32689,7 +32683,7 @@ aBD sWY sWY sWY -yjk +oAY exg eQn xji @@ -32711,7 +32705,7 @@ sKP nTM ofl pse -yjk +oAY xRX qYw smb @@ -32934,19 +32928,19 @@ xRX xRX xRX xRX -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY cNY bkQ cNY -yjk +oAY cTq dXB cNY -yjk +oAY ewZ jWO jWO @@ -32955,7 +32949,7 @@ jWO jWO jWO rkM -yjk +oAY hRJ iWp tUb @@ -32965,10 +32959,10 @@ gIX vxE naU nDn -yjk +oAY ofl pwR -yjk +oAY xRX qYw oJg @@ -33195,15 +33189,15 @@ xRX xRX xRX xRX -yjk -yjk -yjk +oAY +oAY +oAY tGy -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY ewW eQn xji @@ -33212,20 +33206,20 @@ jWO rCW jWO aSN -yjk -yjk -yjk -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY +oAY +oAY +oAY mtM -yjk -yjk +oAY +oAY tqn -yjk -yjk +oAY +oAY xRX rdB xRX @@ -33460,7 +33454,7 @@ xRX xRX xRX xRX -yjk +oAY eCI eTH xji @@ -33469,7 +33463,7 @@ eQn frn xji grI -yjk +oAY ina nsw xji @@ -33479,7 +33473,7 @@ hNy hNy lmS pcu -yjk +oAY xRX xRX xRX @@ -33717,16 +33711,16 @@ xRX xRX xRX xRX -yjk -yjk +oAY +oAY qtX qtX pjY qtX qtX -yjk -yjk -yjk +oAY +oAY +oAY hhf nsw xji @@ -33736,7 +33730,7 @@ xji xji xji tTZ -yjk +oAY xRX xRX xRX @@ -34239,14 +34233,14 @@ xRX xRX xRX xRX -yjk -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY +oAY tis -yjk -yjk +oAY +oAY mmq mwP fsa @@ -34503,7 +34497,7 @@ jbc dTd oge bYX -yjk +oAY xji fsa fsa @@ -34760,7 +34754,7 @@ fnS oYU kgv jWO -yjk +oAY xji nNA xji @@ -35017,11 +35011,11 @@ jbQ haL hLc kyw -yjk +oAY sOz gaY cwQ -yjk +oAY xRX xRX xRX @@ -35267,18 +35261,18 @@ xRX xRX xRX xRX -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY pxq -yjk -yjk -yjk -yjk +oAY +oAY +oAY +oAY nas -yjk -yjk +oAY +oAY xRX xRX xRX diff --git a/maps/away/ships/casino/casino.dmm b/maps/away/ships/casino/casino.dmm index e727095d347..879fb0f92d8 100644 --- a/maps/away/ships/casino/casino.dmm +++ b/maps/away/ships/casino/casino.dmm @@ -158,8 +158,7 @@ /area/casino/casino_bridge) "aH" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /obj/machinery/airlock_sensor{ frequency = 1380; @@ -285,7 +284,6 @@ id_tag = "casino_dock_airlock"; pixel_x = -24; pixel_y = 6; - req_access = null; tag_airpump = "casino_dock_pump"; tag_chamber_sensor = "casino_dock_sensor"; tag_exterior_door = "casino_dock_outer"; @@ -887,7 +885,6 @@ /area/casino/casino_security) "cD" = ( /obj/machinery/door/blast/regular/open{ - icon_state = "pdoor0"; id = "casino_shuttle_control" }, /obj/machinery/door/firedoor, @@ -1130,8 +1127,7 @@ /area/casino/casino_hangar) "dr" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/casino/casino_hangar) @@ -1466,7 +1462,6 @@ /area/casino/casino_security) "eB" = ( /obj/machinery/door/airlock/highsecurity{ - insecure = 0; name = "Safe area"; dir = 4 }, @@ -1495,15 +1490,13 @@ /area/casino/casino_hangar) "eG" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/casino/casino_hangar) "eH" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/structure/cable/green{ d1 = 1; @@ -1866,9 +1859,7 @@ /area/casino/casino_mainfloor) "fA" = ( /obj/machinery/door/blast/regular/open{ - density = 0; dir = 8; - icon_state = "pdoor0"; id = "casino_main" }, /obj/machinery/door/firedoor, @@ -2219,7 +2210,6 @@ frequency = 1438; id_tag = "casino_solar_airlock"; pixel_x = 24; - req_access = null; tag_airpump = "casino_solar_pump"; tag_chamber_sensor = "casino_solar_sensor"; tag_exterior_door = "casino_solar_outer"; @@ -2958,8 +2948,7 @@ /area/casino/casino_kitchen) "iH" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/structure/closet/emcloset, /obj/machinery/light/small{ @@ -2969,8 +2958,7 @@ /area/casino/casino_crew_atmos) "iI" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/empty, @@ -2978,8 +2966,7 @@ /area/casino/casino_crew_atmos) "iJ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/floodlight, /turf/simulated/floor/plating, @@ -3073,8 +3060,7 @@ /area/casino/casino_crew_atmos) "iY" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -3137,8 +3123,7 @@ /area/casino/casino_mainfloor) "ji" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -3261,7 +3246,6 @@ "ju" = ( /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; - icon_state = "map_injector"; use_power = 1 }, /turf/simulated/floor/airless, @@ -3304,8 +3288,7 @@ /area/casino/casino_crew_atmos) "jA" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3400,8 +3383,7 @@ /area/casino/casino_crew_atmos) "jO" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -3499,8 +3481,7 @@ /area/casino/casino_crew_atmos) "kb" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/plating, /area/casino/casino_crew_atmos) @@ -3578,8 +3559,7 @@ /area/casino/casino_mainfloor) "km" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/table/rack, /obj/item/wrench, @@ -3698,8 +3678,7 @@ /area/casino/casino_crew_atmos) "kE" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/table/rack, /obj/item/clothing/mask/gas, @@ -4529,7 +4508,6 @@ /area/casino/casino_bow) "mZ" = ( /obj/machinery/door/blast/regular/open{ - icon_state = "pdoor0"; id = "Starboard wide window BD" }, /obj/effect/map_effect/window_spawner/full/reinforced/grille, @@ -4863,9 +4841,7 @@ /area/shuttle/casino_cutter) "tp" = ( /obj/machinery/door/blast/regular/open{ - density = 0; dir = 8; - icon_state = "pdoor0"; id = "casino_main" }, /obj/machinery/door/firedoor, @@ -5089,9 +5065,7 @@ /area/casino/casino_mainfloor) "zL" = ( /obj/machinery/door/blast/regular/open{ - density = 0; dir = 8; - icon_state = "pdoor0"; id = "casino_main" }, /obj/machinery/door/firedoor, @@ -5197,9 +5171,7 @@ /area/casino/casino_mainfloor) "CL" = ( /obj/machinery/door/blast/regular/open{ - density = 0; dir = 8; - icon_state = "pdoor0"; id = "casino_main" }, /obj/machinery/door/firedoor, @@ -5211,9 +5183,7 @@ /area/casino/casino_mainfloor) "CO" = ( /obj/machinery/door/blast/regular/open{ - density = 0; dir = 8; - icon_state = "pdoor0"; id = "casino_main" }, /obj/machinery/door/firedoor, @@ -5513,9 +5483,7 @@ /area/casino/casino_bridge) "Mt" = ( /obj/machinery/door/blast/regular/open{ - density = 0; dir = 8; - icon_state = "pdoor0"; id = "casino_main" }, /obj/machinery/door/firedoor, @@ -5726,9 +5694,7 @@ /area/shuttle/casino_cutter) "QS" = ( /obj/machinery/door/blast/regular/open{ - density = 0; dir = 8; - icon_state = "pdoor0"; id = "casino_main" }, /obj/machinery/door/firedoor, @@ -5815,9 +5781,7 @@ /area/casino/casino_bow) "SL" = ( /obj/machinery/door/blast/regular/open{ - density = 0; dir = 8; - icon_state = "pdoor0"; id = "casino_main" }, /obj/machinery/door/firedoor, diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dm b/maps/away/ships/coc/coc_ranger/coc_ship.dm index 5d335af2584..afecd5c17d0 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dm @@ -118,7 +118,14 @@ invisible_until_ghostrole_spawn = TRUE /obj/effect/overmap/visitable/ship/ranger_corvette/New() - designation = "[pick("Nouvelle Rochelle", "Kuenoi", "Xansan", "Greentree", "Rautakaivos Kaupunki", "Dorshafen", "Inverkeithing", "Uusi Viipuri", "Horner Station", "Commander Ashia Patvardhan", "Sevaschaiv", "Rahe", "Czsari", "Suwon", "Kamoga", "Jagalaw", "Dalakyhr", "Gurmori", "Ohdker", "Dainshu", "Boch-Zivir", "Kill Emperor Boleslaw", "Expletive Sol", "Letter of Marque", "Free Fisanduh", "Gaucho", "Treaty of Xansan", "Pirates Beware", "Moroz Here We Come!", "This Ship Kills Privateers", "Lower The Black Flag", "Frontier Spirit", "Freedom", "Independence", "Self-Determination", "Let's Have A Second Collapse", "Send More Solarians", "You Can Run But You Can't Hide", "Frontier Alliance", "Here's To You, Governor Hawkins", "Remember Jamestown", "Good Riddance to Kambiz Entezam", "We're Coming For You In Hell, Terrence Hopper", "Warpway Safari Company", "Badlands Gun Club", "Light's Edge Light Foot", "Now Entering Free Xanu", "Weeping Stars, Weep No More", "Rebel's Reach Outreach Program", "Rugged Individualism", "Don't Tread On Me", "Snake In The Grass", "Konyang Yacht Club", "Ranger Ship")]" + designation = "[pick("Nouvelle Rochelle", "Kuenoi", "Xansan", "Greentree", "Rautakaivos Kaupunki", "Dorshafen", "Inverkeithing", "Uusi Viipuri", + "Horner Station", "Commander Ashia Patvardhan", "Sevaschaiv", "Rahe", "Czsari", "Suwon", "Kamoga", "Jagalaw", "Dalakyhr", "Gurmori", "Ohdker", + "Dainshu","Boch-Zivir", "Kill Emperor Boleslaw", "Expletive Sol", "Letter of Marque", "Free Fisanduh", "Gaucho", "Treaty of Xansan", "Pirates Beware", + "Moroz Here We Come!", "This Ship Kills Privateers", "Lower The Black Flag", "Frontier Spirit", "Freedom", "Independence", "Self-Determination", + "Let's Have A Second Collapse", "Send More Solarians", "You Can Run But You Can't Hide", "Frontier Alliance", "Here's To You, Governor Hawkins", "Remember Jamestown", + "Good Riddance to Kambiz Entezam", "We're Coming For You In Hell, Terrence Hopper", "Warpway Safari Company", "Badlands Gun Club", "Light's Edge Light Foot", + "Now Entering Free Xanu", "Weeping Stars, Weep No More", "Rebel's Reach Outreach Program", "Rugged Individualism", "Don't Tread On Me", "Snake In The Grass", + "Konyang Yacht Club", "Ranger Ship")]" ..() /obj/effect/overmap/visitable/ship/ranger_corvette/get_skybox_representation() diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm index 8fe958ecb5c..c13aee523ae 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm @@ -195,8 +195,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "coc_midship"; - name = "blast door" + id = "coc_midship" }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) @@ -278,8 +277,7 @@ }, /obj/structure/railing/mapped, /obj/machinery/computer/ship/helm{ - dir = 1; - req_access = null + dir = 1 }, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/bridge) @@ -377,7 +375,6 @@ }, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; frequency = 1394 }, @@ -421,18 +418,15 @@ "bsV" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - id = "coc_bridge"; - name = "blast door" + id = "coc_bridge" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "coc_bridge"; - name = "blast door" + id = "coc_bridge" }, /obj/machinery/door/airlock/glass_command{ - id_tag = null; name = "Bridge"; dir = 1; req_one_access = list(221,222) @@ -633,8 +627,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/carpet, /area/ship/ranger_corvette/foyer) @@ -680,7 +673,6 @@ "coK" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 8; - frequency = 1441; id_tag = "headmaster_co2_out_starboard" }, /obj/effect/map_effect/marker/large_tank{ @@ -722,8 +714,7 @@ /area/ship/ranger_corvette/gunnery) "cHm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/corner_wide/blue/diagonal, /turf/simulated/floor/tiled, @@ -957,8 +948,7 @@ /area/ship/ranger_corvette/engine1) "dMX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white, @@ -1612,8 +1602,7 @@ /area/ship/ranger_corvette/leader) "gkq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -1778,15 +1767,12 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/voidsuits) "gNW" = ( -/obj/effect/shuttle_landmark/ranger_corvette/nav3{ - name = "Ranger Gunboat - Starboard Side" - }, +/obj/effect/shuttle_landmark/ranger_corvette/nav3, /turf/template_noop, /area/space) "gOp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -1803,8 +1789,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "coc_midship"; - name = "blast door" + id = "coc_midship" }, /obj/machinery/door/airlock/service{ name = "Dormitory"; @@ -2021,8 +2006,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "coc_fore"; - name = "blast door" + id = "coc_fore" }, /obj/machinery/light{ dir = 8; @@ -2235,8 +2219,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "coc_fore"; - name = "blast door" + id = "coc_fore" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2637,8 +2620,7 @@ "kji" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -2684,8 +2666,7 @@ "kyh" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - id = "coc_bridge"; - name = "blast door" + id = "coc_bridge" }, /obj/effect/map_effect/window_spawner/full/shuttle{ color = "#5b5b5b"; @@ -2942,8 +2923,7 @@ dir = 4 }, /obj/machinery/computer/ship/helm{ - dir = 4; - req_access = null + dir = 4 }, /obj/effect/floor_decal/corner_wide/blue/diagonal, /turf/simulated/floor/tiled/dark, @@ -3008,12 +2988,10 @@ /obj/effect/floor_decal/corner/brown/diagonal, /obj/machinery/door/blast/regular/open{ dir = 2; - id = "coc_midship"; - name = "blast door" + id = "coc_midship" }, /obj/machinery/door/airlock/silver{ name = "Kitchen"; - req_access = null; dir = 4; req_one_access = list(221,222) }, @@ -3138,8 +3116,7 @@ /area/ship/ranger_corvette/telecomms) "muQ" = ( /obj/machinery/door/blast/regular/open{ - id = "coc_bridge"; - name = "blast door" + id = "coc_bridge" }, /obj/effect/landmark/entry_point/port{ name = "port, bridge" @@ -3671,9 +3648,7 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/ship/ranger_corvette/engineering) "oOX" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, @@ -4217,8 +4192,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal{ pixel_x = 13; @@ -4388,8 +4362,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/extinguisher_cabinet/east, /turf/simulated/floor/tiled/white, @@ -4515,8 +4488,7 @@ "rwS" = ( /mob/living/simple_animal/rat/white, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/structure/janitorialcart/full, /turf/simulated/floor/tiled/dark, @@ -4557,8 +4529,7 @@ /area/ship/ranger_corvette/gunnery) "rMA" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -4699,8 +4670,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ icon_state = "1-8" @@ -4757,7 +4727,6 @@ "sCd" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 20; frequency = 1394 }, @@ -4807,8 +4776,7 @@ "sJP" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - id = "coc_bridge"; - name = "blast door" + id = "coc_bridge" }, /obj/effect/landmark/entry_point/fore{ name = "fore, bridge" @@ -5157,8 +5125,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -5235,8 +5202,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/carpet/rubber, /area/ship/ranger_corvette/crew) @@ -5495,8 +5461,7 @@ /area/ship/ranger_corvette/crew) "unz" = ( /obj/machinery/door/blast/regular/open{ - id = "coc_bridge"; - name = "blast door" + id = "coc_bridge" }, /obj/effect/landmark/entry_point/starboard{ name = "starboard, bridge" @@ -5576,7 +5541,6 @@ /obj/machinery/access_button{ pixel_x = -23; pixel_y = 22; - dir = 2; frequency = 1394 }, /obj/effect/map_effect/marker_helper/airlock/interior, @@ -5668,8 +5632,7 @@ /area/ship/ranger_corvette/engineering) "uAk" = ( /obj/machinery/door/blast/regular/open{ - id = "coc_bridge"; - name = "blast door" + id = "coc_bridge" }, /obj/effect/map_effect/window_spawner/full/shuttle{ color = "#5b5b5b"; @@ -5683,8 +5646,7 @@ "uCz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/alarm/east{ @@ -5940,8 +5902,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -6114,8 +6075,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "coc_midship"; - name = "blast door" + id = "coc_midship" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6235,7 +6195,6 @@ "wHL" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 8; - pixel_y = 0; pixel_x = 20; frequency = 2137 }, @@ -6493,12 +6452,10 @@ }, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; frequency = 1395 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 20; frequency = 1395 }, diff --git a/maps/away/ships/coc/coc_scarab/coc_scarab.dmm b/maps/away/ships/coc/coc_scarab/coc_scarab.dmm index 74bdc109a14..b616776158c 100644 --- a/maps/away/ships/coc/coc_scarab/coc_scarab.dmm +++ b/maps/away/ships/coc/coc_scarab/coc_scarab.dmm @@ -381,9 +381,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 2 - }, +/obj/structure/disposalpipe/junction, /obj/structure/sign/directions/prop{ pixel_x = 32; pixel_y = 4; @@ -419,7 +417,6 @@ dir = 10 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor, @@ -475,7 +472,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/sign/directions/cryo{ @@ -2932,7 +2928,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/dark, @@ -4822,7 +4817,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/junction{ - dir = 2; icon_state = "pipe-j2" }, /turf/simulated/floor/plating, @@ -10055,7 +10049,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/dark/full, diff --git a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm index 9f8d168dcc5..e75ad87b7c4 100644 --- a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm +++ b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm @@ -626,8 +626,7 @@ dir = 5 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/tiled/white, /area/coc_survey_ship/research) @@ -719,8 +718,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable{ icon_state = "2-4" @@ -904,8 +902,7 @@ /area/coc_survey_ship/kitchen) "iB" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/cable{ icon_state = "1-2" @@ -945,8 +942,7 @@ icon_state = "1-2" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/tiled/white, /area/coc_survey_ship/research) @@ -1213,8 +1209,7 @@ /area/coc_survey_ship/blaster) "lm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -1233,12 +1228,10 @@ }, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -2074,8 +2067,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ @@ -2159,9 +2151,7 @@ /turf/simulated/floor/tiled/white, /area/coc_survey_ship/medical) "sQ" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, @@ -2377,8 +2367,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable{ icon_state = "1-2" @@ -3254,12 +3243,10 @@ landmark_tag = "nav_coc_surveyor_dock_starboard" }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = 6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -3468,9 +3455,7 @@ /turf/simulated/floor/tiled/dark, /area/coc_survey_ship/cargo) "CW" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/structure/lattice/catwalk, /obj/structure/bed/handrail{ dir = 1 @@ -3780,8 +3765,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 6 @@ -3821,8 +3805,7 @@ "FM" = ( /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /obj/machinery/power/terminal{ dir = 8 @@ -3911,8 +3894,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable{ icon_state = "1-2" @@ -4471,7 +4453,6 @@ /area/coc_survey_ship/anomaly) "KQ" = ( /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28 }, /obj/effect/map_effect/marker/airlock/shuttle{ @@ -4960,8 +4941,7 @@ /area/coc_survey_ship/bridge) "Pk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -5103,8 +5083,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/door/airlock/external{ dir = 4 @@ -5344,8 +5323,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable{ icon_state = "1-2" @@ -5758,9 +5736,7 @@ /obj/structure/bed/handrail{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/effect/map_effect/marker/airlock/shuttle{ shuttle_tag = "COC Survey Shuttle"; master_tag = "surveyor_shuttle"; @@ -6219,8 +6195,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ diff --git a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm index a2ab6e6a400..85a89bd4e81 100644 --- a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm +++ b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm @@ -879,8 +879,7 @@ /area/ship/gadpathur_patrol/sit_room) "hW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -1295,8 +1294,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/lattice/catwalk/indoor, /turf/simulated/floor, @@ -1800,8 +1798,7 @@ /area/ship/gadpathur_patrol/cell) "oO" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor/reinforced, /area/ship/gadpathur_patrol/reactor) @@ -2082,9 +2079,7 @@ /turf/simulated/floor, /area/ship/gadpathur_patrol/engineering) "qU" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/condiment/enzyme, @@ -2543,8 +2538,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /obj/machinery/airlock_sensor/airlock_exterior{ dir = 8; @@ -2579,8 +2573,7 @@ /obj/effect/floor_decal/corner/blue/diagonal, /obj/machinery/light/small/floor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -2595,8 +2588,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, @@ -3166,8 +3158,7 @@ pixel_y = 20 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor, /area/ship/gadpathur_patrol/thrusters/starboard) @@ -3193,7 +3184,6 @@ /area/ship/gadpathur_patrol/hangar) "zy" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "co2_out"; dir = 4 }, @@ -3752,8 +3742,7 @@ /area/ship/gadpathur_patrol/crew_prep) "Dl" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/machinery/alarm/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3991,8 +3980,7 @@ /area/shuttle/gadpathur_shuttle) "Fb" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /obj/structure/reagent_dispensers/coolanttank, /obj/effect/floor_decal/industrial/outline/blue, @@ -4365,8 +4353,7 @@ }, /obj/effect/floor_decal/corner_wide/brown/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -5001,8 +4988,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/carpet/rubber, /area/shuttle/gadpathur_shuttle) @@ -5966,8 +5952,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -6167,8 +6152,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable{ icon_state = "4-8" diff --git a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm index 45687549dae..f438a8f9b06 100644 --- a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm +++ b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm @@ -17,9 +17,7 @@ /turf/template_noop, /area/ship/dominian_corvette/exterior) "aay" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/ship/dominian_corvette/eva) "aaJ" = ( @@ -47,18 +45,13 @@ /area/ship/dominian_corvette/franny) "acd" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_corvette/engineering/reactor) "acm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-8" }, @@ -361,8 +354,7 @@ icon_state = "0-4" }, /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 @@ -459,12 +451,8 @@ /turf/simulated/wall/shuttle/space_ship, /area/ship/dominian_corvette/janitor) "bjw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -681,12 +669,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_corvette) "bOQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -712,9 +696,7 @@ /turf/template_noop, /area/ship/dominian_corvette/exterior) "cbY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-4" }, @@ -817,7 +799,6 @@ "cpy" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 8; - frequency = 1441; id_tag = "dominia_co2_in_port" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -918,9 +899,7 @@ /turf/simulated/floor/plating, /area/ship/dominian_corvette) "cBV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/ship/dominian_corvette/eva) "cFv" = ( @@ -1349,12 +1328,8 @@ /obj/machinery/alarm/west{ req_one_access = list(212) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -1378,8 +1353,7 @@ pixel_x = -20 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/effect/floor_decal/corner/paleblue/full, /turf/simulated/floor/tiled/white, @@ -1640,12 +1614,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/ship/dominian_corvette/engineering/reactor) @@ -1785,7 +1755,6 @@ "fNe" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 8; - frequency = 1441; id_tag = "dominia_co2_out_starboard" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -1799,9 +1768,7 @@ }, /area/shuttle/dominian_shuttle) "fQd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -1906,12 +1873,8 @@ /turf/simulated/floor/carpet/rubber, /area/ship/dominian_corvette/cic) "gtJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -1969,12 +1932,8 @@ id = "dominian_corvette_midship" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -2137,8 +2096,7 @@ "hhf" = ( /obj/structure/table/rack, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/effect/floor_decal/industrial/outline/red, /obj/item/ship_ammunition/lammergeier, @@ -2399,9 +2357,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -2667,12 +2623,8 @@ name = "Ensign's Quarters"; req_access = list(212) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -2680,12 +2632,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_corvette/officer) "iWe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_corvette) "iWi" = ( @@ -2796,8 +2744,7 @@ dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/marble/dark, /area/ship/dominian_corvette/temple) @@ -2832,9 +2779,7 @@ /obj/effect/floor_decal/corner{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -2855,12 +2800,10 @@ }, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -3094,9 +3037,7 @@ /turf/simulated/floor/plating, /area/ship/dominian_corvette/propulsion/port) "kze" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3276,9 +3217,7 @@ /turf/simulated/wall, /area/ship/dominian_corvette/propulsion) "kRG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -3476,12 +3415,8 @@ id = "dominian_corvette_temple" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -3609,9 +3544,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, @@ -3736,12 +3669,8 @@ name = "Surgical Suite"; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -3931,9 +3860,7 @@ /turf/simulated/floor/tiled/white, /area/ship/dominian_corvette/head) "nnQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -4029,12 +3956,8 @@ name = "Atmospherics"; req_access = list(212) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -4266,9 +4189,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -4408,12 +4329,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor/noid, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_corvette/engineering) @@ -4659,12 +4576,8 @@ /turf/simulated/floor/marble/dark, /area/ship/dominian_corvette/temple) "qaN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/light, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -4738,8 +4651,7 @@ /area/ship/dominian_corvette/bridge) "qnr" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/structure/cable{ d1 = 4; @@ -4904,9 +4816,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/power/apc/west{ req_access = list(212) }, @@ -5133,8 +5043,7 @@ }, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_corvette/docking) @@ -5496,9 +5405,7 @@ /turf/simulated/wall/shuttle/space_ship, /area/ship/dominian_corvette/engineering) "tqI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -5527,12 +5434,10 @@ master_tag = "airlock_dominian_corvette_dock_port" }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -5677,12 +5582,8 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/dominian_corvette/hangar) "tOE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -5918,9 +5819,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -5983,8 +5882,7 @@ /obj/machinery/door/airlock/external, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 @@ -6125,9 +6023,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/floor_decal/corner/paleblue/full, /turf/simulated/floor/tiled/white, /area/ship/dominian_corvette/infirmary) diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm index b6cb0e24a28..5743c67def2 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm @@ -51,9 +51,7 @@ /turf/template_noop, /area/ship/dominian_science_vessel/armory) "alp" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock{ master_tag = "portext" }, @@ -491,8 +489,7 @@ /area/ship/dominian_science_vessel/center_hall) "bpq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -810,8 +807,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -853,8 +849,7 @@ req_one_access = null }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/port_hall) @@ -1056,9 +1051,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/quarters) "dnN" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock{ master_tag = "portext" }, @@ -1370,8 +1363,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/table/steel, /obj/item/wrench{ @@ -1764,8 +1756,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker/airlock/shuttle{ master_tag = "airlock_dominian_science_shuttle"; @@ -1827,8 +1818,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker/airlock/shuttle{ master_tag = "airlock_dominian_science_shuttle"; @@ -2197,9 +2187,7 @@ /turf/simulated/floor/wood, /area/ship/dominian_science_vessel/officer) "hcG" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock{ master_tag = "portext" }, @@ -2228,8 +2216,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/armory) @@ -2835,8 +2822,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -2997,8 +2983,7 @@ /area/ship/dominian_science_vessel/engineering) "jzp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/wall/shuttle, /area/ship/dominian_science_vessel/atmospherics) @@ -3093,7 +3078,6 @@ "kam" = ( /obj/structure/sink/kitchen{ dir = 8; - pixel_y = 0; pixel_x = 21; name = "surgical sink" }, @@ -3184,7 +3168,6 @@ name = "airlock_dominian_science_dock_port" }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 20; pixel_x = -6 }, @@ -3403,9 +3386,7 @@ "kXV" = ( /obj/effect/floor_decal/corner/yellow/full, /obj/structure/table/steel, -/obj/machinery/cell_charger{ - pixel_y = 0 - }, +/obj/machinery/cell_charger, /obj/item/blueprints, /obj/item/pen/drafting, /turf/simulated/floor/tiled/dark, @@ -3733,8 +3714,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -4251,8 +4231,7 @@ /area/shuttle/dominian_science_shuttle) "oiZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -4408,8 +4387,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/armory) @@ -4591,8 +4569,7 @@ /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/aft_dock) @@ -4651,8 +4628,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/armory) @@ -4707,8 +4683,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/armory) @@ -4733,9 +4708,7 @@ /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) "pNy" = ( -/obj/machinery/cryopod{ - dir = 8 - }, +/obj/machinery/cryopod, /obj/machinery/computer/cryopod{ pixel_x = 28; pixel_y = -6 @@ -4904,8 +4877,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -5993,9 +5965,7 @@ /turf/simulated/floor/plating, /area/ship/dominian_science_vessel/aft_dock) "uDy" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock{ master_tag = "portext" }, @@ -6026,8 +5996,7 @@ /area/ship/dominian_science_vessel/atmospherics) "uGG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -6044,7 +6013,6 @@ /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = 28; - dir = 2; pixel_y = 28 }, /turf/simulated/floor/plating, @@ -7176,8 +7144,7 @@ "xXN" = ( /obj/machinery/door/window/northleft, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/plating, /area/shuttle/dominian_science_shuttle) diff --git a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm index 8b0b9b4d238..24de58b0bab 100644 --- a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm +++ b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm @@ -22,8 +22,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/corner/white{ dir = 10 @@ -415,12 +414,10 @@ dir = 6 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/item/ship_ammunition/lammergeier, /turf/simulated/floor/tiled/dark, @@ -432,8 +429,7 @@ "dr" = ( /obj/structure/ship_weapon_dummy, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/plating, /area/ship/dominian_unathi/gun) @@ -528,8 +524,7 @@ }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/machinery/door/window{ dir = 8 @@ -733,8 +728,7 @@ "fz" = ( /obj/structure/ship_weapon_dummy, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/plating, /area/ship/dominian_unathi/gun) @@ -1068,8 +1062,7 @@ /obj/item/clothing/suit/space/void/hegemony/captain, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/loot) @@ -1226,9 +1219,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/chapel) "jA" = ( -/obj/machinery/vending/tool{ - req_access = null - }, +/obj/machinery/vending/tool, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/engineering) "jE" = ( @@ -1239,8 +1230,7 @@ dir = 10 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, @@ -1753,8 +1743,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, @@ -1901,8 +1890,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/plating, /area/ship/dominian_unathi/hangar) @@ -1913,8 +1901,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/corner/green/diagonal, /obj/structure/table/standard, @@ -2200,8 +2187,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/starboardhall) @@ -2536,8 +2522,7 @@ /area/ship/dominian_unathi/pods) "rV" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/effect/floor_decal/corner/orange{ dir = 5 @@ -2861,8 +2846,7 @@ }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/loot) @@ -2899,8 +2883,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/cic) @@ -3049,8 +3032,7 @@ }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/loot) @@ -3349,8 +3331,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/eva) @@ -3396,8 +3377,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_unathi) @@ -3710,12 +3690,10 @@ }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -4284,8 +4262,7 @@ dir = 10 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -4440,8 +4417,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/light{ dir = 1 @@ -4510,8 +4486,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -4615,8 +4590,7 @@ /area/ship/dominian_unathi/starboardthrust) "Fv" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/shuttle/dominian_unathi) @@ -4664,8 +4638,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/door/window{ dir = 4; @@ -4677,8 +4650,7 @@ "FK" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/white, /area/ship/dominian_unathi/med) @@ -5384,8 +5356,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, @@ -7271,8 +7242,7 @@ /area/ship/dominian_unathi/bridge) "XD" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/bridgefoyer) @@ -7558,8 +7528,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/access_button{ pixel_x = -24; @@ -7654,8 +7623,7 @@ }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/loot) @@ -7689,8 +7657,7 @@ dir = 10 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm index b5cd30fbb79..4c99c271a1b 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm @@ -3,8 +3,7 @@ /obj/structure/table/rack, /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -28,8 +27,7 @@ /obj/structure/table/rack, /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/item/ship_ammunition/francisca, /obj/item/ship_ammunition/francisca, @@ -50,12 +48,10 @@ /obj/structure/table/rack, /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/item/ship_ammunition/francisca, /obj/item/ship_ammunition/francisca, @@ -76,8 +72,7 @@ /obj/structure/table/rack, /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -101,8 +96,7 @@ /obj/structure/table/rack, /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/item/ship_ammunition/francisca, /obj/item/ship_ammunition/francisca, @@ -123,12 +117,10 @@ /obj/structure/table/rack, /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/item/ship_ammunition/francisca/ap, /obj/item/ship_ammunition/francisca/ap, @@ -569,8 +561,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/simulated/floor/reinforced/airless, /area/hailstorm_ship/gun_deck/second) @@ -751,8 +742,7 @@ /area/hailstorm_ship/crew) "cS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -966,8 +956,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -1072,8 +1061,7 @@ /area/hailstorm_ship/bridge) "fk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -1311,8 +1299,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/machinery/door/window/southleft, /obj/structure/cable/green{ @@ -1345,8 +1332,7 @@ req_access = list(214) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/random/dirt_75, /turf/simulated/floor/tiled{ @@ -1380,8 +1366,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/overmap/visitable/ship/hailstorm_ship, /turf/simulated/floor/tiled{ @@ -1593,8 +1578,7 @@ dir = 5 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/ship_weapon/francisca{ pixel_x = -64; @@ -1839,8 +1823,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled{ @@ -1928,8 +1911,7 @@ "lT" = ( /obj/structure/ship_weapon_dummy, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/reinforced/airless, /area/hailstorm_ship/gun_deck) @@ -1990,8 +1972,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -2036,8 +2017,7 @@ /area/hailstorm_ship/engine) "mO" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/cable/green{ d1 = 4; @@ -2092,8 +2072,7 @@ dir = 9 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -2121,8 +2100,7 @@ dir = 5 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/ship_weapon/francisca{ pixel_x = -64; @@ -2249,8 +2227,7 @@ /area/hailstorm_ship/armory) "oO" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /turf/template_noop, /area/space) @@ -2395,8 +2372,7 @@ /area/hailstorm_ship/engine) "re" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -2626,8 +2602,7 @@ /area/hailstorm_ship/engine) "ux" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/black, @@ -2755,8 +2730,7 @@ "wm" = ( /obj/machinery/pipedispenser/disposal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating{ @@ -2877,8 +2851,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -2902,8 +2875,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/random/dirt_75, /turf/simulated/floor/tiled{ @@ -2912,8 +2884,7 @@ /area/hailstorm_ship/gun_deck/second) "yj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -2924,8 +2895,7 @@ /area/hailstorm_ship/engine) "yr" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -3089,8 +3059,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/light{ dir = 1 @@ -3200,8 +3169,7 @@ /area/hailstorm_ship/engineering) "DD" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - dir = 8; - frequency = 1441 + dir = 8 }, /obj/machinery/air_sensor{ pixel_y = -16 @@ -3425,8 +3393,7 @@ "Fx" = ( /obj/structure/ship_weapon_dummy, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/reinforced/airless, /area/hailstorm_ship/gun_deck/second) @@ -3619,8 +3586,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -3667,8 +3633,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -3716,8 +3681,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -3793,8 +3757,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -3816,8 +3779,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/light, /turf/simulated/floor/tiled{ @@ -3832,8 +3794,7 @@ /area/shuttle/hailstorm_shuttle) "Lr" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -3978,8 +3939,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -4053,8 +4013,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/power/apc/high/north{ req_access = list(214) @@ -4112,8 +4071,7 @@ }, /obj/effect/floor_decal/industrial/loading/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4140,8 +4098,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -4479,8 +4436,7 @@ /area/hailstorm_ship) "Up" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/ammunition_loader/francisca{ weapon_id = "Hailstorm Port Gun" @@ -4659,8 +4615,7 @@ /area/hailstorm_ship/engineering) "VR" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ d2 = 8; @@ -4880,8 +4835,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -4902,8 +4856,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 diff --git a/maps/away/ships/einstein/ee_spy_ship.dmm b/maps/away/ships/einstein/ee_spy_ship.dmm index 02b20f9cd30..a16e94d0124 100644 --- a/maps/away/ships/einstein/ee_spy_ship.dmm +++ b/maps/away/ships/einstein/ee_spy_ship.dmm @@ -8,8 +8,7 @@ /area/ship/ee_spy_ship) "aab" = ( /obj/machinery/computer/shuttle_control/explore/ee_shuttle{ - dir = 4; - req_access = list(205) + dir = 4 }, /turf/simulated/floor/shuttle/black, /area/shuttle/ee_shuttle) @@ -117,7 +116,7 @@ /area/ship/ee_spy_ship) "aJd" = ( /obj/machinery/atmospherics/binary/pump/high_power{ - dir = 1; + dir = 1 }, /turf/simulated/floor, /area/ship/ee_spy_ship) @@ -173,9 +172,6 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/ee_spy_ship) -"bgV" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/shuttle/ee_shuttle) "bkQ" = ( /obj/structure/dispenser/oxygen, /turf/simulated/floor/tiled/dark, @@ -499,7 +495,7 @@ /area/ship/ee_spy_ship) "hdb" = ( /obj/machinery/atmospherics/portables_connector{ - dir = 8; + dir = 8 }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor, @@ -842,8 +838,7 @@ /turf/simulated/wall/shuttle/space_ship, /area/ship/ee_spy_ship) "ofY" = ( -/obj/machinery/atmospherics/portables_connector{ - }, +/obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/shuttle/black, /area/shuttle/ee_shuttle) @@ -1298,9 +1293,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/ee_shuttle) -"yjk" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/ship/ee_spy_ship) (1,1,1) = {" xRX @@ -30936,12 +30928,12 @@ xRX xRX xRX xRX -yjk -yjk -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe +kwe +kwe xRX xRX xRX @@ -31198,19 +31190,19 @@ aou aHw eCV mkb -yjk -yjk -yjk +kwe +kwe +kwe nWf -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe iXb -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe xRX xRX xRX @@ -31455,33 +31447,33 @@ aHt aJd aHv mkb -yjk +kwe sBA xQS xQS sBA sBA -yjk +kwe epw xQS aaJ cVA dQZ -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe uyM -yjk -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe +kwe aMY -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe xRX xRX xRX @@ -31712,25 +31704,25 @@ aHv aOU mkb mkb -yjk +kwe vUu xQS sBA xQS cMo -yjk +kwe hhf pJZ -yjk +kwe cVA cVA -yjk -yjk +kwe +kwe iaK aSm aSN iGK -yjk +kwe piw uaE xbK @@ -31738,7 +31730,7 @@ xbK xbK xbK fVv -yjk +kwe xRX xRX xRX @@ -31964,30 +31956,30 @@ xRX xRX xRX xRX -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe hiw -yjk +kwe xQS sBA xQS xQS sBA -yjk +kwe xQS xQS kwe -yjk -yjk -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe +kwe +kwe aSN huE -yjk +kwe nVi xbK xbK @@ -31995,7 +31987,7 @@ nty cLC xbK aMB -yjk +kwe xRX xRX xRX @@ -32223,28 +32215,28 @@ xRX xRX xRX xRX -yjk +kwe eIb kpR -yjk +kwe vUu xQS xQS sBA ufp -yjk +kwe xQS xQS wXi xQS xQS atj -yjk +kwe lFg aSN aSN bcf -yjk +kwe buK uaE xbK @@ -32252,8 +32244,8 @@ pXP gLO xbK xbK -yjk -yjk +kwe +kwe xRX xRX xRX @@ -32480,28 +32472,28 @@ xRX xRX xRX xRX -yjk +kwe eTH mkb -yjk +kwe sBA xQS xQS xQS xQS -yjk +kwe xQS xQS wXi xQS xQS awG -yjk +kwe ogz aSN aSN hBd -yjk +kwe xbK xbK xbK @@ -32510,7 +32502,7 @@ xbK xbK xbK pBl -yjk +kwe nzr xRX xRX @@ -32737,28 +32729,28 @@ xRX xRX xRX xRX -yjk +kwe fnY mkb -yjk +kwe sBA sBA sBA fBb xQS -yjk +kwe xQS xQS wXi xQS xQS aEq -yjk +kwe ogz mLa aSN buA -yjk +kwe xbK xbK xbK @@ -32767,10 +32759,10 @@ xbK xbK dHA aCd -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe xRX xRX xRX @@ -32994,14 +32986,14 @@ xRX xRX xRX xRX -yjk +kwe vxN mkb -yjk -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe +kwe fZq kwe eYX @@ -33010,21 +33002,21 @@ aEB xQS xQS bkQ -yjk -yjk -yjk +kwe +kwe +kwe fQq -yjk -yjk -yjk +kwe +kwe +kwe lhC -yjk -yjk -yjk -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe +kwe +kwe +kwe mwP tCH pAh @@ -33251,10 +33243,10 @@ xRX xRX xRX xRX -yjk +kwe fnY mkb -yjk +kwe xQS xQS xQS @@ -33268,7 +33260,7 @@ xQS xQS xQS mET -yjk +kwe pYB wUJ wUJ @@ -33281,7 +33273,7 @@ wUJ wUJ wUJ wUJ -yjk +kwe eYX xQS rdB @@ -33765,10 +33757,10 @@ xRX xRX xRX xRX -yjk +kwe dqJ mkb -yjk +kwe mEc xQS xQS @@ -33782,7 +33774,7 @@ xQS xQS xQS xQS -yjk +kwe uxz wUJ wUJ @@ -33795,7 +33787,7 @@ oNi fRD wUJ dfe -yjk +kwe pwR xQS iOV @@ -34022,10 +34014,10 @@ xRX xRX xRX xRX -yjk +kwe eMT mkb -yjk +kwe mPM wBq wBq @@ -34039,20 +34031,20 @@ wBq wBq wBq qHm -yjk +kwe cYw oNi wUJ kfX kfX -yjk -yjk +kwe +kwe wji -yjk -yjk +kwe +kwe krH -yjk -yjk +kwe +kwe gcq tra pAh @@ -34279,10 +34271,10 @@ xRX xRX xRX xRX -yjk +kwe eMT mkb -yjk +kwe ntt xoc xoc @@ -34296,23 +34288,23 @@ xoc xoc xoc kzm -yjk -yjk -yjk +kwe +kwe +kwe hZq -yjk -yjk -yjk +kwe +kwe +kwe uCl xbK -yjk +kwe kPs xbK cTq -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe xRX xRX xRX @@ -34536,13 +34528,13 @@ xRX xRX xRX xRX -yjk +kwe eMT mkb -yjk +kwe mjR xoc -bgV +xoc aab hBs inf @@ -34553,20 +34545,20 @@ pDZ ajL cQs aow -yjk +kwe wUJ frC wUJ kaR uWn -yjk +kwe uNN wLs -yjk +kwe kAt xbK wLs -yjk +kwe lri xRX xRX @@ -34793,10 +34785,10 @@ xRX xRX xRX xRX -yjk +kwe gyl kpR -yjk +kwe rtf wZf xPN @@ -34810,20 +34802,20 @@ wfy ajL xUv aow -yjk +kwe exg kqx wUJ wUJ eiL -yjk +kwe nDn xbK -yjk +kwe lwj jEu vMq -yjk +kwe xRX xRX xRX @@ -35048,15 +35040,15 @@ xRX xRX xRX xRX -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe hiw -yjk +kwe rtf xoc -bgV +xoc iiZ rNp uYP @@ -35067,20 +35059,20 @@ wCo ajL cQs aow -yjk +kwe wUJ wUJ wUJ wUJ wUJ -yjk +kwe hQA xbK -yjk -yjk +kwe +kwe fif -yjk -yjk +kwe +kwe xRX xRX xRX @@ -35310,9 +35302,9 @@ aou aSi gHC mkb -yjk +kwe szY -bgV +xoc xoc xoc xoc @@ -35324,16 +35316,16 @@ xoc xoc xoc kzm -yjk +kwe wUJ wUJ wUJ wUJ kfX -yjk +kwe nDn wLs -yjk +kwe xRX xRX xRX @@ -35567,7 +35559,7 @@ aHt aJd aou mkb -yjk +kwe vdz aHs aHs @@ -35581,16 +35573,16 @@ aHs aHs aHs ewW -yjk +kwe tpL wUJ wUJ wUJ fNZ -yjk +kwe hQA xbK -yjk +kwe xRX xRX xRX @@ -35824,7 +35816,7 @@ aHv aSJ hdb mkb -yjk +kwe vwF vwF vwF @@ -35838,16 +35830,16 @@ vwF vwF vwF vwF -yjk +kwe euz spX irX eiR kfX -yjk -yjk +kwe +kwe epB -yjk +kwe xRX xRX xRX @@ -36076,12 +36068,12 @@ xRX xRX xRX xRX -yjk -yjk -yjk -yjk -yjk -yjk +kwe +kwe +kwe +kwe +kwe +kwe xRX xRX xRX @@ -36095,13 +36087,13 @@ xRX xRX xRX xRX -yjk -yjk +kwe +kwe pAh buM pRO pAh -yjk +kwe xRX xRX xRX diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm index 3d55062c1e3..9209d277d02 100644 --- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm +++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm @@ -496,8 +496,7 @@ /area/ship/elyran_corvette/captain) "co" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -651,8 +650,7 @@ }, /obj/structure/bed/stool/chair/office/bridge/generic, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/carpet/rubber, /area/ship/elyran_corvette/starboardwep) @@ -714,7 +712,6 @@ "dE" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 4; - frequency = 1441; id_tag = "elyra_co2_out_port" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -738,8 +735,7 @@ "dV" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, @@ -822,8 +818,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/plating, /area/ship/elyran_corvette/starboardhallway) @@ -1198,8 +1193,7 @@ }, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /turf/simulated/floor/marble/dark, /area/ship/elyran_corvette/prayerhall) @@ -1747,8 +1741,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/effect/floor_decal/corner/brown{ dir = 6 @@ -2094,7 +2087,6 @@ /area/shuttle/elyran_shuttle) "kZ" = ( /obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null; anchored = 1 }, /obj/item/reagent_containers/food/snacks/meat, @@ -2378,8 +2370,7 @@ }, /obj/structure/bed/stool/chair/office/bridge/generic, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/carpet/rubber, /area/ship/elyran_corvette/portwep) @@ -2725,8 +2716,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable{ d1 = 4; @@ -4274,8 +4264,7 @@ /area/ship/elyran_corvette/starboardwep) "xT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -5358,8 +5347,7 @@ }, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 0 + icon_state = "0-2" }, /obj/effect/floor_decal/corner/brown{ dir = 6 @@ -6643,7 +6631,6 @@ "Ls" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 8; - frequency = 1441; id_tag = "elyra_co2_out_starboard" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -7052,8 +7039,7 @@ /area/ship/elyran_corvette/captain) "NG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/wall/shuttle/space_ship, /area/shuttle/elyran_shuttle) @@ -8566,8 +8552,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -8792,8 +8777,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 diff --git a/maps/away/ships/freebooter/freebooter_ship_.dmm b/maps/away/ships/freebooter/freebooter_ship_.dmm index dbd97ccb091..4b77797077e 100644 --- a/maps/away/ships/freebooter/freebooter_ship_.dmm +++ b/maps/away/ships/freebooter/freebooter_ship_.dmm @@ -105,8 +105,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -760,8 +759,7 @@ /area/shuttle/freebooter_shuttle) "caS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/foyer) @@ -848,7 +846,6 @@ "cCu" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -1478,9 +1475,7 @@ icon_state = "lattice"; name = "lattice" }, -/obj/machinery/light/small/emergency{ - dir = 2 - }, +/obj/machinery/light/small/emergency, /turf/simulated/floor, /area/ship/freebooter_ship/engineering) "fro" = ( @@ -1648,8 +1643,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable{ icon_state = "2-4" @@ -2954,8 +2948,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable{ icon_state = "1-2" @@ -3376,8 +3369,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/forehallwayport) @@ -3769,8 +3761,7 @@ /area/ship/freebooter_ship/thruster2) "oIl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -4100,8 +4091,7 @@ "pQc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -4332,8 +4322,7 @@ /area/ship/freebooter_ship/thruster1) "qHK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -4432,7 +4421,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 1; frequency = 1336; - icon_state = "map_injector"; id = "freebooter_thrust_in" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -4585,8 +4573,7 @@ /area/shuttle/freebooter_shuttle) "rzB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -4710,8 +4697,7 @@ "rMx" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - id = "junker_bridge"; - name = "blast door" + id = "junker_bridge" }, /obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ spawn_firedoor = 1; @@ -4931,8 +4917,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "junker_bridge"; - name = "blast door" + id = "junker_bridge" }, /turf/simulated/floor, /area/ship/freebooter_ship/bridge) @@ -5635,8 +5620,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -5758,7 +5742,6 @@ master_tag = "freebooter_port_2" }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -5904,8 +5887,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "junker_bridge"; - name = "blast door" + id = "junker_bridge" }, /obj/effect/landmark/entry_point/fore{ name = "fore, bridge" @@ -6473,8 +6455,7 @@ pixel_x = -1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 diff --git a/maps/away/ships/freebooter/freebooter_ship_submaps.dmm b/maps/away/ships/freebooter/freebooter_ship_submaps.dmm index 3e0f12d64bc..b8e467b1555 100644 --- a/maps/away/ships/freebooter/freebooter_ship_submaps.dmm +++ b/maps/away/ships/freebooter/freebooter_ship_submaps.dmm @@ -204,8 +204,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/pod3) @@ -1253,8 +1252,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/tiled/white, /area/ship/freebooter_ship/pod7) @@ -1640,8 +1638,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, @@ -1791,8 +1788,7 @@ icon_state = "tube_empty" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/pod6) @@ -1806,9 +1802,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/pod2) "kzm" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, @@ -2084,8 +2078,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/pod1) @@ -2136,8 +2129,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable{ icon_state = "0-8" @@ -2312,8 +2304,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/pod6) @@ -2375,8 +2366,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/pod3) @@ -2477,8 +2467,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/light{ dir = 1; @@ -2707,8 +2696,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/item/ipc_overloader/rainbow{ uses = 0 @@ -2789,7 +2777,6 @@ "pRO" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - name = "blast door"; id = "hab_module" }, /obj/effect/map_effect/window_spawner/full/shuttle{ @@ -3001,8 +2988,7 @@ "qDn" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/pod4) @@ -3044,8 +3030,7 @@ name = "lattice" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -3102,8 +3087,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, @@ -3997,8 +3981,7 @@ /area/ship/freebooter_ship/pod7) "xPX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 diff --git a/maps/away/ships/golden_deep/golden_deep_merchant.dmm b/maps/away/ships/golden_deep/golden_deep_merchant.dmm index b41d9f01aa2..f76d292503f 100644 --- a/maps/away/ships/golden_deep/golden_deep_merchant.dmm +++ b/maps/away/ships/golden_deep/golden_deep_merchant.dmm @@ -64,8 +64,7 @@ /area/shuttle/golden_deep) "aZ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating/cooled, @@ -225,8 +224,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -436,8 +434,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/plating/cooled, /area/golden_deep/engineering) @@ -854,8 +851,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -1105,8 +1101,7 @@ /area/golden_deep/dock) "kN" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/gold, /area/shuttle/golden_deep) @@ -1179,8 +1174,7 @@ /area/golden_deep/atmos) "lo" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/plating, /area/golden_deep/starboardprop) @@ -1213,8 +1207,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 9 @@ -1245,8 +1238,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -1430,8 +1422,7 @@ /area/golden_deep/dock) "mY" = ( /obj/machinery/computer/ship/helm{ - dir = 4; - req_access = null + dir = 4 }, /turf/simulated/floor/gold, /area/shuttle/golden_deep) @@ -1473,8 +1464,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -1515,8 +1505,7 @@ /area/golden_deep/custodial) "oc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/door/airlock/external, /obj/machinery/access_button{ @@ -1963,12 +1952,10 @@ id = "golden_deep" }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/plating, /area/golden_deep/office) @@ -2030,8 +2017,7 @@ /area/golden_deep/atmos) "tH" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/gold, /area/golden_deep/hangar) @@ -2364,8 +2350,7 @@ /obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = -28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/effect/map_effect/marker/airlock/shuttle{ master_tag = "airlock_golden_shuttle"; @@ -2614,8 +2599,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -2701,8 +2685,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/plating/cooled, /area/golden_deep/engineering) @@ -2882,8 +2865,7 @@ /area/golden_deep/dock/aux) "BP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -2939,13 +2921,11 @@ "Cy" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/access_button{ pixel_x = -28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/effect/map_effect/marker/airlock/docking{ landmark_tag = "gd_dock2"; @@ -2999,12 +2979,10 @@ }, /obj/machinery/merchant_pad, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/plating, /area/golden_deep/office) @@ -3023,8 +3001,7 @@ /area/golden_deep/captain) "Dn" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -3149,12 +3126,10 @@ id = "golden_deep" }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/machinery/light{ dir = 4 @@ -3292,8 +3267,7 @@ /obj/machinery/telecomms/allinone/ship, /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/plating/cooled, /area/golden_deep/engineering) @@ -3320,8 +3294,7 @@ reversed = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/plating, /area/golden_deep/warehouse) @@ -3505,8 +3478,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 5 @@ -4003,8 +3975,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -4089,8 +4060,7 @@ "OD" = ( /obj/machinery/access_button{ pixel_x = -28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking{ @@ -4129,8 +4099,7 @@ /area/golden_deep/captain) "Pf" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/gold, /area/golden_deep/dock/aux) @@ -4200,12 +4169,10 @@ id = "golden_deep" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/plating, /area/golden_deep/warehouse) @@ -4282,8 +4249,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -4316,8 +4282,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 6 @@ -4392,8 +4357,7 @@ /area/golden_deep/hangar) "Sa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/access_button{ pixel_x = -28; @@ -4627,8 +4591,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -4711,8 +4674,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -4750,8 +4712,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -4919,8 +4880,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 diff --git a/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm b/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm index 1b24be0647c..c7ae0ea307f 100644 --- a/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm +++ b/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm @@ -608,8 +608,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, @@ -733,8 +732,7 @@ "gJ" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - id = "trawler_lockdown"; - name = "blast door" + id = "trawler_lockdown" }, /obj/effect/map_effect/window_spawner/full/shuttle/mercenary, /turf/simulated/floor/plating, @@ -810,8 +808,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/ship/fishing_trawler/corridor/central) @@ -912,8 +909,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -1465,8 +1461,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/steel, /area/ship/fishing_trawler/EVA_port) @@ -2181,8 +2176,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -2419,8 +2413,7 @@ /area/ship/fishing_trawler/corridor/port) "sU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, @@ -2713,8 +2706,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/emcloset, @@ -2744,8 +2736,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "trawler_lockdown"; - name = "blast door" + id = "trawler_lockdown" }, /obj/effect/map_effect/window_spawner/full/shuttle/mercenary, /turf/simulated/floor/plating, @@ -3692,8 +3683,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/ship/fishing_trawler/corridor/central) @@ -4375,8 +4365,7 @@ /area/ship/fishing_trawler/kitchen) "GB" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /turf/simulated/floor/reinforced, /area/ship/fishing_trawler/engineering/port) @@ -4666,7 +4655,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1336; - icon_state = "map_injector"; id = "trawler_thrust_in" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -5027,8 +5015,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, @@ -5063,8 +5050,7 @@ /area/ship/fishing_trawler/crew_quarters) "Mx" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /turf/simulated/floor/reinforced, /area/ship/fishing_trawler/engineering/port) @@ -5110,7 +5096,6 @@ "ML" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = -3; pixel_x = 24 }, @@ -5285,8 +5270,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/effect/floor_decal/corner/red{ dir = 8 @@ -6429,8 +6413,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ icon_state = "1-8" diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm index 6adee375436..8a006309044 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm @@ -33,8 +33,7 @@ dir = 4 }, /obj/machinery/door/blast/regular/open{ - id = "hegemony2"; - name = "blast door" + id = "hegemony2" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -61,8 +60,7 @@ dir = 4 }, /obj/machinery/door/blast/regular/open{ - id = "hegemony1"; - name = "blast door" + id = "hegemony1" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -132,13 +130,11 @@ /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -356,8 +352,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -514,8 +509,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ icon_state = "1-8" @@ -582,8 +576,7 @@ "dK" = ( /obj/structure/table/glass, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -694,7 +687,6 @@ icon_state = "4-8" }, /obj/machinery/door/blast/regular/open{ - name = "blast door"; id = "hegemony_cic" }, /turf/simulated/floor/tiled/dark, @@ -745,8 +737,7 @@ spawn_grille = 1 }, /obj/machinery/door/blast/regular/open{ - id = "hegemony_window"; - name = "blast door" + id = "hegemony_window" }, /turf/simulated/floor/plating, /area/hegemony_ship/captains_quarters) @@ -820,8 +811,7 @@ "fh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable/green{ d1 = 2; @@ -866,12 +856,10 @@ dir = 8 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -949,8 +937,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "hegemony3"; - name = "blast door" + id = "hegemony3" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -1004,8 +991,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/alarm/north{ req_one_access = null; @@ -1234,8 +1220,7 @@ "hs" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/hegemony) @@ -1506,8 +1491,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "hegemony5"; - name = "blast door" + id = "hegemony5" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -1825,8 +1809,7 @@ }, /obj/machinery/door/blast/regular/open{ id = "hegemony_window"; - dir = 4; - name = "blast door" + dir = 4 }, /turf/simulated/floor/plating, /area/hegemony_ship/bridge) @@ -1952,8 +1935,7 @@ /area/hegemony_ship/aux_cic) "lW" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/light{ dir = 4 @@ -1997,8 +1979,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable/green{ d1 = 4; @@ -2332,8 +2313,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/effect/floor_decal/corner/yellow{ dir = 5 @@ -2440,8 +2420,7 @@ /area/hegemony_ship/docking_port) "oA" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /obj/machinery/light{ dir = 1 @@ -2468,8 +2447,7 @@ spawn_grille = 1 }, /obj/machinery/door/blast/regular/open{ - id = "hegemony_window"; - name = "blast door" + id = "hegemony_window" }, /turf/simulated/floor/plating, /area/hegemony_ship) @@ -2570,8 +2548,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "hegemony3"; - name = "blast door" + id = "hegemony3" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -2579,8 +2556,7 @@ /obj/effect/floor_decal/corner_wide/red/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable/green{ d1 = 1; @@ -2626,8 +2602,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/alarm/east{ req_one_access = null; @@ -3267,8 +3242,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "hegemony4"; - name = "blast door" + id = "hegemony4" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -3370,8 +3344,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "hegemony4"; - name = "blast door" + id = "hegemony4" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -3575,8 +3548,7 @@ pixel_y = 32 }, /obj/machinery/door/blast/regular/open{ - id = "hegemony2"; - name = "blast door" + id = "hegemony2" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -3699,8 +3671,7 @@ /obj/structure/table/glass, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate, /obj/item/clothing/suit/space/void/sol/sfa, @@ -3840,8 +3811,7 @@ /area/hegemony_ship/brig) "wC" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -3850,8 +3820,7 @@ /area/hegemony_ship/engineering) "wF" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /turf/simulated/floor/reinforced, /area/hegemony_ship/engineering) @@ -3942,8 +3911,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/door/window/brigdoor/northleft{ req_access = list(113); @@ -4015,8 +3983,7 @@ "xB" = ( /obj/effect/floor_decal/corner_wide/red/diagonal, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, @@ -4141,8 +4108,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "hegemony5"; - name = "blast door" + id = "hegemony5" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -4259,12 +4225,10 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/table/rack, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/door/window/brigdoor/southright{ req_access = list(113) @@ -4352,8 +4316,7 @@ /area/hegemony_ship/gun_deck_bruiser) "zr" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor/reinforced, /area/hegemony_ship/engineering) @@ -4587,8 +4550,7 @@ icon_state = "0-2" }, /obj/machinery/power/terminal{ - dir = 8; - icon_state = "term" + dir = 8 }, /turf/simulated/floor/plating, /area/shuttle/hegemony) @@ -4670,8 +4632,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "hegemony4"; - name = "blast door" + id = "hegemony4" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -4682,12 +4643,10 @@ "AK" = ( /obj/structure/table/rack, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/door/window/brigdoor/southright{ req_access = list(113) @@ -4921,8 +4880,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "hegemony5"; - name = "blast door" + id = "hegemony5" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -5148,8 +5106,7 @@ "DA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/cable{ icon_state = "1-2"; @@ -5826,8 +5783,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6075,8 +6031,7 @@ /area/shuttle/hegemony) "Je" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor/tiled/dark/full, /area/hegemony_ship/gun_deck_bruiser) @@ -6227,8 +6182,7 @@ pixel_y = 32 }, /obj/machinery/door/blast/regular/open{ - id = "hegemony1"; - name = "blast door" + id = "hegemony1" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -6456,8 +6410,7 @@ spawn_grille = 1 }, /obj/machinery/door/blast/regular/open{ - id = "hegemony_window"; - name = "blast door" + id = "hegemony_window" }, /turf/simulated/floor/plating, /area/hegemony_ship) @@ -6806,9 +6759,7 @@ /turf/simulated/floor/tiled/white, /area/hegemony_ship/canteen) "Nc" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -6995,8 +6946,7 @@ spawn_grille = 1 }, /obj/machinery/door/blast/regular/open{ - id = "hegemony_window"; - name = "blast door" + id = "hegemony_window" }, /turf/simulated/floor/plating, /area/hegemony_ship/captains_quarters) @@ -7274,8 +7224,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/structure/lattice/catwalk/indoor/grate, @@ -7375,8 +7324,7 @@ /area/hegemony_ship/starboard_propulsion) "Qr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/wood, /area/hegemony_ship/canteen) @@ -7558,8 +7506,7 @@ /obj/structure/ship_weapon_dummy, /obj/structure/viewport/unathi, /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /turf/simulated/floor/tiled/dark/full, /area/hegemony_ship/gun_deck_bruiser) @@ -7592,8 +7539,7 @@ /obj/effect/floor_decal/corner/dark_blue/diagonal, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled, /area/hegemony_ship/eva_storage) @@ -7639,8 +7585,7 @@ /area/hegemony_ship) "Sf" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/effect/floor_decal/corner/yellow{ dir = 9 @@ -7689,8 +7634,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable/green{ d1 = 4; @@ -7894,8 +7838,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable/green{ d1 = 4; @@ -7919,8 +7862,7 @@ }, /obj/machinery/door/blast/regular/open{ id = "hegemony_window"; - dir = 4; - name = "blast door" + dir = 4 }, /turf/simulated/floor/plating, /area/hegemony_ship/bridge) @@ -8193,8 +8135,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "hegemony3"; - name = "blast door" + id = "hegemony3" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -8215,8 +8156,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "hegemony_shuttle"; - name = "blast door" + id = "hegemony_shuttle" }, /turf/simulated/floor/plating, /area/shuttle/hegemony) @@ -8251,8 +8191,7 @@ "Vd" = ( /obj/structure/ship_weapon_dummy, /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /turf/simulated/floor/tiled/dark/full, /area/hegemony_ship/gun_deck_bruiser) @@ -8288,8 +8227,7 @@ /obj/structure/table/glass, /obj/item/device/binoculars/spyglass, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/sign/flag/izharshan{ @@ -8366,8 +8304,7 @@ /area/hegemony_ship/gun_deck_bruiser) "VP" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/reinforced, /area/hegemony_ship/engineering) @@ -8416,7 +8353,6 @@ dir = 4 }, /obj/machinery/door/blast/regular/open{ - name = "blast door"; id = "hegemony_cic" }, /turf/simulated/floor/tiled/dark, @@ -8647,8 +8583,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "hegemony_shuttle"; - name = "blast door" + id = "hegemony_shuttle" }, /turf/simulated/floor/plating, /area/shuttle/hegemony) @@ -8694,8 +8629,7 @@ /area/hegemony_ship/bridge) "Ya" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /turf/simulated/floor/reinforced, /area/hegemony_ship/engineering) @@ -8827,8 +8761,7 @@ spawn_grille = 1 }, /obj/machinery/door/blast/regular/open{ - id = "hegemony_window"; - name = "blast door" + id = "hegemony_window" }, /turf/simulated/floor/plating, /area/hegemony_ship/gun_deck_flak) @@ -8911,8 +8844,7 @@ pixel_y = -32 }, /obj/machinery/door/blast/regular/open{ - id = "hegemony1"; - name = "blast door" + id = "hegemony1" }, /turf/simulated/floor/tiled, /area/hegemony_ship) @@ -8944,8 +8876,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/alarm/north{ req_one_access = null; @@ -9035,8 +8966,7 @@ pixel_y = -32 }, /obj/machinery/door/blast/regular/open{ - id = "hegemony2"; - name = "blast door" + id = "hegemony2" }, /turf/simulated/floor/tiled, /area/hegemony_ship) diff --git a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm index 840ac378da2..0395ea2ecf4 100644 --- a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm +++ b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm @@ -92,8 +92,7 @@ "bJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ d2 = 2; @@ -293,8 +292,7 @@ /area/shuttle/merchants_guild) "dC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -577,12 +575,10 @@ id = "merchants_guild" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/plating, /area/merchants_guild/warehouse) @@ -774,8 +770,7 @@ /area/merchants_guild/starboardengine) "jI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /turf/simulated/floor/plating, /area/merchants_guild/starboardengine) @@ -925,12 +920,10 @@ id = "merchants_guild" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/railing/mapped{ dir = 8 @@ -1101,17 +1094,14 @@ /area/merchants_guild/office) "pv" = ( /obj/machinery/conveyor{ - dir = 2; id = "merchants_guild"; reversed = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/door/blast/regular{ id = "mg_cargo_hatch" @@ -1150,8 +1140,7 @@ /area/merchants_guild/eva) "pR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -1169,22 +1158,6 @@ }, /turf/simulated/floor/carpet/orange, /area/merchants_guild/captain) -"pV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - icon_state = "map-supply"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/merchants_guild) "qb" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -1308,8 +1281,7 @@ /area/merchants_guild/starboardengine) "rv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -1353,8 +1325,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable/green{ d1 = 2; @@ -1386,7 +1357,6 @@ "sa" = ( /obj/machinery/alarm/east{ pixel_x = 25; - pixel_y = 0; req_one_access = list(215) }, /turf/simulated/floor/plating, @@ -1419,8 +1389,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -1448,8 +1417,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/plating, /area/merchants_guild/hangar) @@ -1717,12 +1685,10 @@ id = "merchants_guild" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/plating, /area/merchants_guild/office) @@ -1913,8 +1879,7 @@ /area/merchants_guild/bridge) "zE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -2196,12 +2161,10 @@ id = "merchants_guild" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/light{ dir = 4 @@ -2253,8 +2216,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/plating, /area/merchants_guild/warehouse) @@ -2372,12 +2334,10 @@ id = "merchants_guild" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/railing/mapped{ dir = 8 @@ -2921,8 +2881,7 @@ /area/shuttle/merchants_guild) "Mj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled, /area/merchants_guild/crew) @@ -2973,8 +2932,7 @@ /area/merchants_guild/portengine) "MR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -3008,7 +2966,6 @@ /obj/machinery/airlock_sensor/airlock_interior{ frequency = 1380; id_tag = "merchant_guild_interior_sensor"; - master_tag = null; pixel_x = -25; pixel_y = -25 }, @@ -3183,8 +3140,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /turf/simulated/floor/tiled, /area/merchants_guild) @@ -3384,22 +3340,11 @@ /obj/item/gun/energy/pistol/hegemony, /turf/simulated/floor/carpet/orange, /area/merchants_guild/captain) -"Uh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/merchants_guild) "Uk" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 8; @@ -3657,12 +3602,10 @@ id = "merchants_guild" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/merchant_pad, /turf/simulated/floor/plating, @@ -3679,8 +3622,7 @@ maxhealth = 140 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/light{ dir = 8 @@ -16425,9 +16367,9 @@ dO dO dO sx -Uh +kg Yf -pV +TC Yf kg Jp diff --git a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm index 5150aa920bd..dc778dac417 100644 --- a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm +++ b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm @@ -157,8 +157,7 @@ /area/miners_guild) "bk" = ( /obj/machinery/door/airlock/service{ - name = "Gear Storage"; - dir = 2 + name = "Gear Storage" }, /obj/machinery/door/firedoor{ req_one_access = null @@ -762,8 +761,7 @@ /area/miners_guild/bridge) "gD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -794,8 +792,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner_wide/brown/diagonal, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -1056,12 +1053,10 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ icon_state = "2-4" @@ -1539,8 +1534,7 @@ /area/miners_guild/engineering1) "lY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -1737,12 +1731,10 @@ dir = 8 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = 6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -1834,8 +1826,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable/green{ icon_state = "2-8" @@ -1854,8 +1845,7 @@ }, /obj/effect/floor_decal/corner_wide/brown/diagonal, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -2022,9 +2012,7 @@ "pA" = ( /obj/effect/floor_decal/corner_wide/brown/diagonal, /obj/machinery/power/apc/south, -/obj/structure/cable/green{ - icon_state = "0-1" - }, +/obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/miners_guild) "pB" = ( @@ -2080,8 +2068,7 @@ /area/miners_guild/engineering1) "pM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -2094,13 +2081,11 @@ /area/miners_guild) "pN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -2398,8 +2383,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/effect/floor_decal/corner_wide/brown/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ @@ -2616,8 +2600,7 @@ /area/miners_guild/hangar) "tW" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/full, /area/miners_guild/processing) @@ -2835,8 +2818,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -2855,8 +2837,7 @@ /area/miners_guild/storage) "wa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/steel, @@ -2929,8 +2910,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable/green{ icon_state = "2-4" @@ -3452,8 +3432,7 @@ /area/shuttle/miners_guild) "AO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -3489,8 +3468,7 @@ /area/miners_guild) "AU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -3518,8 +3496,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/effect/floor_decal/corner_wide/brown/diagonal, /obj/structure/cable/green{ @@ -3636,12 +3613,10 @@ dir = 4 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = 6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -3709,9 +3684,7 @@ /obj/machinery/power/apc/west{ req_access = null }, -/obj/structure/cable/green{ - icon_state = "0-1" - }, +/obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/miners_guild/docking_port_3) "CO" = ( @@ -4026,15 +3999,12 @@ /obj/machinery/power/apc/east{ req_access = null }, -/obj/structure/cable/green{ - icon_state = "0-1" - }, +/obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/miners_guild/docking_port_1) "EK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -4256,8 +4226,7 @@ /area/miners_guild/medical) "Hi" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/plating, /area/miners_guild/hangar) @@ -4412,9 +4381,7 @@ shuttle_tag = "Miners' Guild Shuttle" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/structure/bed/handrail{ dir = 4 }, @@ -4477,8 +4444,7 @@ "IP" = ( /obj/effect/overmap/visitable/sector/miners_guild_station, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -4540,8 +4506,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, @@ -4675,8 +4640,7 @@ /area/miners_guild/processing) "Ky" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/miners_guild/processing) @@ -5393,8 +5357,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner_wide/brown/diagonal, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -6175,8 +6138,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/steel, /area/miners_guild/docking_port_2) @@ -6237,8 +6199,7 @@ "Xe" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6522,12 +6483,10 @@ "Zb" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /obj/structure/window/reinforced{ dir = 4; - icon_state = "rwindow"; maxhealth = 80 }, /obj/effect/floor_decal/industrial/outline/security, diff --git a/maps/away/ships/heph/cyclops/cyclops.dmm b/maps/away/ships/heph/cyclops/cyclops.dmm index 2edd072a79d..524eec8e571 100644 --- a/maps/away/ships/heph/cyclops/cyclops.dmm +++ b/maps/away/ships/heph/cyclops/cyclops.dmm @@ -822,8 +822,7 @@ icon_state = "0-8" }, /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) @@ -1339,9 +1338,7 @@ /area/hephmining_ship/cyclops/cyclops_engineering) "nb" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/light{ dir = 4 diff --git a/maps/away/ships/heph/heph_security/heph_security.dmm b/maps/away/ships/heph/heph_security/heph_security.dmm index 21312a70247..96392bb9011 100644 --- a/maps/away/ships/heph/heph_security/heph_security.dmm +++ b/maps/away/ships/heph/heph_security/heph_security.dmm @@ -1,8 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "af" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/door/firedoor/noid{ dir = 4 @@ -195,8 +194,7 @@ req_access = list(216) }, /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -236,8 +234,7 @@ /area/heph_security_ship/crew) "bF" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/light{ dir = 4; @@ -274,8 +271,7 @@ /area/heph_security_ship/kitchen) "bO" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/effect/decal/remains/rat, /turf/simulated/floor/reinforced, @@ -517,8 +513,7 @@ req_access = list(216) }, /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -686,8 +681,7 @@ /area/heph_security_ship/kitchen) "eQ" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/effect/landmark/entry_point/port{ name = "port, medical" @@ -780,8 +774,7 @@ /area/heph_security_ship/kitchen) "fo" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/effect/landmark/entry_point/starboard{ name = "starboard, captain's quarters" @@ -898,8 +891,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -1033,8 +1025,7 @@ /area/heph_security_ship/bridge) "hu" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor/reinforced, /area/heph_security_ship/engineering) @@ -1128,8 +1119,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor/airless, /area/shuttle/heph_security) @@ -1186,8 +1176,7 @@ /area/heph_security_ship/crew) "iw" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -1354,8 +1343,7 @@ /area/heph_security_ship/grauwolf) "jT" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/door/firedoor/noid{ dir = 4 @@ -1610,8 +1598,7 @@ /area/heph_security_ship/bridge) "lj" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -1696,8 +1683,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/door/firedoor/noid, /turf/simulated/floor/carpet/rubber, @@ -1723,8 +1709,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ @@ -1874,8 +1859,7 @@ /area/heph_security_ship/engineering) "nc" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/effect/landmark/entry_point/starboard{ name = "starboard, crew bunks" @@ -1938,8 +1922,7 @@ /area/heph_security_ship/medbay) "nP" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /turf/simulated/floor/airless, /area/heph_security_ship/grauwolf) @@ -1969,8 +1952,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/door/firedoor/noid, /turf/simulated/floor/carpet/rubber, @@ -2064,8 +2046,7 @@ /area/heph_security_ship/francisca) "oG" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 @@ -2464,8 +2445,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -2637,8 +2617,7 @@ "rs" = ( /obj/effect/floor_decal/spline/plain/corner/black, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled, /area/heph_security_ship/brig) @@ -2872,8 +2851,7 @@ /area/heph_security_ship/grauwolf) "tS" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -3116,8 +3094,7 @@ /area/heph_security_ship) "vs" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /turf/simulated/floor/reinforced, /area/heph_security_ship/engineering) @@ -3173,8 +3150,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -3506,8 +3482,7 @@ /area/heph_security_ship/grauwolf) "yP" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor/airless, /area/heph_security_ship/francisca) @@ -3594,8 +3569,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled, /area/heph_security_ship) @@ -3604,8 +3578,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -4184,8 +4157,7 @@ /area/heph_security_ship/brig) "FK" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/effect/landmark/entry_point/starboard{ name = "starboard, kitchen" @@ -4364,8 +4336,7 @@ /area/heph_security_ship/engineering) "Hn" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/door/firedoor/noid{ dir = 4 @@ -4562,8 +4533,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -4671,8 +4641,7 @@ "IS" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/light{ @@ -4869,8 +4838,7 @@ /area/heph_security_ship/crew) "Kt" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/door/firedoor/noid{ dir = 4 @@ -5210,8 +5178,7 @@ name = "adjusted reinforced window" }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/machinery/door/window{ dir = 8 @@ -5485,8 +5452,7 @@ "OO" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/door/firedoor/noid, /obj/effect/map_effect/window_spawner/full/shuttle/mercenary, @@ -5510,8 +5476,7 @@ /area/heph_security_ship/engineering) "Ph" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /turf/simulated/floor/reinforced, /area/heph_security_ship/engineering) @@ -5671,8 +5636,7 @@ /area/heph_security_ship/atmos) "QC" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 10; - icon_state = "warning" + dir = 10 }, /obj/structure/bed/handrail{ buckle_dir = 8; @@ -5734,7 +5698,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 0451; - icon_state = "map_injector"; id = "hephsec_fuel_in" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -5788,8 +5751,7 @@ /area/heph_security_ship/medbay) "Sh" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/door/firedoor/noid{ dir = 4 @@ -5891,8 +5853,7 @@ "SQ" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/machinery/door/firedoor/noid, /obj/effect/map_effect/window_spawner/full/shuttle/mercenary, @@ -5948,8 +5909,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -5995,8 +5955,7 @@ /area/shuttle/heph_security) "TQ" = ( /obj/machinery/door/blast/regular/open{ - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/effect/map_effect/window_spawner/full/shuttle/mercenary, /obj/machinery/door/firedoor/noid{ @@ -6082,8 +6041,7 @@ /area/shuttle/heph_security) "Uz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/effect/map_effect/marker/airlock/docking{ landmark_tag = "hephsec_shuttle"; @@ -6240,8 +6198,7 @@ "VM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/terminal{ - dir = 8; - icon_state = "term" + dir = 8 }, /obj/structure/cable{ icon_state = "0-4" @@ -6424,8 +6381,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -6462,8 +6418,7 @@ "Xe" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/effect/map_effect/window_spawner/full/shuttle/mercenary, /obj/machinery/door/firedoor/noid, @@ -6506,8 +6461,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -6559,8 +6513,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -6589,8 +6542,7 @@ "Yl" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/structure/cable/green{ icon_state = "1-4" @@ -6620,8 +6572,7 @@ "YC" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - id = "heph_lockdown"; - name = "blast door" + id = "heph_lockdown" }, /obj/effect/map_effect/window_spawner/full/shuttle/mercenary, /obj/machinery/door/firedoor/noid, diff --git a/maps/away/ships/iac/iac_rescue_ship.dmm b/maps/away/ships/iac/iac_rescue_ship.dmm index 51b0cb446fe..a47a3e8c8dc 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dmm +++ b/maps/away/ships/iac/iac_rescue_ship.dmm @@ -563,8 +563,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -1067,8 +1066,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/industrial/outline/engineering, /obj/effect/floor_decal/industrial/warning{ @@ -1206,8 +1204,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -1765,9 +1762,7 @@ /turf/simulated/floor/carpet/lightblue, /area/ship/iac_rescue_ship/starboarddocking) "dqq" = ( -/obj/effect/floor_decal/corner_wide/orange{ - dir = 2 - }, +/obj/effect/floor_decal/corner_wide/orange, /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/medical) "drX" = ( @@ -2047,8 +2042,7 @@ /area/ship/iac_rescue_ship/starboarddocking) "egU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -2356,8 +2350,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -2454,8 +2447,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/power/apc/super/west{ req_access = list(211) @@ -2520,7 +2512,6 @@ /area/shuttle/iac_shuttle) "eZa" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "iac_starboard_co2_out"; dir = 1 }, @@ -2999,7 +2990,6 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/glass_command{ - id_tag = null; name = "Bridge"; req_access = list(211); dir = 1 @@ -3110,8 +3100,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -3382,7 +3371,6 @@ /area/ship/iac_rescue_ship/bridge) "gQH" = ( /obj/machinery/door/airlock/glass_command{ - id_tag = null; name = "Bridge"; req_access = list(211); dir = 1 @@ -3789,8 +3777,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/freezer, @@ -4167,8 +4154,7 @@ /area/ship/iac_rescue_ship/engineering) "iDd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -5706,8 +5692,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor, /area/ship/iac_rescue_ship/starboardengine) @@ -5746,8 +5731,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -5777,7 +5761,6 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/glass_command{ - id_tag = null; name = "Bridge"; req_access = list(211); dir = 1 @@ -6322,7 +6305,6 @@ /area/ship/iac_rescue_ship/engineering) "opV" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "iac_port_co2_out"; dir = 1 }, @@ -6559,8 +6541,7 @@ /area/ship/iac_rescue_ship/portdocking) "oVD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -7748,8 +7729,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/portdocking) @@ -9072,9 +9052,7 @@ /obj/structure/closet/crate/bin{ name = "trashbin" }, -/obj/effect/floor_decal/corner/dark_blue/full{ - dir = 2 - }, +/obj/effect/floor_decal/corner/dark_blue/full, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/bridge) "vad" = ( @@ -9576,8 +9554,7 @@ "wnA" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 diff --git a/maps/away/ships/idris/idris_cruiser.dmm b/maps/away/ships/idris/idris_cruiser.dmm index 7209b46b5a9..b9aec7bb008 100644 --- a/maps/away/ships/idris/idris_cruiser.dmm +++ b/maps/away/ships/idris/idris_cruiser.dmm @@ -4196,7 +4196,6 @@ /area/shuttle/idris_cruiser_shuttle/engineering) "px" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/carpet/green, @@ -12652,7 +12651,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14181,7 +14179,6 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/unary/vent_pump/on{ diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index dbc9c9cf85e..11ce1ca89e6 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -282,15 +282,10 @@ /obj/machinery/door/airlock/glass_command{ name = "Bridge"; req_access = list(113); - req_one_access = null; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ icon_state = "1-2" @@ -372,8 +367,7 @@ /area/kataphract_chapter/bridge) "bj" = ( /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, @@ -381,8 +375,7 @@ "bk" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /turf/simulated/floor/tiled/dark/full, /area/kataphract_chapter/sparring_chamber) @@ -419,12 +412,8 @@ /area/kataphract_chapter/cic) "bq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 10 }, @@ -499,7 +488,6 @@ "bS" = ( /obj/machinery/door/airlock/glass{ name = "Sparring Chamber"; - req_access = null; req_one_access = list(113); dir = 4 }, @@ -557,12 +545,8 @@ req_access = list(113); dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ icon_state = "1-2" @@ -631,12 +615,8 @@ name = "Francisca Weapons System"; req_one_access = list(113) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ icon_state = "1-2" @@ -701,9 +681,7 @@ /turf/simulated/floor/airless, /area/kataphract_chapter/bridge) "cL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -714,15 +692,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/door/airlock/engineering{ name = "Engineering"; - req_access = null; req_one_access = list(113) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ icon_state = "1-2" @@ -746,8 +719,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled, /area/shuttle/kataphract_shuttle/main_compartment) @@ -916,8 +888,7 @@ /area/kataphract_chapter/starentry) "du" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable{ d2 = 4; @@ -930,12 +901,8 @@ /turf/simulated/floor/tiled, /area/kataphract_chapter/portentry) "dy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 10 }, @@ -1024,8 +991,7 @@ /area/shuttle/kataphract_shuttle/main_compartment) "dM" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/structure/extinguisher_cabinet/west, /obj/effect/floor_decal/corner/yellow{ @@ -1105,8 +1071,7 @@ /area/kataphract_chapter/frankie) "dY" = ( /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/machinery/door/window/brigdoor/southright{ req_access = list(113) @@ -1152,9 +1117,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 5 }, @@ -1184,9 +1147,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/full, /area/kataphract_chapter/starboardpropulsion) "ej" = ( @@ -1305,12 +1266,8 @@ /area/shuttle/kataphract_shuttle/main_compartment) "eH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow/full{ dir = 1 }, @@ -1330,8 +1287,7 @@ "eL" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ @@ -1476,9 +1432,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/kataphract_chapter/engineering) "fr" = ( @@ -1523,9 +1477,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/kataphract_chapter/engineering) "fz" = ( @@ -1621,12 +1573,8 @@ /turf/simulated/floor/tiled/dark, /area/kataphract_chapter/frankie) "fI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 9 }, @@ -1736,9 +1684,7 @@ /obj/effect/floor_decal/corner/red{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/kataphract_chapter/sparring_chamber) "gl" = ( @@ -1836,8 +1782,7 @@ /area/kataphract_chapter/engineering) "gI" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/effect/floor_decal/spline/plain/yellow{ dir = 4 @@ -1851,9 +1796,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2058,12 +2001,8 @@ /turf/simulated/floor/tiled/dark, /area/kataphract_chapter/cic) "hv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 9 }, @@ -2168,12 +2107,8 @@ dir = 4; id = "katacic" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ icon_state = "1-2" @@ -2204,9 +2139,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2217,8 +2150,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /turf/simulated/floor/tiled/dark/full, /area/kataphract_chapter/sparring_chamber) @@ -2235,12 +2167,8 @@ /turf/simulated/floor/tiled/white, /area/kataphract_chapter/office) "if" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2267,7 +2195,6 @@ "ij" = ( /obj/machinery/door/airlock/glass{ name = "Healer's Bay"; - req_access = null; req_one_access = list(113); dir = 4 }, @@ -2375,9 +2302,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -2500,12 +2425,8 @@ /turf/simulated/floor/tiled/white, /area/kataphract_chapter/mess) "iY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/yellow{ dir = 1 }, @@ -2528,12 +2449,8 @@ /turf/simulated/floor/tiled/full, /area/kataphract_chapter/main_ring) "jb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor/multi_tile{ req_one_access = null @@ -2702,9 +2619,7 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/kataphract_chapter/sparring_chamber) "ka" = ( @@ -2771,7 +2686,6 @@ "kk" = ( /obj/machinery/door/airlock/glass{ name = "Sparring Chamber"; - req_access = null; req_one_access = list(113); dir = 4 }, @@ -2815,9 +2729,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white, /area/kataphract_chapter/medical) @@ -2842,12 +2754,8 @@ /area/kataphract_chapter/bridge) "kx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow/full{ dir = 8 }, @@ -2870,8 +2778,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled/dark/full, /area/kataphract_chapter/sparring_chamber) @@ -2944,15 +2851,13 @@ /area/kataphract_chapter/brig) "kL" = ( /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled/dark/full, /area/kataphract_chapter/sparring_chamber) "kN" = ( /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /turf/simulated/floor/tiled/dark/full, /area/kataphract_chapter/sparring_chamber) @@ -2999,9 +2904,7 @@ /turf/simulated/floor/tiled/dark/full, /area/kataphract_chapter/cic) "kS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -3011,9 +2914,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/red/full{ dir = 4 }, @@ -3088,8 +2989,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 8; - icon_state = "rwindow" + dir = 8 }, /obj/machinery/door/window/brigdoor/northleft{ dir = 2; @@ -3187,9 +3087,7 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/kataphract_chapter/engineering) "lv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - icon_state = "map_scrubber_on" - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/kataphract_chapter/mess) "lw" = ( @@ -3403,8 +3301,7 @@ /area/kataphract_chapter/medical) "me" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/effect/floor_decal/spline/plain/yellow{ dir = 4 @@ -3427,12 +3324,8 @@ name = "Bruiser Cannon Weapons System"; req_one_access = list(113) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ icon_state = "1-2" @@ -3480,9 +3373,7 @@ /turf/simulated/floor/wood, /area/kataphract_chapter/dorms) "mm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -3728,12 +3619,8 @@ /turf/simulated/floor/plating, /area/kataphract_chapter/mess) "mS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/yellow, /obj/effect/floor_decal/industrial/outline_segment/yellow{ dir = 4 @@ -3966,9 +3853,7 @@ /turf/simulated/floor/tiled/dark/full, /area/kataphract_chapter/cic) "nx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -4043,9 +3928,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/kataphract_chapter/engineering) "oa" = ( @@ -4152,12 +4035,8 @@ /turf/simulated/floor/wood, /area/kataphract_chapter/specoffice) "pp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white, /area/kataphract_chapter/medical) @@ -4242,8 +4121,7 @@ /area/kataphract_chapter/portentry) "rd" = ( /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark/full, @@ -4311,9 +4189,7 @@ /turf/simulated/floor/tiled, /area/kataphract_chapter/portentry) "rv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -4458,8 +4334,7 @@ desc = "An expensive shell actually designed for a bruiser cannon. Very popular among sinta; this shell bursts into many slugger projectiles that punch through the hull with less mass, but more force." }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/effect/floor_decal/corner/yellow{ dir = 5 @@ -4607,12 +4482,8 @@ /turf/simulated/floor/tiled, /area/kataphract_chapter/atmospherics) "uk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ @@ -4627,12 +4498,8 @@ /turf/simulated/floor/tiled, /area/kataphract_chapter/sparring_chamber) "uw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 9 }, @@ -4821,15 +4688,12 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/kataphract_chapter/engineering) "wP" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -4961,15 +4825,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/door/airlock/engineering{ name = "Atmospherics"; - req_access = null; req_one_access = list(113) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ icon_state = "1-2" @@ -5036,12 +4895,8 @@ /turf/simulated/floor/tiled, /area/kataphract_chapter/main_ring) "zC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 10 }, @@ -5067,7 +4922,6 @@ id = "katabridgeshutter"; name = "Bridge Shutters"; req_access = list(113); - req_one_access = null; pixel_y = 8; pixel_x = 5 }, @@ -5096,7 +4950,6 @@ id = "katabridgeshutter"; name = "Bridge Shutters"; req_access = list(113); - req_one_access = null; pixel_y = 8; pixel_x = 5 }, @@ -5146,9 +4999,7 @@ /obj/effect/floor_decal/corner/red{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/power/apc/east{ req_access = null; req_one_access = list(113,11) @@ -5221,12 +5072,8 @@ /turf/simulated/floor/plating, /area/kataphract_chapter/atmospherics) "AG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow/full{ dir = 1 }, @@ -5262,12 +5109,8 @@ /turf/simulated/floor/tiled, /area/shuttle/kataphract_shuttle/main_compartment) "Bk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 6 }, @@ -5307,8 +5150,7 @@ /obj/effect/map_effect/marker/airlock/shuttle/kataphract_shuttle, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/structure/cable{ icon_state = "1-2" @@ -5331,12 +5173,10 @@ req_one_access = list(113,13) }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -5407,9 +5247,7 @@ pixel_y = -1 }, /obj/effect/floor_decal/corner_wide/paleblue/diagonal, -/obj/machinery/light/small{ - dir = 2 - }, +/obj/machinery/light/small, /turf/simulated/floor/tiled/white, /area/kataphract_chapter/office) "CS" = ( @@ -5448,12 +5286,8 @@ /turf/simulated/floor/wood, /area/kataphract_chapter/mess) "DF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ @@ -5488,8 +5322,7 @@ req_access = list(113) }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /turf/simulated/floor/tiled, /area/kataphract_chapter/starentry) @@ -5518,9 +5351,7 @@ /turf/simulated/floor/tiled/full, /area/shuttle/kataphract_shuttle/main_compartment) "El" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -5556,7 +5387,6 @@ "Ez" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -5597,12 +5427,8 @@ /turf/simulated/floor/tiled, /area/kataphract_chapter/main_ring) "Ff" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 6 }, @@ -5862,12 +5688,8 @@ /turf/simulated/floor/tiled/dark, /area/kataphract_chapter/cic) "HN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ icon_state = "1-2" @@ -5949,12 +5771,8 @@ /turf/simulated/floor/tiled/white, /area/kataphract_chapter/medical) "IK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/yellow, /obj/effect/floor_decal/industrial/outline_segment/yellow{ dir = 10 @@ -6224,12 +6042,10 @@ req_one_access = list(113,13) }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -6351,12 +6167,8 @@ /turf/simulated/floor/wood, /area/kataphract_chapter/office) "Nx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline_door/yellow{ dir = 1 }, @@ -6377,8 +6189,7 @@ /area/kataphract_chapter/starboardpropulsion) "NF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/effect/floor_decal/corner_wide/paleblue/diagonal, /obj/structure/cable/green{ @@ -6667,12 +6478,8 @@ /turf/space/transit/east, /area/space) "PX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 6 }, @@ -6795,12 +6602,8 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/kataphract_chapter/cic) "Rw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow/full{ dir = 8 }, @@ -6834,12 +6637,8 @@ /turf/simulated/floor/tiled, /area/kataphract_chapter/main_ring) "RD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, @@ -6986,9 +6785,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -7063,12 +6860,8 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/kataphract_chapter/toilets) "Tg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ dir = 10 }, @@ -7204,9 +6997,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/kataphract_chapter/starboardpropulsion) @@ -7454,8 +7245,7 @@ /area/kataphract_chapter/engineering) "Yi" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/effect/floor_decal/corner/green{ dir = 8 diff --git a/maps/away/ships/konyang/air_konyang/air_konyang.dmm b/maps/away/ships/konyang/air_konyang/air_konyang.dmm index 9554815cd4d..379c4f26d2f 100644 --- a/maps/away/ships/konyang/air_konyang/air_konyang.dmm +++ b/maps/away/ships/konyang/air_konyang/air_konyang.dmm @@ -1659,8 +1659,7 @@ /area/shuttle/air_konyang/atmos) "Qa" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/shuttle/air_konyang/rear_hall) diff --git a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm index a9dec8ddda2..fb685c72540 100644 --- a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm +++ b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm @@ -685,8 +685,7 @@ /area/shuttle/einstein_shuttle/room/four) "se" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/carpet/brown, /area/shuttle/einstein_shuttle/main) @@ -883,8 +882,7 @@ "xe" = ( /obj/structure/closet/cabinet, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/item/clothing/under/suit_jacket/navy, /obj/item/clothing/under/suit_jacket/checkered, @@ -1490,8 +1488,7 @@ /area/shuttle/einstein_shuttle/porteng) "Lh" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/shuttle/einstein_shuttle/dock) @@ -1793,8 +1790,7 @@ /area/shuttle/einstein_shuttle/porteng) "Ux" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/shuttle/einstein_shuttle/helm) @@ -2038,8 +2034,7 @@ "ZL" = ( /obj/structure/bed/stool/chair/office/dark, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/machinery/light{ dir = 8; diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm index 282b9fc30fa..844c5975c7d 100644 --- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm +++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm @@ -741,8 +741,7 @@ /obj/structure/table/steel, /obj/machinery/cell_charger, /obj/random/tech_supply{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/random/powercell{ pixel_x = -1; @@ -937,8 +936,7 @@ /area/ship/ipc_refugee/atmos) "hl" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/curtain/open/shower, /obj/item/stack/material/steel, @@ -2728,8 +2726,7 @@ dir = 4 }, /obj/random/tech_supply{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, @@ -3892,8 +3889,7 @@ /area/ship/ipc_refugee/cargopod_b) "CW" = ( /obj/random/tech_supply{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /turf/simulated/floor, /area/ship/ipc_refugee/cargopod_a) diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm index 4133ff93fde..d134a6bc95b 100644 --- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm +++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm @@ -5210,7 +5210,6 @@ "DS" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 1; - frequency = 1441; id_tag = "kasf_co2_out_starboard" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -5843,7 +5842,6 @@ "Hd" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 1; - frequency = 1441; id_tag = "kasf_co2_out_port" }, /turf/simulated/floor/reinforced/carbon_dioxide, diff --git a/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm b/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm index 928bc7be393..d8cbab093fb 100644 --- a/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm +++ b/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm @@ -60,8 +60,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -638,8 +637,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/structure/cable/green{ d1 = 4; @@ -915,8 +913,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/structure/cable/green{ d1 = 4; @@ -1132,8 +1129,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -2069,8 +2065,7 @@ /area/konyang_wreck) "rr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -2212,8 +2207,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -2462,8 +2456,7 @@ "uZ" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -2647,8 +2640,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/structure/cable/green{ d1 = 4; @@ -2743,8 +2735,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -3191,8 +3182,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -4082,8 +4072,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/structure/cable/green{ d1 = 4; @@ -4113,8 +4102,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/atmos) @@ -5393,8 +5381,7 @@ /area/konyang_wreck/pod6) "Vr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -5417,8 +5404,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 diff --git a/maps/away/ships/konyang/water_barge/water_barge.dmm b/maps/away/ships/konyang/water_barge/water_barge.dmm index 5d20a86f743..dc4586dd1e3 100644 --- a/maps/away/ships/konyang/water_barge/water_barge.dmm +++ b/maps/away/ships/konyang/water_barge/water_barge.dmm @@ -330,8 +330,7 @@ "dA" = ( /obj/machinery/access_button{ pixel_x = -28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/docking{ @@ -2226,7 +2225,6 @@ /area/water_barge/engineering) "vl" = ( /obj/machinery/atmospherics/binary/pump{ - dir = 2; name = "scrubbers to waste" }, /obj/effect/floor_decal/industrial/warning/full, @@ -3758,8 +3756,7 @@ "KW" = ( /obj/machinery/access_button{ pixel_x = -28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/machinery/door/airlock/external, /obj/effect/map_effect/marker_helper/airlock/exterior, @@ -4639,8 +4636,7 @@ /area/water_barge/breakroom) "SF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/access_button{ pixel_x = -28; @@ -4949,8 +4945,7 @@ }, /obj/machinery/access_button{ pixel_x = -28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/shuttle{ @@ -5224,8 +5219,7 @@ /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -5563,14 +5557,6 @@ /obj/effect/overmap/visitable/ship/water_barge, /turf/simulated/floor/tiled/dark, /area/water_barge/helm) -"ZF" = ( -/obj/structure/lattice/catwalk/indoor, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" - }, -/turf/simulated/floor/plating, -/area/water_barge) "ZI" = ( /obj/item/modular_computer/console/preset/civilian, /turf/simulated/floor/tiled/dark, @@ -16773,7 +16759,7 @@ Fj Fj Fj rX -ZF +pc Fj Fj Fj diff --git a/maps/away/ships/lone_spacer/lone_spacer.dmm b/maps/away/ships/lone_spacer/lone_spacer.dmm index 388605422c8..ff8ea67ef6d 100644 --- a/maps/away/ships/lone_spacer/lone_spacer.dmm +++ b/maps/away/ships/lone_spacer/lone_spacer.dmm @@ -76,8 +76,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ d1 = 1; @@ -177,8 +176,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/power/apc/west{ req_access = list(243) @@ -260,8 +258,7 @@ /obj/machinery/disposal, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, @@ -330,8 +327,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, @@ -441,8 +437,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 1; @@ -537,8 +532,7 @@ /area/shuttle/lone_spacer/fore_hall) "fF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/disposal/small/east, @@ -1139,8 +1133,7 @@ "pe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/alarm/west{ req_one_access = list(243) @@ -1689,8 +1682,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/full, @@ -1919,8 +1911,7 @@ /area/shuttle/lone_spacer/port_nacelle) "CV" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/machinery/power/apc/north{ req_access = list(243) @@ -1985,8 +1976,7 @@ /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ pixel_x = -29; - pixel_y = -6; - dir = 2 + pixel_y = -6 }, /obj/machinery/airlock_sensor/airlock_exterior{ pixel_x = -30 @@ -2236,8 +2226,7 @@ /area/shuttle/lone_spacer/storage) "IH" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/airless, /area/shuttle/lone_spacer/storage) @@ -2280,8 +2269,7 @@ "Jk" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/machinery/light/small{ dir = 8; @@ -2431,7 +2419,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/dark/full, @@ -2880,9 +2867,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -2924,8 +2909,7 @@ /area/shuttle/lone_spacer/fore_hall) "Tg" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/meter, @@ -3246,8 +3230,7 @@ /area/shuttle/lone_spacer/storage) "Zd" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm index 963f383c0a8..bc3941b3f54 100644 --- a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm +++ b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm @@ -13,8 +13,7 @@ /area/nka_merchant/merchant) "ab" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -317,7 +316,7 @@ /area/nka_merchant/engineering) "aQ" = ( /obj/machinery/power/apc/east{ - req_access = list(213); + req_access = list(213) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -403,8 +402,7 @@ "aZ" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -446,8 +444,7 @@ }, /obj/machinery/access_button{ pixel_x = 10; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -573,8 +570,7 @@ /area/nka_merchant/engineering) "bF" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor{ temperature = 278.15 @@ -668,8 +664,7 @@ req_one_access = list(213) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ @@ -694,8 +689,7 @@ dir = 9 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -740,8 +734,7 @@ /area/nka_merchant/warehouse) "ce" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/structure/flora/pottedplant/smalltree, /turf/simulated/floor/tiled{ @@ -886,12 +879,10 @@ id = "merchant_navy" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor{ temperature = 278.15 @@ -937,8 +928,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -1047,9 +1037,7 @@ }, /area/nka_merchant/warehouse) "dd" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/storage/box/produce{ pixel_x = 3; pixel_y = -11 @@ -1326,7 +1314,6 @@ /area/nka_merchant/captain_quarters) "dO" = ( /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -1687,8 +1674,7 @@ "fC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -1830,8 +1816,7 @@ "gb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/structure/cable/green{ d1 = 1; @@ -1859,8 +1844,7 @@ /area/nka_merchant/warehouse) "gg" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -2316,8 +2300,7 @@ /area/nka_merchant/hangar) "iO" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable/green{ d2 = 8; @@ -2382,12 +2365,10 @@ id = "nka_merchant_warehouse" }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -2760,8 +2741,7 @@ /area/space) "kA" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor{ temperature = 278.15 @@ -3101,8 +3081,7 @@ reversed = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor{ temperature = 278.15 @@ -3127,8 +3106,7 @@ /area/nka_merchant/warehouse) "lW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -3149,12 +3127,10 @@ id = "merchant_navy" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -3321,8 +3297,7 @@ /area/nka_merchant) "mV" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -3413,8 +3388,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -3568,8 +3542,7 @@ "pf" = ( /obj/structure/extinguisher_cabinet/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/corner/green{ dir = 6 @@ -3580,8 +3553,7 @@ /area/nka_merchant/mess) "pi" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/structure/cable/green{ d1 = 4; @@ -3606,8 +3578,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -3698,8 +3669,7 @@ /area/nka_merchant/mess) "rp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3820,15 +3790,6 @@ temperature = 278.15 }, /area/nka_merchant/bridge) -"sX" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" - }, -/turf/simulated/floor{ - temperature = 278.15 - }, -/area/nka_merchant/hangar) "tl" = ( /obj/effect/map_effect/map_helper/ruler_tiles_3{ dir = 4 @@ -3862,12 +3823,10 @@ id = "merchant_navy" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/light{ dir = 4 @@ -4013,7 +3972,6 @@ "vi" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -4075,9 +4033,7 @@ /obj/effect/floor_decal/corner/purple/full{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - icon_state = "map_scrubber_on" - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -4327,8 +4283,7 @@ req_one_access = list(212) }, /obj/structure/window/reinforced{ - dir = 4; - icon_state = "rwindow" + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -4387,8 +4342,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -4405,8 +4359,7 @@ "yD" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/visible/red, /turf/simulated/floor/plating{ @@ -4523,8 +4476,7 @@ "AB" = ( /obj/effect/floor_decal/corner/dark_blue/full, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -4568,8 +4520,7 @@ /area/nka_merchant/engine) "Bv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable/green{ d1 = 2; @@ -4683,8 +4634,7 @@ /area/shuttle/nka_merchant_shuttle) "Do" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4822,8 +4772,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -4906,12 +4855,10 @@ id = "merchant_navy" }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor{ temperature = 278.15 @@ -5309,7 +5256,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/south{ is_critical = 1; - req_access = list(213); + req_access = list(213) }, /obj/structure/cable/green{ d2 = 2; @@ -5751,8 +5698,7 @@ /area/nka_merchant/eva) "Pb" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/red, /turf/simulated/floor/plating{ @@ -5824,8 +5770,7 @@ /area/nka_merchant/engine) "Qh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6226,8 +6171,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor{ @@ -6398,8 +6342,7 @@ /area/shuttle/nka_merchant_shuttle) "YB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -6408,8 +6351,7 @@ "YM" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, @@ -21290,7 +21232,7 @@ AT hf zm cl -sX +cl Df Df Df @@ -21298,8 +21240,8 @@ Df qD Df Co -sX -sX +cl +cl jy ng Wr diff --git a/maps/away/ships/orion/orion_express_ship.dmm b/maps/away/ships/orion/orion_express_ship.dmm index 484a0e493a1..c872d2d8951 100644 --- a/maps/away/ships/orion/orion_express_ship.dmm +++ b/maps/away/ships/orion/orion_express_ship.dmm @@ -191,8 +191,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -374,8 +373,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -501,7 +499,6 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external{ - dir = 2; id_tag = "orion_shuttle_in" }, /obj/effect/map_effect/marker_helper/airlock/interior, @@ -537,7 +534,6 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/door/airlock/external{ - dir = 2; id_tag = "orion_shuttle_ex" }, /obj/machinery/atmospherics/pipe/manifold/hidden/green, @@ -635,9 +631,7 @@ /turf/simulated/floor, /area/ship/orion/docking2) "bMH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 @@ -804,8 +798,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/ship/orion/captain) @@ -890,9 +883,7 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -944,9 +935,7 @@ /turf/simulated/floor/plating, /area/shuttle/orion_shuttle/storage) "cwh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -1775,9 +1764,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/ship/orion/mainhall) @@ -1786,8 +1773,7 @@ dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ship/orion/mainhall) @@ -2041,7 +2027,6 @@ "gNW" = ( /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/door/airlock/external{ - dir = 2; id_tag = "orion_shuttle_ex" }, /obj/machinery/access_button{ @@ -2122,9 +2107,7 @@ /turf/simulated/floor/plating, /area/shuttle/orion_shuttle/storage) "gYr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ @@ -2146,9 +2129,7 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/ship/orion/mainhall) "hdc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -2261,9 +2242,7 @@ /turf/simulated/floor/tiled/white, /area/ship/orion/forehall) "hlA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -2308,13 +2287,10 @@ /turf/simulated/floor/airless, /area/ship/orion/thruster1) "hvo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -2519,8 +2495,7 @@ "ifH" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/ship/orion/forehall) @@ -2530,7 +2505,6 @@ /area/ship/orion/thruster2) "ihA" = ( /obj/machinery/door/airlock/external{ - dir = 2; id_tag = "orion_shuttle_in" }, /obj/effect/map_effect/marker_helper/airlock/interior, @@ -2581,8 +2555,7 @@ inserted_light = /obj/item/light/tube/colored/blue }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ship/orion/docking1) @@ -3057,8 +3030,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, @@ -3547,8 +3519,7 @@ dir = 5 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -3601,8 +3572,7 @@ /area/ship/orion/comms) "mlH" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -3766,9 +3736,7 @@ /turf/simulated/floor, /area/ship/orion/cargo) "mUl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ @@ -3793,7 +3761,6 @@ req_one_access = list(201) }, /obj/machinery/door/airlock/glass_command{ - id_tag = null; name = "Cockpit"; dir = 1; req_access = list(201) @@ -4337,9 +4304,7 @@ /turf/simulated/floor, /area/ship/orion/docking2) "omQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ @@ -4409,8 +4374,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -4490,9 +4454,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/structure/lattice/catwalk/indoor/grate, @@ -4588,9 +4550,7 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/ship/orion/mainhall) @@ -4638,9 +4598,7 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/ship/orion/atmos) "pAi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/ship/orion/bridge) "pBw" = ( @@ -4710,9 +4668,7 @@ /turf/simulated/floor, /area/ship/orion/docking1) "pMZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" @@ -4890,9 +4846,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/orion/bridge) "qqS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/purple{ @@ -4905,8 +4859,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -5653,9 +5606,7 @@ /turf/simulated/floor, /area/ship/orion/bridge) "sBH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/aux, @@ -5796,12 +5747,9 @@ /area/ship/orion/engie) "sTm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -5960,9 +5908,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/ship/orion/mainhall) @@ -6032,8 +5978,7 @@ /area/ship/orion/atmos) "tAd" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -6422,9 +6367,7 @@ /obj/effect/landmark/entry_point/aft{ name = "aft, airlock" }, -/obj/effect/shuttle_landmark/orion_express_shuttle/hangar{ - base_area = /area/space - }, +/obj/effect/shuttle_landmark/orion_express_shuttle/hangar, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/door/airlock/external{ frequency = 1380; @@ -6465,8 +6408,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/alarm/east{ req_one_access = null; @@ -6537,9 +6479,7 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/ship/orion/mainhall) @@ -6986,8 +6926,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/ship/orion/shop) @@ -7158,8 +7097,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/ship/orion/cargo) diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dmm b/maps/away/ships/pra/database_freighter/database_freighter.dmm index 38d16c30748..b1ec5dc6e25 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dmm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dmm @@ -373,8 +373,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ d1 = 4; @@ -388,7 +387,6 @@ /area/database_freighter/captain_quarters) "bE" = ( /obj/machinery/computer/ship/helm{ - req_access = null; dir = 1 }, /obj/effect/floor_decal/corner/red{ @@ -546,8 +544,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -703,8 +700,7 @@ /area/database_freighter/hangar) "cH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/meter, /turf/simulated/floor{ @@ -1153,8 +1149,7 @@ /area/database_freighter/storage) "eB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable/green{ d1 = 1; @@ -1318,8 +1313,7 @@ /area/database_freighter/checkpoint) "fv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ d1 = 2; @@ -1542,8 +1536,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable/green{ d1 = 2; @@ -1733,8 +1726,7 @@ /area/database_freighter/laboratory) "hx" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /obj/structure/cable/green{ d1 = 4; @@ -2300,8 +2292,7 @@ /area/space) "kz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -2335,8 +2326,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ d1 = 1; @@ -2516,8 +2506,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -2736,8 +2725,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ d1 = 4; @@ -3259,8 +3247,7 @@ /area/database_freighter) "tu" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/cable/green{ @@ -3985,8 +3972,7 @@ /area/database_freighter/storage) "DT" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor{ temperature = 278.15 @@ -4056,8 +4042,7 @@ /area/database_freighter/storage) "Ez" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/unary/engine, /turf/simulated/floor{ @@ -4167,8 +4152,7 @@ /area/database_freighter/laboratory) "Hm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/wall/shuttle/raider, /area/shuttle/database_freighter_shuttle) @@ -4622,8 +4606,7 @@ "Os" = ( /obj/effect/floor_decal/corner/red, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -4896,8 +4879,7 @@ /area/database_freighter) "SW" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor{ temperature = 278.15 @@ -5193,8 +5175,7 @@ "Xy" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor{ temperature = 278.15 diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm index 2d0493634db..0342f924352 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm @@ -547,9 +547,7 @@ }, /area/headmaster_ship/eva) "bl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -612,7 +610,6 @@ "bu" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 4; - frequency = 1441; id_tag = "headmaster_co2_out_port" }, /obj/machinery/air_sensor{ @@ -661,9 +658,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -678,8 +673,7 @@ /area/headmaster_ship/cic) "bI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate, /obj/effect/map_effect/marker/airlock/docking{ @@ -1026,10 +1020,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/cooled, /area/headmaster_ship/engine) -"cF" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating/cooled, -/area/headmaster_ship/hangar) "cG" = ( /obj/structure/ship_weapon_dummy, /obj/machinery/ship_weapon/grauwolf{ @@ -1140,12 +1130,8 @@ }, /area/headmaster_ship/bridge) "db" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/glass{ name = "Fore Hallway" }, @@ -1444,7 +1430,6 @@ req_one_access = list(209) }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28 }, /obj/machinery/light/small/emergency{ @@ -1470,15 +1455,13 @@ req_one_access = list(209) }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28 }, /turf/simulated/floor/plating/cooled, /area/headmaster_ship) "dR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/light/small/emergency{ dir = 4 @@ -1553,12 +1536,8 @@ }, /area/headmaster_ship/medbay) "ec" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/green{ dir = 10 }, @@ -1716,12 +1695,8 @@ /obj/effect/floor_decal/corner/red{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -1894,12 +1869,8 @@ name = "Captain's Quarters"; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor{ req_one_access = list(24,11,67,209) }, @@ -2227,7 +2198,6 @@ "gn" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 8; - frequency = 1441; id_tag = "headmaster_co2_out_starboard" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -2979,12 +2949,8 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -3185,12 +3151,8 @@ /turf/simulated/floor/plating/cooled, /area/headmaster_ship/engine) "jA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor{ req_one_access = list(24,11,67,209) }, @@ -3206,12 +3168,8 @@ /turf/simulated/floor/tiled/dark/full, /area/headmaster_ship) "jB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/cable/green{ d1 = 4; @@ -3292,8 +3250,7 @@ /area/headmaster_ship/medbay) "jU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/wall/shuttle/raider, /area/shuttle/headmaster_shuttle) @@ -3301,9 +3258,7 @@ /obj/effect/floor_decal/corner/red/full{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -3358,12 +3313,8 @@ icon_state = "2-8" }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating/cooled, /area/headmaster_ship/engineering) "kh" = ( @@ -3380,12 +3331,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating/cooled, /area/headmaster_ship/engine) "ki" = ( @@ -3505,8 +3452,7 @@ dir = 9 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -3981,8 +3927,7 @@ /area/headmaster_ship/gun_deck) "mg" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -4007,7 +3952,6 @@ req_one_access = list(209) }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28 }, /turf/simulated/floor/plating/cooled, @@ -4049,12 +3993,10 @@ }, /obj/machinery/light/small/emergency, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -4274,12 +4216,8 @@ /turf/simulated/floor/plating/cooled, /area/headmaster_ship/engine) "nk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/cable/green{ d1 = 1; @@ -4493,12 +4431,8 @@ /turf/simulated/floor/carpet/rubber, /area/headmaster_ship/cic) "pb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "4-8" }, @@ -4534,9 +4468,7 @@ }, /area/headmaster_ship/eva) "pg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -4552,12 +4484,8 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -5214,8 +5142,7 @@ /area/headmaster_ship) "wt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/light/small/emergency{ dir = 8 @@ -5412,8 +5339,7 @@ /area/headmaster_ship/dock) "yE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate, /obj/effect/map_effect/marker/airlock/docking{ @@ -5880,9 +5806,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -5937,12 +5861,8 @@ name = "Stall 1"; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor{ req_one_access = list(24,11,67,209) }, @@ -5966,12 +5886,8 @@ /turf/simulated/floor/carpet/rubber, /area/shuttle/headmaster_shuttle) "Ez" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -6007,8 +5923,7 @@ /area/shuttle/headmaster_shuttle) "Fd" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/plating/cooled, /area/headmaster_ship/engine) @@ -6260,8 +6175,7 @@ /area/space) "Ht" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/wall/shuttle/raider, /area/headmaster_ship/engine) @@ -6275,7 +6189,6 @@ req_one_access = list(209) }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28 }, /obj/machinery/light/small/emergency{ @@ -6417,12 +6330,8 @@ name = "Commissar's Quarters"; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor{ req_one_access = list(24,11,67,209) }, @@ -6450,12 +6359,8 @@ req_access = list(209); dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor{ req_one_access = list(24,11,67,209) }, @@ -6753,8 +6658,7 @@ /area/headmaster_ship/bridge) "Ni" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/wall/shuttle/raider, /area/headmaster_ship/engine) @@ -6833,12 +6737,8 @@ }, /area/headmaster_ship/barracks) "NJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -6883,9 +6783,7 @@ /area/headmaster_ship/dock) "Oe" = ( /obj/effect/floor_decal/corner/red/full, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -7123,8 +7021,7 @@ dir = 9 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/wood{ temperature = 278.15 @@ -7172,8 +7069,7 @@ /area/headmaster_ship/mess_hall) "RG" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/structure/cable{ icon_state = "1-2" @@ -7360,9 +7256,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -7399,9 +7293,7 @@ }, /area/headmaster_ship/armory) "Tu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -7676,12 +7568,8 @@ name = "Medbay"; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor{ req_one_access = list(24,11,67,209) }, @@ -37890,7 +37778,7 @@ bV kj qg fE -cF +Iy vh NZ cc diff --git a/maps/away/ships/sadar_scout/sadar_scout.dmm b/maps/away/ships/sadar_scout/sadar_scout.dmm index 18f3a21c4ef..6ad51b8b07f 100644 --- a/maps/away/ships/sadar_scout/sadar_scout.dmm +++ b/maps/away/ships/sadar_scout/sadar_scout.dmm @@ -6057,7 +6057,6 @@ /area/ship/sadar_scout/cic) "Tn" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "sadar_co2_out" }, /turf/simulated/floor/reinforced/carbon_dioxide, diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index be4cc4cc44d..f90f2c79393 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -204,12 +204,9 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, /turf/simulated/floor/tiled/dark, @@ -455,8 +452,7 @@ }, /obj/machinery/access_button{ pixel_x = -28; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /obj/random/dirt_75, /obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/port, @@ -464,7 +460,6 @@ /area/ship/scc_scout_ship/hydroponics) "co" = ( /obj/structure/sign/flag/heph{ - pixel_y = 0; pixel_x = 32 }, /obj/item/clothing/suit/storage/toggle/labcoat/heph, @@ -577,9 +572,7 @@ name = "airlock_scc_scout_fore_starboard" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "db" = ( @@ -884,9 +877,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "eI" = ( @@ -972,9 +963,7 @@ "fd" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light/small/emergency{ - dir = 2 - }, +/obj/machinery/light/small/emergency, /obj/structure/cable/pink{ icon_state = "4-8" }, @@ -1119,9 +1108,7 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = -28; pixel_y = 12; @@ -1291,9 +1278,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/bridge) "gy" = ( -/obj/machinery/light/small{ - dir = 2 - }, +/obj/machinery/light/small, /obj/structure/cable{ icon_state = "4-8" }, @@ -1615,9 +1600,7 @@ /turf/simulated/floor/tiled/white, /area/ship/scc_scout_ship/medbay) "iQ" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 2 - }, +/obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/warning/cee, /obj/random/dirt_75, /obj/random/dirt_75, @@ -1740,12 +1723,9 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/structure/cable{ icon_state = "1-2" @@ -1780,9 +1760,7 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/structure/cable{ icon_state = "1-2" }, @@ -1883,7 +1861,6 @@ dir = 8 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -1949,17 +1926,14 @@ dir = 4 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_scc_scout_fore_starboard"; name = "airlock_scc_scout_fore_starboard" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "kW" = ( @@ -2381,7 +2355,6 @@ dir = 4 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -2443,7 +2416,6 @@ dir = 1 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -2518,9 +2490,7 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = -20; pixel_y = -28; @@ -2993,9 +2963,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 6 }, -/obj/machinery/cryopod{ - dir = 8 - }, +/obj/machinery/cryopod, /obj/machinery/computer/cryopod{ pixel_x = 28; pixel_y = -6 @@ -3036,7 +3004,6 @@ }, /obj/structure/table/reinforced/steel, /obj/item/pen/multi{ - pixel_y = 0; pixel_x = 5 }, /obj/effect/floor_decal/corner/blue/full{ @@ -3268,9 +3235,7 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = -28; pixel_y = 12; @@ -3366,7 +3331,6 @@ "tj" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -3477,7 +3441,6 @@ dir = 8 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -3496,9 +3459,7 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/scc_scout_ship_shuttle/cargo) "tU" = ( -/obj/machinery/atmospherics/binary/pump/high_power/on{ - dir = 2 - }, +/obj/machinery/atmospherics/binary/pump/high_power/on, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -3515,9 +3476,7 @@ /obj/machinery/light/small/emergency, /obj/random/dirt_75, /obj/random/dirt_75, -/obj/machinery/cell_charger{ - pixel_y = 0 - }, +/obj/machinery/cell_charger, /obj/structure/table/steel, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_power) @@ -3640,12 +3599,9 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/structure/cable{ icon_state = "2-4" @@ -3667,9 +3623,7 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/engineering_cargo) "ve" = ( @@ -3763,9 +3717,7 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 28; pixel_y = 12; @@ -4267,9 +4219,7 @@ name = "airlock_scc_scout_fore_starboard" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "yM" = ( @@ -4845,7 +4795,6 @@ /area/ship/scc_scout_ship/hydroponics) "Dl" = ( /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -5130,9 +5079,7 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 28; pixel_y = 12; @@ -5247,9 +5194,7 @@ /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "Gi" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 2 - }, +/obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/empty, /obj/effect/floor_decal/industrial/warning, /obj/machinery/alarm/north{ @@ -5275,7 +5220,6 @@ "Go" = ( /obj/structure/sink/kitchen{ dir = 8; - pixel_y = 0; pixel_x = 21 }, /obj/effect/floor_decal/corner/dark_blue{ @@ -5605,7 +5549,6 @@ dir = 4 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -6377,12 +6320,9 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/structure/cable{ icon_state = "1-8" @@ -6406,9 +6346,7 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/random/dirt_75, /obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/aft, /turf/simulated/floor/plating, @@ -6473,9 +6411,7 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = -20; pixel_y = 28; @@ -6660,9 +6596,7 @@ "PY" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/emergency_closet, -/obj/machinery/light/small/emergency{ - dir = 2 - }, +/obj/machinery/light/small/emergency, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_propulsion_port) @@ -6857,8 +6791,7 @@ /area/ship/scc_scout_ship/maint_propulsion_starboard) "RQ" = ( /obj/item/book/manual/wiki/security_space_law{ - pixel_x = -1; - pixel_y = 0 + pixel_x = -1 }, /obj/structure/table/reinforced/steel, /obj/machinery/button/distress{ @@ -7044,7 +6977,6 @@ req_one_access = null }, /obj/random/tech_supply{ - pixel_y = 0; pixel_x = 3 }, /obj/random/tech_supply{ @@ -7054,9 +6986,7 @@ /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "SI" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 2 - }, +/obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/air, /obj/effect/floor_decal/industrial/warning, /obj/machinery/firealarm/north, @@ -7387,7 +7317,6 @@ pixel_y = 7 }, /obj/item/device/binoculars{ - pixel_y = 0; pixel_x = -3 }, /obj/effect/floor_decal/spline/plain/black{ @@ -7716,9 +7645,7 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/engineering_cargo) "Wo" = ( @@ -8170,7 +8097,6 @@ dir = 4 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -8275,8 +8201,7 @@ /obj/effect/floor_decal/corner/lime/diagonal, /obj/structure/table/steel, /obj/item/folder/white{ - pixel_x = -5; - pixel_y = 0 + pixel_x = -5 }, /obj/item/storage/box/masks{ pixel_y = 5; diff --git a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm index 7a5e4ad368a..c7a3d46827c 100644 --- a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm +++ b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm @@ -71,12 +71,8 @@ /area/ship/fsf_patrol_ship/mess) "aai" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -185,12 +181,8 @@ /obj/machinery/atmospherics/binary/pump/fuel{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor, @@ -559,9 +551,7 @@ /turf/simulated/floor, /area/ship/fsf_patrol_ship/dock/fore) "aSi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -728,9 +718,7 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/fsf_patrol_ship/engineering) "bci" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -740,9 +728,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -808,12 +794,8 @@ /turf/simulated/floor/plating, /area/ship/fsf_patrol_ship/hangar) "bsb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -850,12 +832,8 @@ /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/quarters) "buK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -994,12 +972,8 @@ dir = 1 }, /obj/effect/floor_decal/corner_wide/green/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -1103,8 +1077,7 @@ /area/ship/fsf_patrol_ship/medical) "cJx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/wall/shuttle/raider, /area/shuttle/fsf_shuttle) @@ -1134,16 +1107,6 @@ }, /turf/simulated/floor/tiled, /area/ship/fsf_patrol_ship/cic) -"dix" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/ship/fsf_patrol_ship/hangar) "dkH" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -1192,12 +1155,8 @@ /area/ship/fsf_patrol_ship/dock) "dDP" = ( /obj/effect/floor_decal/corner_wide/green/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -1354,12 +1313,8 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/fsf_shuttle) "enT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -1367,9 +1322,7 @@ /area/ship/fsf_patrol_ship/atmos) "eoE" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -1436,12 +1389,8 @@ /area/ship/fsf_patrol_ship/atmos) "eAo" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/ship/fsf_patrol_ship/requisitions) "eCG" = ( @@ -1640,12 +1589,8 @@ req_access = list(203); dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/brig) "fpU" = ( @@ -1714,12 +1659,8 @@ /obj/structure/sign/nosmoking_1{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -1806,12 +1747,8 @@ req_access = list(203); dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -1962,9 +1899,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/armory) "gpq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2001,12 +1936,8 @@ /area/ship/fsf_patrol_ship/cic) "gxW" = ( /obj/effect/floor_decal/corner_wide/green/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2035,12 +1966,8 @@ /obj/effect/floor_decal/spline/plain/black{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2190,8 +2117,7 @@ /area/ship/fsf_patrol_ship/ammo) "hiw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/atmos) @@ -2215,9 +2141,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -2276,9 +2200,7 @@ /area/ship/fsf_patrol_ship/bridge) "hxl" = ( /obj/effect/floor_decal/corner_wide/green/diagonal, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, /area/ship/fsf_patrol_ship/medical) "hzg" = ( @@ -2544,9 +2466,7 @@ /obj/machinery/light/small/emergency{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2558,9 +2478,7 @@ /area/ship/fsf_patrol_ship/hangar) "ivC" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2700,12 +2618,8 @@ /obj/machinery/light/small/emergency{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2761,12 +2675,8 @@ req_access = list(203); dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2802,21 +2712,15 @@ /area/ship/fsf_patrol_ship/dock) "jeR" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor, /area/ship/fsf_patrol_ship/hangar) "jjy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/dock/fore) "jmf" = ( @@ -2894,12 +2798,8 @@ /obj/structure/sign/nosmoking_1{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2940,12 +2840,8 @@ req_access = list(203); dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -3014,7 +2910,6 @@ id_tag = "fsf_hangar"; name = "\improper shuttle docking port controller"; req_one_access = list(204); - dir = 2; pixel_y = 28 }, /turf/simulated/floor, @@ -3164,9 +3059,7 @@ /obj/machinery/computer/ship/navigation{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/grauwolf) "kFw" = ( @@ -3292,9 +3185,7 @@ /area/ship/fsf_patrol_ship/medical) "kTD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -3320,12 +3211,8 @@ /area/ship/fsf_patrol_ship/officer) "kYY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -3353,9 +3240,7 @@ dir = 4 }, /obj/machinery/computer/ship/targeting, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/grauwolf) "lfq" = ( @@ -3363,12 +3248,8 @@ /obj/machinery/light/small/emergency{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -3380,12 +3261,8 @@ req_access = list(203); dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -3513,12 +3390,8 @@ /turf/simulated/floor/carpet/rubber, /area/ship/fsf_patrol_ship/briefing) "lIC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -3600,12 +3473,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -3641,12 +3510,8 @@ "lUz" = ( /obj/structure/bed/stool, /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -3812,9 +3677,7 @@ /turf/simulated/floor/tiled/white, /area/ship/fsf_patrol_ship/mess) "mCt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -3823,9 +3686,7 @@ /area/ship/fsf_patrol_ship/starboardpropulsion) "mEc" = ( /obj/effect/floor_decal/corner_wide/green/diagonal, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3879,12 +3740,8 @@ /area/ship/fsf_patrol_ship/mess) "mHp" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -3989,9 +3846,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/ship/fsf_patrol_ship/armory) "nfm" = ( @@ -4117,12 +3972,8 @@ /turf/simulated/wall/shuttle/raider, /area/ship/fsf_patrol_ship/portpropulsion) "nSb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -4188,22 +4039,14 @@ /obj/machinery/atmospherics/binary/pump/fuel{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/ship/fsf_patrol_ship/portpropulsion) "ofS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -4273,12 +4116,8 @@ /obj/structure/bed/stool/chair/office/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -4326,9 +4165,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -4445,9 +4282,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -4546,9 +4381,7 @@ /turf/simulated/floor, /area/ship/fsf_patrol_ship/starboardpropulsion) "pRf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" @@ -4682,9 +4515,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -4718,8 +4549,7 @@ /area/ship/fsf_patrol_ship/armory) "qqh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/atmos) @@ -5077,12 +4907,8 @@ /obj/effect/floor_decal/spline/plain/black{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -5262,9 +5088,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/starboardhallway) "sOb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -5280,21 +5104,15 @@ req_access = list(203); dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/ammo) "sOz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -5353,9 +5171,7 @@ /area/ship/fsf_patrol_ship/brig) "tdB" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -5570,9 +5386,7 @@ /obj/machinery/power/apc/high/west{ req_access = list(203) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/dock/fore) "tPE" = ( @@ -5797,9 +5611,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -5919,9 +5731,7 @@ /turf/simulated/floor, /area/ship/fsf_patrol_ship/ammo) "vxN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6103,9 +5913,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -6156,9 +5964,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/dock/fore) "wom" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/dock/fore) "woR" = ( @@ -6189,12 +5995,8 @@ /turf/simulated/floor/carpet/rubber, /area/ship/fsf_patrol_ship/quarters) "wvw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -6289,9 +6091,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/dock) "wRS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -6391,18 +6191,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/atmos) "xbK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/quarters) "xdk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -6454,8 +6250,7 @@ /area/shuttle/fsf_shuttle) "xgG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/wall/shuttle/raider, /area/shuttle/fsf_shuttle) @@ -6540,21 +6335,15 @@ req_access = list(203); dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/hangar) "xAX" = ( /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/storage) "xCV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -6655,9 +6444,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/atmos) "ycY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 4 }, @@ -6680,12 +6467,8 @@ req_access = list(203); dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -38227,7 +38010,7 @@ auY msC jEu kgO -dix +gqw oEc irz cRM diff --git a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm index 9d059da0f42..f1c40d9ed61 100644 --- a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm +++ b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm @@ -11,8 +11,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -184,8 +183,7 @@ "auY" = ( /obj/structure/table/steel, /obj/item/device/binoculars{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/item/device/binoculars{ pixel_y = 10; @@ -379,12 +377,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/ship/sfa_patrol_ship/SFA_Armory) @@ -488,11 +483,9 @@ /obj/item/storage/bag/inflatable, /obj/item/storage/belt/utility, /obj/item/clothing/gloves/yellow{ - pixel_x = 0; pixel_y = 7 }, /obj/item/clothing/gloves/yellow{ - pixel_x = 0; pixel_y = 10 }, /obj/item/tape_roll{ @@ -916,8 +909,7 @@ /area/shuttle/sfa_shuttle) "cBm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/meter, /obj/effect/decal/cleanable/dirt, @@ -1094,8 +1086,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/effect/floor_decal/corner/dark_blue/full{ dir = 8 @@ -1215,7 +1206,6 @@ /obj/structure/girder, /obj/structure/lattice, /obj/item/ore/silver{ - pixel_x = 0; pixel_y = 13 }, /turf/space, @@ -1240,8 +1230,7 @@ "dyv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/gunmetal, @@ -1276,8 +1265,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -1331,8 +1319,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/decal/cleanable/generic, /obj/structure/lattice/catwalk/indoor/grate/gunmetal, @@ -1496,9 +1483,7 @@ /turf/simulated/wall, /area/ship/sfa_patrol_ship/Suit_Storage) "eoo" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, @@ -1574,8 +1559,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -2210,8 +2194,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ icon_state = "1-8" @@ -2725,9 +2708,7 @@ /turf/simulated/wall/shuttle/raider, /area/ship/sfa_patrol_ship/Engine2) "hRm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -2754,7 +2735,6 @@ /area/ship/sfa_patrol_ship/Quarters) "hYx" = ( /obj/item/reagent_containers/glass/bucket{ - pixel_x = 0; pixel_y = 12 }, /turf/simulated/floor/tiled/dark, @@ -2826,7 +2806,6 @@ /obj/item/reagent_containers/pill/cyanide{ name = "cyanide pill"; desc = "a cyanide pill. Useful if you're about to be captured after years of committing piracy on the run."; - pixel_x = 0; pixel_y = 8 }, /turf/simulated/floor/carpet/art, @@ -2915,8 +2894,7 @@ "ivQ" = ( /obj/structure/table/standard, /obj/item/blueprints{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/item/pen/drafting/blue{ pixel_x = 9; @@ -2973,10 +2951,7 @@ dir = 8 }, /obj/structure/table/rack, -/obj/item/clothing/suit/storage/hazardvest/fsf{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/clothing/suit/storage/hazardvest/fsf, /obj/item/clothing/ears/earmuffs, /turf/simulated/floor/tiled/dark, /area/ship/sfa_patrol_ship/SFA_Armory) @@ -3017,8 +2992,7 @@ "iMA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -3103,8 +3077,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ icon_state = "1-8" @@ -3375,8 +3348,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -3568,8 +3540,7 @@ /obj/effect/decal/cleanable/blood/oil, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/gunmetal, /obj/structure/cable/green{ @@ -3599,8 +3570,7 @@ }, /obj/machinery/access_button{ pixel_x = -28; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /obj/effect/map_effect/marker/airlock/docking{ req_one_access = list(13,203); @@ -3628,8 +3598,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -3749,8 +3718,7 @@ /area/ship/sfa_patrol_ship/SFA_Armory) "kLW" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ship/sfa_patrol_ship/SFA_Armory) @@ -3966,8 +3934,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable/green{ icon_state = "1-8" @@ -4333,12 +4300,10 @@ dir = 8 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -4713,8 +4678,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/green{ @@ -4887,7 +4851,6 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/stone/marble, /obj/machinery/chemical_dispenser/full{ - dir = 2; icon_state = "soda_dispenser"; pixel_y = 5; pixel_x = -3 @@ -5050,8 +5013,7 @@ /area/ship/sfa_patrol_ship/Engineering) "pcY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/carpet/art, /area/ship/sfa_patrol_ship/Officer) @@ -5060,8 +5022,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/power/apc/high/north{ req_access = list(203) @@ -5083,8 +5044,7 @@ /area/ship/sfa_patrol_ship/Engine2) "peB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -5120,7 +5080,6 @@ /area/ship/sfa_patrol_ship/SFA_Armory) "pip" = ( /obj/item/material/shard/shrapnel{ - pixel_x = 0; pixel_y = 4 }, /obj/effect/floor_decal/corner/dark_blue/full, @@ -5355,8 +5314,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -5528,8 +5486,7 @@ /area/ship/sfa_patrol_ship/TreasureRoom) "qjY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/wall/shuttle/raider, /area/shuttle/sfa_shuttle) @@ -5578,12 +5535,8 @@ inserted_light = /obj/item/light/tube/colored/blue; icon_state = "tube_empty" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -5659,8 +5612,7 @@ /area/shuttle/sfa_shuttle) "qHm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/machinery/light/small{ dir = 8 @@ -5808,7 +5760,6 @@ /area/ship/sfa_patrol_ship) "rgK" = ( /obj/item/storage/firstaid/surgery{ - pixel_x = 0; pixel_y = 6 }, /obj/structure/table/rack/folding_table, @@ -5871,8 +5822,7 @@ /area/ship/sfa_patrol_ship/Bridge) "rwh" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ship/sfa_patrol_ship/hangar) @@ -6059,8 +6009,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -6183,8 +6132,7 @@ /area/ship/sfa_patrol_ship/hangar) "sjG" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6347,8 +6295,7 @@ /area/ship/sfa_patrol_ship) "tmT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/damaged, @@ -6384,7 +6331,6 @@ pixel_y = 3 }, /obj/item/cell/crap/empty{ - pixel_x = 0; pixel_y = -3 }, /turf/simulated/floor/tiled/dark, @@ -6417,7 +6363,6 @@ pixel_x = -3 }, /obj/item/ship_ammunition/francisca/frag{ - pixel_y = 0; pixel_x = -3 }, /turf/simulated/floor/reinforced/airless, @@ -6445,8 +6390,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/lattice/catwalk/indoor/grate/gunmetal, /obj/structure/cable/green{ @@ -6702,8 +6646,7 @@ req_access = null }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/effect/floor_decal/corner/dark_blue{ dir = 9 @@ -6763,8 +6706,7 @@ "uNE" = ( /obj/effect/decal/cleanable/blood/oil, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/ship/sfa_patrol_ship/hangar) @@ -6773,8 +6715,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -7048,7 +6989,6 @@ "wbH" = ( /obj/structure/table/wood, /obj/item/modular_computer/laptop/preset/civilian{ - pixel_x = 0; pixel_y = 9 }, /turf/simulated/floor/carpet/art, @@ -7094,7 +7034,6 @@ pixel_y = 4 }, /obj/item/ship_ammunition/grauwolf_bundle{ - pixel_x = 0; pixel_y = -4 }, /turf/simulated/floor/reinforced/airless, @@ -7340,9 +7279,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, diff --git a/maps/away/ships/sol/sol_ssmd/ssmd_ship.dmm b/maps/away/ships/sol/sol_ssmd/ssmd_ship.dmm index e62fc04df35..ad2c39495d5 100644 --- a/maps/away/ships/sol/sol_ssmd/ssmd_ship.dmm +++ b/maps/away/ships/sol/sol_ssmd/ssmd_ship.dmm @@ -108,8 +108,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "ssmd_cap_windows"; - name = "blast door" + id = "ssmd_cap_windows" }, /turf/template_noop, /area/ship/ssmd_corvette/hangar) @@ -295,9 +294,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/ssmd_corvette/brig) "aLy" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, @@ -982,8 +979,7 @@ req_one_access = list(13,203) }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, @@ -1106,8 +1102,7 @@ /obj/structure/ship_weapon_dummy, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "ssmd_grau_shroud"; - name = "blast door" + id = "ssmd_grau_shroud" }, /turf/simulated/floor/plating, /area/ship/ssmd_corvette/grauwolf) @@ -1526,8 +1521,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "ssmd_cap_windows"; - name = "blast door" + id = "ssmd_cap_windows" }, /obj/effect/landmark/entry_point/fore{ name = "fore, captain's office" @@ -2026,8 +2020,7 @@ frame_color = "#6C7364" }, /obj/machinery/door/blast/regular/open{ - id = "ssmd_relax_windows"; - name = "blast door" + id = "ssmd_relax_windows" }, /turf/simulated/floor/plating, /area/ship/ssmd_corvette/starboardfoyer) @@ -2152,8 +2145,7 @@ "fBb" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/power/terminal{ - dir = 8; - icon_state = "term" + dir = 8 }, /obj/structure/cable{ icon_state = "0-4" @@ -3216,8 +3208,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "ssmd_cap_windows"; - name = "blast door" + id = "ssmd_cap_windows" }, /turf/simulated/floor, /area/ship/ssmd_corvette/captain) @@ -3559,8 +3550,7 @@ "jZd" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - id = "ssmd_grau_shroud"; - name = "blast door" + id = "ssmd_grau_shroud" }, /obj/effect/landmark/entry_point/fore{ name = "fore, grauwolf array" @@ -6132,8 +6122,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "ssmd_bridge_lockdown"; - name = "blast door" + id = "ssmd_bridge_lockdown" }, /obj/machinery/door/airlock/command{ name = "Captain's Ready Room"; @@ -6234,8 +6223,7 @@ frame_color = "#6C7364" }, /obj/machinery/door/blast/regular/open{ - id = "ssmd_relax_windows"; - name = "blast door" + id = "ssmd_relax_windows" }, /obj/effect/landmark/entry_point/starboard{ name = "starboard, lounge" @@ -6332,8 +6320,7 @@ "sYY" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - id = "ssmd_grau_shroud"; - name = "blast door" + id = "ssmd_grau_shroud" }, /turf/simulated/floor/airless, /area/ship/ssmd_corvette/grauwolf) @@ -6746,9 +6733,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/ssmd_corvette/canteen) "upw" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, @@ -7410,8 +7395,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "ssmd_cap_windows"; - name = "blast door" + id = "ssmd_cap_windows" }, /turf/template_noop, /area/ship/ssmd_corvette/hangar) @@ -7450,9 +7434,7 @@ /turf/simulated/floor/tiled/white, /area/ship/ssmd_corvette/medbay) "wiX" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, @@ -7699,8 +7681,7 @@ /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/map_effect/marker/airlock{ name = "airlock_ssmd_corvette_2"; @@ -8124,8 +8105,7 @@ dir = 4 }, /obj/machinery/door/blast/regular/open{ - id = "ssmd_bridge_lockdown"; - name = "blast door" + id = "ssmd_bridge_lockdown" }, /obj/machinery/door/airlock/command{ name = "Bridge"; diff --git a/maps/away/ships/tajara/circus/adhomian_circus.dmm b/maps/away/ships/tajara/circus/adhomian_circus.dmm index 9b06d5b2560..6743e5c28ab 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus.dmm +++ b/maps/away/ships/tajara/circus/adhomian_circus.dmm @@ -1144,7 +1144,6 @@ /area/adhomian_circus/port) "fDP" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -2705,8 +2704,7 @@ "nBx" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, @@ -2748,7 +2746,6 @@ "nDF" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -4122,12 +4119,6 @@ temperature = 278.15 }, /area/adhomian_circus/hangar) -"vLF" = ( -/obj/structure/extinguisher_cabinet/west, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/adhomian_circus/starboard) "vNj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/plating{ @@ -41902,7 +41893,7 @@ aSm lsQ knX aSm -vLF +thx aSm aSm aUK diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm index 70a454e9c94..892249e9231 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm @@ -1,8 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aaa" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/structure/cable/green{ d1 = 1; @@ -434,8 +433,7 @@ /area/tajaran_smuggler/engine) "bzW" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -681,7 +679,6 @@ /area/tajaran_smuggler) "dhp" = ( /obj/machinery/computer/ship/helm{ - req_access = null; dir = 1 }, /turf/simulated/floor/carpet/art{ @@ -1066,7 +1063,6 @@ /area/tajaran_smuggler/atmos) "fjf" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -1177,8 +1173,7 @@ pixel_x = -32 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/machinery/firealarm/north, /obj/machinery/light/small{ @@ -1235,7 +1230,6 @@ /area/shuttle/tajaran_smuggler) "fVv" = ( /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -1273,28 +1267,6 @@ temperature = 278.15 }, /area/tajaran_smuggler) -"fYB" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/tajaran_smuggler) "fZq" = ( /obj/machinery/door/airlock/hatch{ name = "Cockpit"; @@ -1549,8 +1521,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -2103,8 +2074,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -2531,8 +2501,7 @@ /area/shuttle/tajaran_smuggler_cargo) "lOJ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor{ temperature = 278.15 @@ -2592,8 +2561,7 @@ /area/tajaran_smuggler) "lXE" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor{ temperature = 278.15 @@ -2731,8 +2699,7 @@ "mEc" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, @@ -2847,8 +2814,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3031,8 +2997,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /turf/simulated/floor{ temperature = 278.15 @@ -3167,7 +3132,6 @@ /area/tajaran_smuggler) "pGP" = ( /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -3191,8 +3155,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -3484,8 +3447,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - icon_state = "map-scrubbers" + dir = 8 }, /turf/simulated/floor{ temperature = 278.15 @@ -3722,8 +3684,7 @@ /area/tajaran_smuggler/atmos) "tgZ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/structure/cable/green{ d1 = 2; @@ -3747,9 +3708,7 @@ }, /area/tajaran_smuggler/power) "ttw" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/storage/box/produce{ pixel_x = 3; pixel_y = -11 @@ -4444,7 +4403,6 @@ /area/tajaran_smuggler/power) "xQL" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -4487,8 +4445,7 @@ /area/tajaran_smuggler) "xYA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -35728,7 +35685,7 @@ aaJ oPT oPT oPT -fYB +pVt oPT oPT oPT diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm index 152e05ed06c..9f7bca4217d 100644 --- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm +++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm @@ -2125,8 +2125,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/cable{ icon_state = "2-8" @@ -3814,8 +3813,7 @@ /area/ship/tirakqi_smuggler/capt) "xu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/spline/plain{ @@ -3860,7 +3858,6 @@ /area/ship/tirakqi_smuggler/bridge) "xJ" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "tirakqi_co2_out_starboard" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -4355,8 +4352,7 @@ /obj/machinery/door/firedoor/noid, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = -4; - dir = 2 + pixel_y = -4 }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock/docking{ @@ -4496,7 +4492,6 @@ /area/ship/tirakqi_smuggler/bridge) "Bf" = ( /obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null; anchored = 1 }, /obj/item/reagent_containers/food/snacks/meat, @@ -4587,7 +4582,6 @@ /area/ship/tirakqi_smuggler/bridge) "BH" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "tirakqi_co2_out_port" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -5117,8 +5111,7 @@ /obj/machinery/door/firedoor/noid, /obj/machinery/access_button{ pixel_x = -28; - pixel_y = -4; - dir = 2 + pixel_y = -4 }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock/docking{ @@ -5412,8 +5405,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/shuttle/skrell/blue, /area/ship/tirakqi_smuggler/crew) @@ -5908,8 +5900,7 @@ /area/ship/tirakqi_smuggler/bridge) "JN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -6164,7 +6155,6 @@ dir = 1 }, /obj/item/coin/phoron{ - pixel_y = 8; pixel_x = -6 }, /obj/item/stack/material/phoron{ @@ -7651,8 +7641,7 @@ /area/ship/tirakqi_smuggler/hall) "UZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dmm b/maps/away/ships/tramp_freighter/tramp_freighter.dmm index b73a9398f19..1ce60485917 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dmm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dmm @@ -303,8 +303,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/tramp_freighter/starboard_docking) @@ -422,8 +421,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -485,8 +483,7 @@ "cO" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -538,8 +535,7 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/access_button{ pixel_x = -28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/cable/green{ @@ -805,8 +801,7 @@ /obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 29; - pixel_y = -5; - dir = 2 + pixel_y = -5 }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/decal/cleanable/dirt, @@ -1201,8 +1196,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/tramp_freighter/port_docking) @@ -1231,7 +1225,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1336; - icon_state = "map_injector"; id = "tramp_air_out_in_3" }, /turf/simulated/floor/reinforced/airmix, @@ -1394,7 +1387,6 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/plating, @@ -1592,8 +1584,7 @@ "ig" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -1861,8 +1852,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tramp_freighter/starboard_docking) @@ -2779,8 +2769,7 @@ "ol" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/plating, /area/tramp_freighter/cargo) @@ -3361,8 +3350,7 @@ "rF" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/plating, /area/tramp_freighter/cargo) @@ -4391,8 +4379,7 @@ /area/tramp_freighter/washroom) "vY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -4477,7 +4464,6 @@ frequency = 1337 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28 }, /obj/machinery/light/small, @@ -4878,8 +4864,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -4978,8 +4963,7 @@ /area/tramp_freighter/engi) "yS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ icon_state = "1-8" @@ -5260,8 +5244,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tramp_freighter/port_docking) @@ -5269,7 +5252,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 1; frequency = 1336; - icon_state = "map_injector"; id = "tramp_air_out_in_2" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -5410,8 +5392,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ d1 = 2; @@ -6220,8 +6201,7 @@ dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/marble, /area/tramp_freighter/kitchen) @@ -6420,8 +6400,7 @@ /area/tramp_freighter/refinery) "GZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/plating, /area/shuttle/freighter_shuttle) @@ -6531,8 +6510,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -7138,8 +7116,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ d1 = 1; @@ -7969,8 +7946,7 @@ "Pt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -9787,7 +9763,6 @@ dir = 4 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28 }, /obj/machinery/light/small, @@ -9979,7 +9954,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 1; frequency = 1336; - icon_state = "map_injector"; id = "tramp_air_out_in_1" }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -10075,8 +10049,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /turf/simulated/floor/marble, /area/tramp_freighter/kitchen) diff --git a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm index 0441bfdd6d9..b0ba7f749c5 100644 --- a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm +++ b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm @@ -23,12 +23,8 @@ /turf/simulated/floor/plating, /area/hiskyn_ship/engineering) "aab" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/shuttle/hiskyn_revanchists) "aac" = ( @@ -65,12 +61,8 @@ /turf/simulated/floor/tiled/freezer, /area/hiskyn_ship/bathroom) "aah" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -145,12 +137,8 @@ /turf/simulated/floor/carpet/rubber, /area/hiskyn_ship/trophy) "aan" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 4; @@ -192,12 +180,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -209,7 +193,6 @@ pixel_y = 28 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -233,9 +216,7 @@ /turf/simulated/floor/shuttle/black, /area/hiskyn_ship/cic) "aav" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -393,9 +374,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -410,9 +389,7 @@ /turf/simulated/floor/plating, /area/hiskyn_ship/hallc) "abh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -463,12 +440,8 @@ /area/hiskyn_ship/blaster) "abm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -553,12 +526,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -584,12 +553,8 @@ /turf/simulated/floor/plating, /area/hiskyn_ship/thrustp) "abu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -624,18 +589,13 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled/dark/full, /area/hiskyn_ship/cargobay) "abx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, @@ -657,24 +617,16 @@ name = "Trophy Room"; req_access = list(210) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/tiled/dark/full, /area/hiskyn_ship/cargobay) "acb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -760,12 +712,8 @@ /turf/simulated/floor/plating, /area/hiskyn_ship/engineering) "acg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -904,8 +852,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/effect/floor_decal/industrial/hatch/red, /turf/simulated/floor/reinforced, @@ -940,12 +887,8 @@ dir = 1; req_access = list(210) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -1077,12 +1020,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -1137,12 +1076,8 @@ name = "Engineering"; req_access = list(210) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -1168,8 +1103,7 @@ /area/hiskyn_ship/hallc) "amO" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -1329,8 +1263,7 @@ /area/hiskyn_ship/medbay) "asp" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -1500,13 +1433,6 @@ "aAD" = ( /turf/simulated/floor/reinforced/carbon_dioxide, /area/hiskyn_ship/hallc) -"aAW" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "aBr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -2133,12 +2059,8 @@ /area/hiskyn_ship/blaster) "aSb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -2216,7 +2138,6 @@ /area/space) "aUc" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "co2_out"; dir = 4 }, @@ -2290,12 +2211,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-8" }, @@ -2364,12 +2281,8 @@ /area/hiskyn_ship/medbay) "aYO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -2409,12 +2322,8 @@ /turf/simulated/wall/shuttle/dark/cardinal/red, /area/hiskyn_ship/thrusts) "bLK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, @@ -2582,9 +2491,7 @@ /turf/simulated/floor/tiled/dark, /area/hiskyn_ship/blaster) "ctV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -2977,12 +2884,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -3097,12 +3000,8 @@ /turf/simulated/floor/tiled/dark, /area/hiskyn_ship/francisca) "gbX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -3182,8 +3081,7 @@ "gEX" = ( /obj/structure/ship_weapon_dummy, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/airless, /area/space) @@ -3721,12 +3619,8 @@ /turf/simulated/floor/carpet/brown, /area/hiskyn_ship/captain) "jkb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -3765,12 +3659,8 @@ /area/space) "jFM" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -4168,12 +4058,8 @@ /turf/simulated/floor/plating, /area/hiskyn_ship/hallc) "lPL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -4189,12 +4075,8 @@ /turf/simulated/floor/plating, /area/hiskyn_ship/hallc) "lSI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "4-8" }, @@ -4731,12 +4613,8 @@ /turf/simulated/floor/shuttle/black, /area/hiskyn_ship/cic) "oGV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -4997,12 +4875,8 @@ /turf/simulated/wall/shuttle/dark/cardinal/red, /area/hiskyn_ship/engineering) "qDP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable/green{ d1 = 1; @@ -5537,9 +5411,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -5662,9 +5534,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -5844,12 +5714,8 @@ /turf/simulated/floor/tiled/dark, /area/hiskyn_ship/hallc) "vvx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -5910,12 +5776,8 @@ /turf/simulated/floor/tiled/dark, /area/hiskyn_ship/bridge) "vYc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -5963,12 +5825,8 @@ /turf/simulated/floor/plating, /area/hiskyn_ship/thrustp) "wBg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, @@ -36683,7 +36541,7 @@ ljL ans ans aPB -aAW +aFN aOI aub aaz @@ -36940,7 +36798,7 @@ vvG ans ans aPB -aAW +aFN aOI aNI aAD @@ -37197,7 +37055,7 @@ vvG vvG ans aPB -aAW +aFN aOI aFE ahv diff --git a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm index cecc9bd352d..2005d682d06 100644 --- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm +++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm @@ -87,8 +87,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/shuttle/unathi_pirate_izharshan/operations) @@ -168,8 +167,7 @@ pixel_x = 5 }, /obj/item/reagent_containers/food/condiment/shaker/spacespice{ - pixel_x = -2; - pixel_y = 0 + pixel_x = -2 }, /obj/item/reagent_containers/food/condiment/enzyme{ pixel_y = 4; @@ -301,8 +299,7 @@ id_tag = "unathi_pirate_izharshan_pump" }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/lattice/catwalk/indoor, /obj/structure/bed/handrail{ @@ -616,8 +613,7 @@ /area/shuttle/unathi_pirate_izharshan/dorms) "pN" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/wall/shuttle/raider, /area/shuttle/unathi_pirate_izharshan/helm) @@ -1156,8 +1152,7 @@ /obj/item/material/harpoon, /obj/item/material/harpoon, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/item/melee/energy/sword/pirate{ pixel_y = 1 @@ -1181,8 +1176,7 @@ icon_state = "0-4" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 @@ -1491,8 +1485,7 @@ /area/shuttle/unathi_pirate_izharshan/operations) "Lz" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/cable/green{ d1 = 1; @@ -1648,8 +1641,7 @@ /area/shuttle/unathi_pirate_izharshan/helm) "Ol" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/structure/sign/flag/izharshan{ pixel_y = 28 @@ -1911,8 +1903,7 @@ "Ut" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/table/rack, /obj/item/ship_ammunition/bruiser, @@ -2233,8 +2224,7 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/machinery/door/airlock/external{ frequency = 1380; @@ -2251,8 +2241,7 @@ /area/shuttle/unathi_pirate_izharshan/helm) "Zx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/shuttle/unathi_pirate_izharshan/operations) diff --git a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm index d7758eb6610..7faf29edb55 100644 --- a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm +++ b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm @@ -174,8 +174,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -213,9 +212,7 @@ /obj/effect/floor_decal/corner/yellow{ dir = 5 }, -/obj/effect/floor_decal/corner/yellow{ - dir = 2 - }, +/obj/effect/floor_decal/corner/yellow, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled, /area/tarwa_ship/eva) @@ -499,7 +496,6 @@ pixel_x = -6 }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal{ - pixel_y = 0; pixel_x = -4 }, /obj/item/clothing/mask/smokable/pipe{ @@ -930,7 +926,6 @@ pixel_x = 7 }, /obj/machinery/button/distress{ - dir = 2; pixel_x = 7; pixel_y = -2 }, @@ -1004,8 +999,7 @@ /area/shuttle/tarwa) "jc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -1121,7 +1115,6 @@ "jE" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - name = "blast door"; id = "tarwa_bridge" }, /obj/effect/map_effect/window_spawner/full/shuttle/raider, @@ -1641,8 +1634,7 @@ /area/tarwa_ship/captain) "pC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 5 @@ -1656,8 +1648,7 @@ }, /obj/effect/map_effect/window_spawner/full/shuttle/raider, /obj/machinery/door/blast/regular/open{ - id = "tarwa_tank_co2_shield"; - name = "blast door" + id = "tarwa_tank_co2_shield" }, /turf/space, /area/tarwa_ship/engineering2) @@ -2273,8 +2264,7 @@ /area/tarwa_ship/engineering1) "wK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /turf/simulated/floor/carpet/red, /area/tarwa_ship/captain) @@ -2354,9 +2344,7 @@ /obj/effect/floor_decal/corner/yellow{ dir = 5 }, -/obj/effect/floor_decal/corner/yellow{ - dir = 2 - }, +/obj/effect/floor_decal/corner/yellow, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/tarwa_ship/oldhangar) @@ -2553,8 +2541,7 @@ /area/tarwa_ship/medical) "zl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -2574,8 +2561,7 @@ /area/tarwa_ship/crew) "zn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /turf/simulated/floor/diona, /area/tarwa_ship/bridge) @@ -2695,7 +2681,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1441; - icon_state = "map_injector"; id = "tarwa_tank_air_in" }, /turf/simulated/floor/reinforced/airmix, @@ -2735,8 +2720,7 @@ }, /obj/effect/floor_decal/corner_wide/paleblue, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, @@ -2851,7 +2835,6 @@ "BD" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - name = "blast door"; id = "tarwa_lockdown" }, /obj/effect/map_effect/window_spawner/full/shuttle/raider, @@ -2877,8 +2860,7 @@ }, /obj/effect/map_effect/window_spawner/full/shuttle/raider, /obj/machinery/door/blast/regular/open{ - id = "tarwa_tank_co2_shield"; - name = "blast door" + id = "tarwa_tank_co2_shield" }, /turf/simulated/floor/plating, /area/tarwa_ship/engineering2) @@ -2942,7 +2924,6 @@ pixel_y = 6 }, /obj/item/journal{ - pixel_y = 0; pixel_x = -9 }, /turf/simulated/floor/diona, @@ -3122,7 +3103,6 @@ "DD" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - name = "blast door"; id = "tarwa_lockdown" }, /obj/effect/map_effect/window_spawner/full/shuttle/raider, @@ -3283,7 +3263,6 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - name = "blast door"; id = "tarwa_bridge" }, /obj/effect/map_effect/window_spawner/full/shuttle/raider, @@ -3349,7 +3328,6 @@ dir = 1 }, /obj/machinery/door/blast/regular/open{ - name = "blast door"; dir = 4; id = "tarwa_cic" }, @@ -3371,8 +3349,7 @@ /area/shuttle/tarwa) "Ft" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -3629,7 +3606,6 @@ }, /obj/machinery/door/blast/regular/open{ dir = 4; - name = "blast door"; id = "tarwa_lockdown" }, /obj/effect/floor_decal/industrial/hatch/grey, @@ -3681,8 +3657,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ d1 = 1; @@ -3959,8 +3934,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/media/jukebox{ anchored = 1 @@ -3987,8 +3961,7 @@ /area/tarwa_ship/engineering1) "KS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/structure/cable/green{ d1 = 4; @@ -4014,8 +3987,7 @@ "Lc" = ( /obj/effect/map_effect/window_spawner/full/shuttle/raider, /obj/machinery/door/blast/regular/open{ - id = "tarwa_rotary"; - name = "blast door" + id = "tarwa_rotary" }, /turf/space, /area/tarwa_ship/oldhangar) @@ -4494,8 +4466,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -4684,8 +4655,7 @@ "QH" = ( /obj/machinery/door/airlock/hatch{ name = "Telecommunications"; - req_one_access = list(210); - dir = 2 + req_one_access = list(210) }, /obj/structure/plasticflaps/airtight, /turf/simulated/floor/plating, @@ -4905,7 +4875,6 @@ "Se" = ( /obj/machinery/door/blast/regular/open{ dir = 4; - name = "blast door"; id = "tarwa_bruiser" }, /turf/simulated/floor/plating{ @@ -4916,7 +4885,6 @@ /obj/effect/map_effect/window_spawner/full/shuttle/raider, /obj/machinery/door/blast/regular/open{ id = "tarwa_rotary"; - name = "blast door"; dir = 4 }, /turf/simulated/floor/plating, @@ -4927,8 +4895,7 @@ /area/tarwa_ship/engineering2) "Sw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -4986,8 +4953,7 @@ /area/tarwa_ship/bridge) "SK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -5025,9 +4991,7 @@ /turf/simulated/floor/plating, /area/tarwa_ship/engineering2) "TA" = ( -/obj/structure/bed/stool/wood{ - dir = 2 - }, +/obj/structure/bed/stool/wood, /turf/simulated/floor/diona, /area/tarwa_ship/oldhangar) "TC" = ( @@ -5396,8 +5360,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -5491,8 +5454,7 @@ "Zc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, diff --git a/maps/away/ships/xanu/xanu_frigate.dmm b/maps/away/ships/xanu/xanu_frigate.dmm index 440b901d030..61e3893a83d 100644 --- a/maps/away/ships/xanu/xanu_frigate.dmm +++ b/maps/away/ships/xanu/xanu_frigate.dmm @@ -3683,7 +3683,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/effect/floor_decal/corner/orange{ @@ -4024,7 +4023,6 @@ /area/ship/xanu_frigate/galley) "nN" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4542,7 +4540,6 @@ dir = 8 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -4873,7 +4870,6 @@ dir = 1 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/gunmetal, @@ -7766,7 +7762,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/effect/floor_decal/corner/orange{ @@ -8863,7 +8858,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -14155,7 +14149,6 @@ dir = 1 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/cable{ diff --git a/maps/away/ships/yacht/yacht.dmm b/maps/away/ships/yacht/yacht.dmm index 5b8b4e198af..0059468cab5 100644 --- a/maps/away/ships/yacht/yacht.dmm +++ b/maps/away/ships/yacht/yacht.dmm @@ -387,18 +387,14 @@ /turf/simulated/floor/tiled/freezer, /area/shuttle/yacht/living) "bq" = ( -/obj/structure/bookcase/libraryspawn/fiction{ - name = "bookcase" - }, +/obj/structure/bookcase/libraryspawn/fiction, /turf/simulated/floor/carpet/purple, /area/shuttle/yacht/living) "br" = ( /obj/machinery/light/small{ dir = 1 }, -/obj/structure/bookcase/libraryspawn/nonfiction{ - name = "bookcase" - }, +/obj/structure/bookcase/libraryspawn/nonfiction, /turf/simulated/floor/carpet/purple, /area/shuttle/yacht/living) "bs" = ( @@ -1608,9 +1604,7 @@ /turf/simulated/wall/titanium, /area/shuttle/yacht/living) "Wr" = ( -/obj/structure/bookcase/libraryspawn/reference{ - name = "bookcase" - }, +/obj/structure/bookcase/libraryspawn/reference, /turf/simulated/floor/carpet/purple, /area/shuttle/yacht/living) "WI" = ( diff --git a/maps/away/ships/yacht_civ/yacht_civ.dmm b/maps/away/ships/yacht_civ/yacht_civ.dmm index ef1d19f9bf5..a320cdf0ebf 100644 --- a/maps/away/ships/yacht_civ/yacht_civ.dmm +++ b/maps/away/ships/yacht_civ/yacht_civ.dmm @@ -72,12 +72,10 @@ /area/ship/yacht_civ/storage) "aU" = ( /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -336,7 +334,6 @@ /area/shuttle/yacht_civ_shuttle) "dF" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -683,8 +680,7 @@ }, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -740,8 +736,7 @@ "hb" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/full, @@ -829,8 +824,7 @@ pixel_y = 3 }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/wine{ - pixel_x = 1; - pixel_y = 0 + pixel_x = 1 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -1008,9 +1002,7 @@ "jA" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 2 - }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/engineering) "jJ" = ( @@ -1029,9 +1021,7 @@ /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/palebush, /obj/effect/decal/cleanable/generic/beet_tree_petals, -/obj/machinery/light/colored/red{ - dir = 2 - }, +/obj/machinery/light/colored/red, /turf/simulated/floor/exoplanet/grass, /area/ship/yacht_civ/hallway_mid) "kh" = ( @@ -1085,7 +1075,6 @@ /area/ship/yacht_civ/quarters) "ky" = ( /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -1142,8 +1131,7 @@ dir = 1 }, /obj/item/coin/gold{ - pixel_x = 7; - pixel_y = -2 + pixel_x = 7 }, /obj/item/pocketwatch{ pixel_x = -4; @@ -1454,8 +1442,7 @@ "nh" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -1574,9 +1561,7 @@ "oo" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 2 - }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/kitchen) "ou" = ( @@ -1643,12 +1628,10 @@ dir = 4 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -1873,9 +1856,7 @@ /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/lounge) "qB" = ( -/obj/structure/bed/stool/chair/sofa/left/violet{ - dir = 2 - }, +/obj/structure/bed/stool/chair/sofa/left/violet, /turf/simulated/floor/carpet/purple, /area/ship/yacht_civ/lounge) "qC" = ( @@ -2084,7 +2065,6 @@ "tB" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -2292,8 +2272,7 @@ dir = 1 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/full, @@ -2468,9 +2447,7 @@ /obj/effect/floor_decal/industrial/outline_door/red{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline_segment/red{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/outline_segment/red, /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/hallway_mid) "wZ" = ( @@ -2514,9 +2491,7 @@ /turf/simulated/floor/carpet/purple, /area/ship/yacht_civ/lounge) "xN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/plating, /area/ship/yacht_civ/engineering) "xO" = ( @@ -2612,9 +2587,7 @@ "yx" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 2 - }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/quarters) "yy" = ( @@ -2697,9 +2670,7 @@ /obj/effect/floor_decal/industrial/outline_door/red{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline_segment/red{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/outline_segment/red, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 9 }, @@ -2888,9 +2859,7 @@ /obj/effect/floor_decal/industrial/outline_door/red{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline_segment/red{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/outline_segment/red, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 9 }, @@ -3009,9 +2978,7 @@ "CQ" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 2 - }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/storage) "CT" = ( @@ -3408,9 +3375,7 @@ /obj/effect/floor_decal/industrial/outline_straight/red{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline_segment/red{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/outline_segment/red, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) "Fz" = ( @@ -3510,9 +3475,7 @@ /obj/effect/floor_decal/industrial/outline_door/red{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline_segment/red{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/outline_segment/red, /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 9 }, @@ -3677,8 +3640,7 @@ pixel_y = 4 }, /obj/item/flame/candle{ - pixel_x = 9; - pixel_y = 0 + pixel_x = 9 }, /obj/effect/floor_decal/corner/green/diagonal, /obj/item/towel/random{ @@ -3773,9 +3735,7 @@ /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 9 }, -/obj/effect/floor_decal/industrial/outline_segment/red{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/outline_segment/red, /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/hallway_mid) "It" = ( @@ -3882,9 +3842,7 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/ship/yacht_civ/engineering) "Jb" = ( -/obj/effect/floor_decal/industrial/outline_segment/red{ - dir = 2 - }, +/obj/effect/floor_decal/industrial/outline_segment/red, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) "Jd" = ( @@ -4103,9 +4061,7 @@ /turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) "KL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/light/colored/decayed, /turf/simulated/floor/plating, /area/ship/yacht_civ/propulsion) @@ -4854,8 +4810,7 @@ "QM" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/shuttle_landmark/yacht_civ/dock/fore{ dir = 1 @@ -5397,7 +5352,6 @@ "UO" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -5466,8 +5420,7 @@ icon_state = "1-2" }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, @@ -5493,7 +5446,6 @@ pixel_y = -3 }, /obj/item/storage/box/fancy/cigpaper/fine{ - pixel_y = 0; pixel_x = -4 }, /obj/item/storage/box/fancy/cigpaper{ @@ -5578,9 +5530,7 @@ /area/ship/yacht_civ/lounge) "Wu" = ( /obj/random/pottedplant, -/obj/machinery/light/colored/blue{ - dir = 2 - }, +/obj/machinery/light/colored/blue, /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/hallway_mid) "WA" = ( diff --git a/maps/dungeon_spawns/coc_ship_unique.dmm b/maps/dungeon_spawns/coc_ship_unique.dmm index 2de22c9c0fa..4e7dbbaa253 100644 --- a/maps/dungeon_spawns/coc_ship_unique.dmm +++ b/maps/dungeon_spawns/coc_ship_unique.dmm @@ -301,7 +301,6 @@ /area/dungeon/crashed_ship) "gB" = ( /obj/machinery/door/airlock/external{ - electrified_until = 0; icon_state = "door_locked"; locked = 1; welded = 1; @@ -957,8 +956,7 @@ name = "dilapitated cryogenic freezer"; pixel_x = 1 }, -/obj/effect/decal/cleanable/dirt{ - }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/dungeon/crashed_ship) "tA" = ( @@ -978,8 +976,7 @@ name = "dilapitated cryogenic freezer"; pixel_x = 1 }, -/obj/effect/decal/cleanable/dirt{ - }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/dungeon/crashed_ship) "tU" = ( @@ -1657,7 +1654,6 @@ /area/mine/unexplored) "Iw" = ( /obj/machinery/door/airlock/external{ - electrified_until = 0; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -1842,8 +1838,7 @@ /obj/structure/closet/walllocker/medical/secure{ name = "blood closet"; pixel_y = 32; - req_access = null; - store_mobs = 0 + req_access = null }, /obj/item/reagent_containers/blood/OMinus, /obj/effect/floor_decal/corner/green/diagonal, diff --git a/maps/dungeon_spawns/satellite_crash_unique.dmm b/maps/dungeon_spawns/satellite_crash_unique.dmm index 8f902ecf458..12354268ea3 100644 --- a/maps/dungeon_spawns/satellite_crash_unique.dmm +++ b/maps/dungeon_spawns/satellite_crash_unique.dmm @@ -34,8 +34,7 @@ /area/dungeon/crashed_satellite) "i" = ( /obj/effect/decal/cleanable/liquid_fuel, -/obj/structure/computerframe{ - }, +/obj/structure/computerframe, /obj/item/device/gps, /obj/item/material/shard, /turf/simulated/floor/airless, diff --git a/maps/dungeon_spawns/shuttle_unique.dmm b/maps/dungeon_spawns/shuttle_unique.dmm index 6d30dd355cb..9b5caef6868 100644 --- a/maps/dungeon_spawns/shuttle_unique.dmm +++ b/maps/dungeon_spawns/shuttle_unique.dmm @@ -395,12 +395,6 @@ /obj/item/reagent_containers/blood/ripped, /turf/simulated/floor/tiled/white, /area/dungeon/crashed_ship) -"bh" = ( -/obj/machinery/door/airlock/hatch{ - dir = 1 - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/dungeon/crashed_ship) "bi" = ( /obj/structure/table/rack, /obj/item/clothing/head/helmet, @@ -978,7 +972,7 @@ ai au ai ai -bh +bo ai au ai diff --git a/maps/dungeon_spawns/skrell_crash_unique.dmm b/maps/dungeon_spawns/skrell_crash_unique.dmm index 50f15c054f4..3b0be81ed74 100644 --- a/maps/dungeon_spawns/skrell_crash_unique.dmm +++ b/maps/dungeon_spawns/skrell_crash_unique.dmm @@ -8,7 +8,6 @@ "ac" = ( /obj/structure/window/shuttle/skrell, /obj/structure/grille/diagonal{ - icon_state = "grille_diagonal"; dir = 8 }, /turf/simulated/open/airless, @@ -35,7 +34,6 @@ /area/dungeon/skrell_ship) "ah" = ( /obj/structure/bed/stool/chair/office/hover{ - icon_state = "hover_chair"; dir = 1 }, /turf/simulated/floor/shuttle/skrell/blue, @@ -49,21 +47,12 @@ /obj/structure/computerframe, /turf/simulated/floor/shuttle/skrell, /area/dungeon/skrell_ship) -"ak" = ( -/obj/machinery/door/airlock/external{ - icon_state = "door_locked"; - locked = 1; - dir = 4 - }, -/turf/simulated/floor/shuttle/advanced, -/area/dungeon/skrell_ship) "al" = ( /turf/simulated/floor/shuttle/skrell/blue, /area/dungeon/skrell_ship) "am" = ( /obj/structure/windoor_assembly{ dir = 2; - icon_state = "l_windoor_assembly01"; name = "Command Copula" }, /turf/simulated/floor/shuttle/skrell/ramp, @@ -71,7 +60,6 @@ "an" = ( /obj/structure/window/shuttle/skrell, /obj/structure/grille/diagonal{ - icon_state = "grille_diagonal"; dir = 4 }, /turf/simulated/floor/shuttle/skrell/blue, @@ -91,7 +79,6 @@ "aq" = ( /obj/structure/window/shuttle/skrell, /obj/structure/grille/diagonal{ - icon_state = "grille_diagonal"; dir = 1 }, /turf/simulated/open/airless, @@ -119,7 +106,6 @@ /area/dungeon/skrell_ship) "av" = ( /obj/structure/bed/stool/chair/office/hover/command{ - icon_state = "hover_command"; dir = 1 }, /turf/simulated/floor/shuttle/skrell, @@ -188,7 +174,6 @@ /area/dungeon/skrell_ship) "aF" = ( /obj/machinery/body_scanconsole{ - icon_state = "body_scannerconsole"; dir = 1 }, /obj/effect/floor_decal/industrial/warning, @@ -348,8 +333,7 @@ /obj/item/storage/box/gloves, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning{ - icon_state = "loadingarea"; - dir = 2 + icon_state = "loadingarea" }, /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -691,13 +675,8 @@ /obj/item/clothing/under/gearharness, /turf/simulated/floor/shuttle/skrell, /area/dungeon/skrell_ship) -"cl" = ( -/obj/structure/sign/flag/nralakk/large/north, -/turf/simulated/floor/shuttle/skrell, -/area/dungeon/skrell_ship) "cm" = ( /obj/structure/cryofeed{ - icon_state = "cryo_rear"; dir = 2 }, /obj/machinery/light/skrell{ @@ -781,9 +760,6 @@ }, /turf/simulated/floor/shuttle/skrell/blue, /area/dungeon/skrell_ship) -"cz" = ( -/turf/simulated/wall/shuttle/skrell, -/area/dungeon/skrell_ship) "cA" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/tracks/footprints, @@ -808,14 +784,6 @@ /obj/item/clothing/suit/space/void/skrell/white, /turf/simulated/floor/shuttle/advanced, /area/dungeon/skrell_ship) -"cD" = ( -/obj/machinery/door/airlock/external{ - icon_state = "door_locked"; - locked = 1; - dir = 4 - }, -/turf/simulated/floor/shuttle/advanced, -/area/dungeon/skrell_ship) "cH" = ( /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/shuttle/advanced, @@ -861,7 +829,7 @@ /obj/item/stack/material/plasteel, /obj/item/powerdrill, /obj/item/landmine/frag{ - deployed = 1; + deployed = 1 }, /turf/simulated/floor/shuttle/advanced, /area/dungeon/skrell_ship) @@ -994,7 +962,7 @@ ab aa ap ad -cD +bx ad ap aa @@ -1062,7 +1030,7 @@ ap ap ap aS -ak +bx ad ap ap @@ -1125,7 +1093,7 @@ ab ab ab ap -cl +ce ck aL cA @@ -1161,8 +1129,8 @@ ad ap aK aK -cz -cz +ap +ap bw ap ap @@ -1195,7 +1163,7 @@ bz ap bV aH -cz +ap aN aC aZ @@ -1267,8 +1235,8 @@ ap aP aG bp -cz -cz +ap +ap al al ct @@ -1403,8 +1371,8 @@ ap by aC cB -cz -cz +ap +ap cp al cs @@ -1467,7 +1435,7 @@ bE ap bV aH -cz +ap bv aC aZ @@ -1501,8 +1469,8 @@ ad ap aH aK -cz -cz +ap +ap bC ap ap @@ -1567,7 +1535,7 @@ ab ab ab ap -cl +ce bX aH aH @@ -1674,7 +1642,7 @@ ab ab ap ad -cD +bx ad ap ab diff --git a/maps/dungeon_spawns/sol_bunker_unique.dmm b/maps/dungeon_spawns/sol_bunker_unique.dmm index 1d066f92989..0ea165a7254 100644 --- a/maps/dungeon_spawns/sol_bunker_unique.dmm +++ b/maps/dungeon_spawns/sol_bunker_unique.dmm @@ -24,13 +24,6 @@ /obj/machinery/appliance/cooker/fryer, /turf/simulated/floor/tiled, /area/dungeon/sol_outpost) -"ag" = ( -/obj/machinery/door/airlock/centcom{ - opacity = 1; - dir = 1 - }, -/turf/simulated/floor/wood, -/area/dungeon/sol_outpost) "ah" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -66,14 +59,6 @@ /area/dungeon/sol_outpost) "am" = ( /obj/machinery/door/airlock/centcom{ - opacity = 1; - dir = 1 - }, -/turf/simulated/floor/wood, -/area/dungeon/sol_outpost) -"an" = ( -/obj/machinery/door/airlock/centcom{ - opacity = 1; dir = 1 }, /turf/simulated/floor/wood, @@ -238,9 +223,6 @@ }, /turf/simulated/floor/tiled/airless, /area/dungeon/sol_outpost) -"aS" = ( -/turf/simulated/floor/tiled/airless, -/area/dungeon/sol_outpost) "aT" = ( /obj/structure/sink{ dir = 8; @@ -358,13 +340,6 @@ }, /turf/simulated/floor, /area/dungeon/sol_outpost) -"bn" = ( -/obj/machinery/door/airlock/centcom{ - opacity = 1; - dir = 1 - }, -/turf/simulated/floor/wood, -/area/dungeon/sol_outpost) "bo" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -396,7 +371,6 @@ /area/dungeon/sol_outpost) "br" = ( /obj/machinery/door/airlock/centcom{ - opacity = 1; dir = 4 }, /turf/simulated/floor/wood, @@ -853,16 +827,12 @@ name = "dilapitated cryogenic freezer"; pixel_x = 1 }, -/obj/effect/decal/cleanable/dirt{ - }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ nitrogen = 0; oxygen = 0 }, /area/dungeon/sol_outpost) -"cA" = ( -/turf/unsimulated/floor/asteroid/ash/rocky, -/area/mine/unexplored) "cB" = ( /obj/structure/bed/padded, /obj/item/bedsheet/blue, @@ -896,8 +866,7 @@ /turf/simulated/floor/wood, /area/dungeon/sol_outpost) "cG" = ( -/obj/effect/decal/cleanable/dirt{ - }, +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/fake_object{ density = 1; desc = "An old cryogenic freezer ."; @@ -1315,8 +1284,8 @@ aa aa dc dc -cA -cA +de +de dc dc dc @@ -1348,7 +1317,7 @@ aa aa dc dc -cA +de aX ab ac @@ -1381,10 +1350,10 @@ dc dc dc dc -cA -cA -cA -cA +de +de +de +de aZ bg bm @@ -1415,10 +1384,10 @@ aa df df df -cA -cA -cA -cA +de +de +de +de aZ bh bh @@ -1449,9 +1418,9 @@ aa df df df -cA +de aX -cA +de bC ac ac @@ -1471,9 +1440,9 @@ dc dc aa aa -cA +de aa -cA +de aa aa "} @@ -1483,9 +1452,9 @@ aa df df df -cA -cA -cA +de +de +de de ac ac @@ -1505,9 +1474,9 @@ dc dc dc dc -cA -cA -cA +de +de +de aa aa "} @@ -1517,9 +1486,9 @@ dc dc dc dc -cA -cA -cA +de +de +de ac ac aQ @@ -1539,9 +1508,9 @@ dc dc dc dc -cA -cA -cA +de +de +de dc aa "} @@ -1551,8 +1520,8 @@ dc dc dc dc -cA -cA +de +de ac ac aQ @@ -1727,7 +1696,7 @@ aI aQ aN aQ -ag +am bF bx bT @@ -1761,14 +1730,14 @@ aI aN aQ aN -an +am bx cH bT bT bx cH -bn +am aQ OV aQ @@ -1826,7 +1795,7 @@ ao ax aG aA -aS +aQ aN aQ bp @@ -1980,8 +1949,8 @@ dc dc dc dc -cA -cA +de +de dc dc dc @@ -2014,8 +1983,8 @@ dc dc dc dc -cA -cA +de +de dc dc aa @@ -2048,8 +2017,8 @@ dc dc dc df -cA -cA +de +de dc dc aa @@ -2078,12 +2047,12 @@ cN ac dc dc -cA -cA +de +de df -cA -cA -cA +de +de +de dc aa aa @@ -2110,13 +2079,13 @@ QN vX QN tn -cA -cA -cA -cA -cA -cA -cA +de +de +de +de +de +de +de aa aa aa @@ -2145,12 +2114,12 @@ cB cB ac dc -cA -cA -cA -cA -cA -cA +de +de +de +de +de +de aa aa aa @@ -2180,8 +2149,8 @@ cO ac dc dc -cA -cA +de +de aa aa aa diff --git a/maps/dungeon_spawns/vannatusk_unique.dmm b/maps/dungeon_spawns/vannatusk_unique.dmm index d93d87a4d1b..6f46ae45317 100644 --- a/maps/dungeon_spawns/vannatusk_unique.dmm +++ b/maps/dungeon_spawns/vannatusk_unique.dmm @@ -74,12 +74,6 @@ }, /turf/simulated/floor/tiled/asteroid, /area/dungeon/bluespace_outpost) -"ao" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/tiled/asteroid, -/area/dungeon/bluespace_outpost) "ap" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning/dust{ @@ -589,25 +583,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/asteroid, /area/dungeon/bluespace_outpost) -"ca" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/tiled/asteroid, -/area/dungeon/bluespace_outpost) -"cb" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/tiled/asteroid, -/area/dungeon/bluespace_outpost) -"cc" = ( -/obj/machinery/door/airlock/external{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/asteroid, -/area/dungeon/bluespace_outpost) "cd" = ( /obj/machinery/door/airlock/external{ dir = 1 @@ -621,12 +596,6 @@ }, /turf/simulated/floor/tiled/asteroid, /area/dungeon/bluespace_outpost) -"cf" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/turf/simulated/floor/tiled/asteroid, -/area/dungeon/bluespace_outpost) "cg" = ( /obj/machinery/door/airlock/external{ dir = 1 @@ -652,10 +621,6 @@ /mob/living/simple_animal/hostile/vannatusk/dead, /turf/simulated/floor/tiled/asteroid, /area/dungeon/bluespace_outpost) -"FD" = ( -/obj/machinery/power/apc/high/inactive/north, -/turf/simulated/floor/tiled/asteroid, -/area/dungeon/bluespace_outpost) "Iu" = ( /turf/simulated/wall/rusty, /area/dungeon/bluespace_outpost) @@ -714,7 +679,7 @@ Nw Nw Iu Iu -ao +ce Iu Iu Nw @@ -850,7 +815,7 @@ Nw Iu Iu Iu -ca +ce Iu Iu Nw @@ -1055,7 +1020,7 @@ Iu Iu Iu Iu -cb +ce Iu Iu Iu @@ -1122,7 +1087,7 @@ ax Iu aO ad -cc +cd ac ad qX @@ -1232,7 +1197,7 @@ Iu Iu Iu Iu -cf +ce Iu Iu as @@ -1390,7 +1355,7 @@ Nw Iu Iu Iu -FD +ac sX AH ac diff --git a/maps/dungeon_spawns/vault_unique.dmm b/maps/dungeon_spawns/vault_unique.dmm index 062e3e786ae..ccd98f6ecfa 100644 --- a/maps/dungeon_spawns/vault_unique.dmm +++ b/maps/dungeon_spawns/vault_unique.dmm @@ -201,8 +201,7 @@ master_tag = "hidden_vault_airlock"; name = "interior access button"; pixel_x = -28; - req_access = list(53); - req_one_access = null + req_access = list(53) }, /turf/simulated/floor, /area/turret_protected/corp_vault) @@ -257,8 +256,7 @@ master_tag = "hidden_vault_airlock"; name = "exterior access button"; pixel_x = -28; - req_access = list(53); - req_one_access = null + req_access = list(53) }, /turf/simulated/floor, /area/turret_protected/corp_vault) diff --git a/maps/event/generic_dock/code/generic_dock_areas.dm b/maps/event/generic_dock/code/generic_dock_areas.dm index e845730db14..8712e5a1dc2 100644 --- a/maps/event/generic_dock/code/generic_dock_areas.dm +++ b/maps/event/generic_dock/code/generic_dock_areas.dm @@ -11,3 +11,6 @@ requires_power = FALSE dynamic_lighting = TRUE no_light_control = FALSE + +/area/shuttle/administration + name = "Shuttle - Administration" diff --git a/maps/event/generic_dock/generic_dock-1.dmm b/maps/event/generic_dock/generic_dock-1.dmm index ea346e8d2dd..0270687fcd4 100644 --- a/maps/event/generic_dock/generic_dock-1.dmm +++ b/maps/event/generic_dock/generic_dock-1.dmm @@ -1580,9 +1580,6 @@ }, /turf/unsimulated/floor, /area/centcom/spawning) -"aNc" = ( -/turf/unsimulated/floor/plating, -/area/centcom/spawning) "aNs" = ( /obj/effect/floor_decal/corner/red{ dir = 10 @@ -1670,8 +1667,7 @@ "aNY" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/odin/open{ - id = "arrivals_inner"; - name = "blast door" + id = "arrivals_inner" }, /turf/unsimulated/floor, /area/centcom/spawning) @@ -2439,14 +2435,6 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/shuttle/administration) -"bsS" = ( -/obj/structure/table/standard, -/obj/item/storage/box/fancy/tray, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/centcom/holding) "bto" = ( /obj/machinery/light{ dir = 8; @@ -3069,13 +3057,6 @@ /obj/effect/floor_decal/corner/green/full, /turf/unsimulated/floor, /area/centcom/holding) -"cik" = ( -/obj/effect/landmark/thunderdome1, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/tdome/tdome1) "ciV" = ( /turf/simulated/wall/elevator, /area/centcom/spawning) @@ -4322,11 +4303,6 @@ icon_state = "dark_preview" }, /area/centcom/specops) -"dXz" = ( -/turf/unsimulated/floor{ - icon_state = "wood" - }, -/area/centcom/bar) "dXJ" = ( /obj/structure/table/reinforced/steel, /obj/structure/window/reinforced, @@ -7636,12 +7612,6 @@ name = "military corvette" }, /area/shuttle/administration) -"ifi" = ( -/obj/effect/floor_decal/corner/green{ - dir = 6 - }, -/turf/unsimulated/floor, -/area/centcom/bar) "ifs" = ( /obj/machinery/computer/security/telescreen, /obj/effect/floor_decal/corner/orange/diagonal, @@ -9899,11 +9869,6 @@ }, /turf/unsimulated/floor, /area/centcom/spawning) -"kYq" = ( -/turf/unsimulated/floor{ - icon_state = "dark_preview" - }, -/area/centcom/holding) "kYV" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -11461,9 +11426,6 @@ /obj/structure/lattice/catwalk/indoor, /turf/unsimulated/floor/plating, /area/centcom/checkpoint/aft) -"nkX" = ( -/turf/simulated/floor/holofloor/space, -/area/centcom/start) "nli" = ( /obj/effect/floor_decal/spline/plain/black{ dir = 1 @@ -12174,13 +12136,6 @@ icon_state = "wood" }, /area/centcom/specops) -"odb" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/effect/shuttle_landmark/admin/start, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "odx" = ( /obj/effect/decal/fake_object/light_source/invisible, /turf/simulated/floor, @@ -13893,13 +13848,6 @@ }, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/transport1) -"qKr" = ( -/obj/effect/landmark/thunderdome2, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/tdome/tdome2) "qKH" = ( /obj/structure/railing/mapped{ name = "adjusted railing" @@ -14147,22 +14095,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/administration) -"rky" = ( -/obj/structure/table/reinforced/wood, -/obj/machinery/door/blast/odin{ - dir = 4; - icon_state = "shutter1"; - icon_state_closed = "shutter1"; - icon_state_closing = "shutterc1"; - icon_state_open = "shutter0"; - icon_state_opening = "shutterc0"; - id = "CentComBarShutters"; - name = "Bar Shutter" - }, -/turf/unsimulated/floor{ - icon_state = "lino_diamond" - }, -/area/centcom/bar) "rkF" = ( /turf/simulated/wall/shuttle/unique/ert{ icon_state = "8,4" @@ -14380,8 +14312,7 @@ /obj/structure/plasticflaps/airtight, /obj/machinery/door/blast/regular/open{ dir = 8; - id = "corvette_exterior"; - name = "blast door" + id = "corvette_exterior" }, /turf/simulated/floor/reinforced, /area/shuttle/administration) @@ -41292,7 +41223,7 @@ mbe mbe mbe mbe -nkX +mbe mbe mbe mbe @@ -45095,7 +45026,7 @@ pqX pqX pqX pqX -odb +pqX rFI iSG kqG @@ -47201,10 +47132,10 @@ qiY mLh khA lvy -qKr +egh lvy -qKr -qKr +egh +egh lvy rgN wEG @@ -47457,12 +47388,12 @@ bLK qiY bIQ khA -qKr +egh gEh -qKr -qKr +egh +egh gEh -qKr +egh rgN cFp qiY @@ -47714,12 +47645,12 @@ bLK qiY mLh khA -qKr +egh lvy egh -qKr +egh lvy -qKr +egh rgN wEG qiY @@ -47971,12 +47902,12 @@ bLK qiY bIQ khA -qKr +egh gEh -qKr -qKr +egh +egh gEh -qKr +egh rgN cFp qiY @@ -48229,10 +48160,10 @@ qiY mLh khA lvy -qKr -qKr +egh +egh lvy -qKr +egh lvy rgN wEG @@ -49758,9 +49689,9 @@ eJc eJc bQP qrQ -kYq -kYq -kYq +aix +aix +aix wkk avk aiz @@ -51035,7 +50966,7 @@ wjH bQP bLK rAP -kYq +aix aix bQP mAD @@ -51286,23 +51217,23 @@ iEv bQP eMQ liY -kYq +aix liY oBu aDb kVk ebr -kYq -kYq +aix +aix aDb mAD bLK lOO bQP swe -kYq -kYq -kYq +aix +aix +aix ezF avk aiz @@ -51542,15 +51473,15 @@ tRr qwA bQP kUb -kYq -kYq -kYq +aix +aix +aix oBu aag -kYq -kYq -kYq -kYq +aix +aix +aix +aix aah mAD bLK @@ -51792,7 +51723,7 @@ vVC vVC txl bQP -bsS +rvo iGC tRr bCG @@ -51800,14 +51731,14 @@ rvo bQP wfu liY -kYq +aix liY oBu aDb qnC qhn -kYq -kYq +aix +aix aDb mAD bLK @@ -52063,8 +51994,8 @@ tDA bQP bLK wqv -kYq -kYq +aix +aix bQP mAD bLK @@ -52577,7 +52508,7 @@ suV sXE bQP vKf -kYq +aix sAP bQP mAD @@ -52834,7 +52765,7 @@ suV siK bQP iqi -kYq +aix awC aCm mAD @@ -52855,10 +52786,10 @@ nOh iAl lDL wGT -cik -cik +nYH +nYH wGT -cik +nYH wGT ygd eUW @@ -53091,7 +53022,7 @@ suV rsL bQP epa -kYq +aix awC aCm mAD @@ -53111,12 +53042,12 @@ bLK nOh uWm lDL -cik +nYH cwK -cik -cik +nYH +nYH cwK -cik +nYH ygd ihi nOh @@ -53348,7 +53279,7 @@ suV siK bQP iqi -kYq +aix awC aCm mAD @@ -53368,12 +53299,12 @@ bLK nOh iAl lDL -cik +nYH wGT nYH -cik +nYH wGT -cik +nYH ygd eUW nOh @@ -53605,7 +53536,7 @@ suV avT bQP idk -kYq +aix awE bQP mAD @@ -53625,12 +53556,12 @@ bLK nOh uWm lDL -cik +nYH cwK -cik -cik +nYH +nYH cwK -cik +nYH ygd ihi nOh @@ -53837,11 +53768,11 @@ hLp xQs eBz oaC -rky -rky -rky -rky -rky +oaC +oaC +oaC +oaC +oaC hWU vpg irn @@ -53883,10 +53814,10 @@ nOh iAl lDL wGT -cik +nYH wGT -cik -cik +nYH +nYH wGT ygd eUW @@ -54604,7 +54535,7 @@ aqu fOK exm ujM -ifi +exm xps rvN iCW @@ -55896,7 +55827,7 @@ jcv hmF xhC vpg -dXz +vpg eCE vpg kOI @@ -55908,7 +55839,7 @@ qqp cTw cTw cEa -kYq +aix tbP yao yao @@ -56164,9 +56095,9 @@ nli kop tix iIp -kYq -kYq -kYq +aix +aix +aix vCY lWl hEz @@ -56421,9 +56352,9 @@ nli etl qwZ amg -kYq -kYq -kYq +aix +aix +aix vxi nZv vbT @@ -57684,7 +57615,7 @@ aaM eBz tAC iXX -ifi +exm xps eBz gsY @@ -60812,7 +60743,7 @@ aKK aTs isr siZ -aNc +aJH qce pDr aOa diff --git a/maps/event/halloween/halloween.dmm b/maps/event/halloween/halloween.dmm index b8963dcd9e2..e98b0ce0c4f 100644 --- a/maps/event/halloween/halloween.dmm +++ b/maps/event/halloween/halloween.dmm @@ -3523,20 +3523,6 @@ }, /turf/simulated/floor/tiled/full, /area/city/bar) -"oQ" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6; - color = "#400000" - }, -/obj/effect/floor_decal/corner/red{ - dir = 10; - color = "#400000" - }, -/turf/simulated/floor/marble/dark, -/area/city/bar) "oT" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -6435,15 +6421,6 @@ /obj/item/clothing/head/pumpkin/lantern, /turf/simulated/floor/grass, /area/city/outside) -"AH" = ( -/obj/effect/decal/fake_object{ - icon = 'icons/effects/1152x544.dmi'; - icon_state = "cityscape" - }, -/turf/simulated/abyss{ - name = "distant cityscape" - }, -/area/city/nouvelle) "AI" = ( /obj/effect/map_effect/perma_light/brighter, /obj/effect/floor_decal/corner/grey/diagonal, @@ -6638,16 +6615,6 @@ name = "distant cityscape" }, /area/city/nouvelle) -"Bx" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6; - color = "#400000" - }, -/turf/simulated/floor/marble/dark, -/area/city/bar) "Bz" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -6684,13 +6651,6 @@ }, /turf/simulated/floor/grass, /area/city/outside) -"BM" = ( -/obj/effect/decal/fake_object{ - icon = 'icons/effects/1152x544.dmi'; - icon_state = "cityscape" - }, -/turf/simulated/wall, -/area/city/nouvelle) "BP" = ( /obj/structure/table/rack, /obj/item/clothing/under/dress/stripeddress{ @@ -13392,26 +13352,6 @@ }, /turf/simulated/floor/grass, /area/city/outside) -"Zl" = ( -/obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; - pixel_y = 25 - }, -/obj/effect/decal/fake_object{ - desc = "A Hephaestus Industries Z-Cube! This state-of-the-art gaming console is the premium of the premium. It's almost VR!"; - icon = 'icons/effects/city.dmi'; - icon_state = "gamer_console"; - name = "gaming console" - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/turf/simulated/floor/wood/mahogany, -/area/city/dining) "Zp" = ( /obj/structure/platform{ dir = 1 @@ -13897,7 +13837,7 @@ Fo Fo Fo Fo -AH +PM Bb "} (3,1,1) = {" @@ -15618,7 +15558,7 @@ Fo Fo tu Fo -AH +PM Nj wF vb @@ -16732,7 +16672,7 @@ Fo Fo Fo Fo -AH +PM Bb "} (38,1,1) = {" @@ -16948,7 +16888,7 @@ Jg Jg bq rI -oQ +Vl Ha bq lg @@ -16956,7 +16896,7 @@ hY NF fV Vl -Bx +hY bq jL Ge @@ -20996,7 +20936,7 @@ bk CM Yq Nf -Zl +dQ If Kq KE @@ -21482,7 +21422,7 @@ Nr RW RW BI -Zl +dQ Pv Kq ZV @@ -26129,7 +26069,7 @@ Fo Fo Fo Fo -BM +Fj "} (154,1,1) = {" Bb @@ -26291,7 +26231,7 @@ Fo Fo Fo Fo -BM +Fj "} (156,1,1) = {" Bb diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm index dce5759eb5b..41953caceda 100644 --- a/maps/event/idris_cruise/idris_cruise-1.dmm +++ b/maps/event/idris_cruise/idris_cruise-1.dmm @@ -23,14 +23,6 @@ }, /turf/simulated/floor/reinforced, /area/cruise/virtual_reality) -"aad" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/door/airlock/glass_security{ - dir = 1 - }, -/obj/effect/map_effect/door_helper/unres, -/turf/simulated/floor/reinforced, -/area/cruise/virtual_reality) "aae" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -46,9 +38,7 @@ name = "VR Suite"; dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "aag" = ( /obj/effect/decal/fake_object/light_source{ @@ -76,14 +66,6 @@ icon_state = "dark_preview" }, /area/cruise/escort) -"aai" = ( -/obj/machinery/door/airlock/centcom{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "dark_preview" - }, -/area/cruise/escort) "aaj" = ( /obj/machinery/door/airlock/centcom{ dir = 1 @@ -93,22 +75,6 @@ icon_state = "wood" }, /area/cruise/escort) -"aak" = ( -/obj/machinery/door/airlock/centcom{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "dark_preview" - }, -/area/cruise/escort) -"aal" = ( -/obj/machinery/door/airlock/centcom{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "dark_preview" - }, -/area/cruise/escort) "aas" = ( /obj/machinery/vending/coffee, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -143,9 +109,7 @@ }, /area/cruise/jungle) "aaR" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "aaU" = ( /obj/machinery/door/firedoor, @@ -189,9 +153,7 @@ /area/cruise/main_bar) "abL" = ( /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "acC" = ( /obj/machinery/button/remote/blast_door{ @@ -199,9 +161,7 @@ pixel_x = 22; pixel_y = -23 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "adi" = ( /obj/machinery/light/small, @@ -221,9 +181,7 @@ "aek" = ( /obj/machinery/shieldgen, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "aet" = ( /obj/structure/closet/athletic_mixed, @@ -374,9 +332,7 @@ icon_state = "purple-1"; name = "ruptured canister" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "akd" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -427,9 +383,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "amx" = ( /obj/machinery/door/airlock/centcom{ @@ -447,9 +401,7 @@ icon_state = "open"; opacity = 0 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "anj" = ( /obj/machinery/door/window/southright, @@ -493,9 +445,7 @@ /area/cruise/virtual_reality) "apD" = ( /obj/structure/bed/stool/padded/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "apU" = ( /obj/structure/lattice, @@ -803,9 +753,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "aBo" = ( /obj/structure/toilet{ @@ -939,9 +887,7 @@ /obj/effect/floor_decal/spline/fancy/corner{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "aET" = ( /obj/effect/floor_decal/corner/blue{ @@ -1127,9 +1073,7 @@ /obj/structure/flora/grass/jungle{ pixel_y = 20 }, -/obj/structure/flora/rock/pile{ - anchored = 1 - }, +/obj/structure/flora/rock/pile, /turf/unsimulated/floor{ footstep_sound = /singleton/sound_category/grass_footstep; icon = 'icons/jungle.dmi'; @@ -1158,7 +1102,6 @@ "aMt" = ( /obj/machinery/door/window/northright{ name = "dispensary"; - req_access = null; req_one_access = list(33,104) }, /obj/effect/floor_decal/corner/orange/diagonal, @@ -1396,9 +1339,7 @@ icon_state = "railing0-1"; name = "railing" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "aVo" = ( /obj/machinery/telecomms/server/presets/command, @@ -1562,9 +1503,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "bbl" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -1791,9 +1730,7 @@ dir = 1 }, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "biv" = ( /obj/structure/bed/stool/chair/office/bridge{ @@ -1809,9 +1746,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "bjA" = ( /obj/item/device/radio/intercom/east, @@ -1934,9 +1869,7 @@ /obj/machinery/smartfridge/drinks{ opacity = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "bog" = ( /obj/random/pottedplant, @@ -2026,16 +1959,6 @@ icon_state = "dark" }, /area/cruise/fore) -"bqt" = ( -/obj/structure/flora/tree/jungle{ - }, -/turf/unsimulated/floor{ - footstep_sound = /singleton/sound_category/grass_footstep; - icon = 'icons/jungle.dmi'; - icon_state = "grass1"; - name = "lush grass" - }, -/area/cruise/jungle) "bqz" = ( /obj/effect/decal/fake_object{ desc = "A descriptive sign."; @@ -2074,9 +1997,7 @@ /obj/random/arcade, /obj/random/arcade, /obj/random/arcade, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "brk" = ( /obj/machinery/bluespace_beacon, @@ -2186,9 +2107,7 @@ /area/cruise/fore_s) "bwx" = ( /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore_p) "bwy" = ( /obj/effect/floor_decal/spline/fancy{ @@ -2280,9 +2199,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "bAB" = ( /obj/structure/railing/mapped{ @@ -2574,9 +2491,7 @@ /area/cruise/pool/sauna2) "bPI" = ( /obj/structure/table/reinforced/wood, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "bPJ" = ( /obj/structure/railing/mapped{ @@ -2627,9 +2542,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "bRV" = ( /obj/machinery/door/firedoor, @@ -2810,9 +2723,7 @@ /area/cruise/escort) "cei" = ( /obj/machinery/smartfridge/secure, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "ceB" = ( /obj/effect/floor_decal/corner/blue/diagonal, @@ -2936,9 +2847,7 @@ }, /area/cruise/security) "chC" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "ciB" = ( /turf/unsimulated/beach/sand{ @@ -3063,9 +2972,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "coV" = ( /obj/structure/railing/mapped{ @@ -3077,9 +2984,7 @@ /area/cruise/hangar) "cpe" = ( /obj/structure/reagent_dispensers/water_cooler, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "cpr" = ( /obj/effect/floor_decal/spline/fancy{ @@ -3177,9 +3082,7 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-9" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "crT" = ( /obj/structure/railing/mapped{ @@ -3217,9 +3120,7 @@ dir = 1 }, /obj/structure/bed/stool/padded/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "cua" = ( /obj/machinery/light/small{ @@ -3460,9 +3361,7 @@ dir = 8 }, /obj/item/device/radio/intercom/south, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "cFP" = ( /obj/item/device/radio/intercom/west, @@ -3489,9 +3388,7 @@ /area/cruise/virtual_reality) "cGI" = ( /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "cGS" = ( /obj/structure/window/reinforced, @@ -3509,9 +3406,7 @@ pixel_y = -3 }, /obj/item/device/megaphone/stagemicrophone, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "cIz" = ( /obj/structure/table/wood, @@ -3527,9 +3422,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "cIW" = ( /obj/machinery/light{ @@ -3546,7 +3439,6 @@ icon = 'icons/effects/160x160.dmi'; icon_state = "idris_ship_engine"; name = "starslinger thruster"; - opacity = 0; pixel_y = -128 }, /turf/template_noop, @@ -3641,9 +3533,7 @@ dir = 4 }, /obj/machinery/light, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/aft_s) "cMg" = ( /obj/structure/railing/mapped, @@ -3678,9 +3568,7 @@ icon_state = "open"; opacity = 0 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "cNV" = ( /obj/structure/bed/stool/chair/sofa/right/red, @@ -3748,7 +3636,7 @@ "cPE" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/tree/jungle{ - icon_state = "tree2"; + icon_state = "tree2" }, /turf/unsimulated/floor{ footstep_sound = /singleton/sound_category/grass_footstep; @@ -3802,9 +3690,7 @@ name = "Centerline Entertainment Suites" }, /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "cSb" = ( /obj/structure/railing/mapped{ @@ -3824,9 +3710,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "cSx" = ( /obj/structure/closet/secure_closet/brig{ @@ -3877,9 +3761,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "cVN" = ( /obj/structure/closet/walllocker/firecloset{ @@ -4010,9 +3892,7 @@ }, /area/cruise/pool) "daI" = ( -/obj/structure/flora/rock/pile{ - anchored = 1 - }, +/obj/structure/flora/rock/pile, /obj/structure/railing/mapped{ color = "#6e472b" }, @@ -4071,9 +3951,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "dds" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -4114,9 +3992,7 @@ name = "elevator button"; pixel_y = -22 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "dek" = ( /obj/effect/floor_decal/spline/fancy/wood/full, @@ -4228,9 +4104,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 6 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "div" = ( /obj/machinery/vending/zora, @@ -4263,7 +4137,6 @@ /area/cruise/hangar) "dje" = ( /obj/structure/flora/rock/pile{ - anchored = 1; icon_state = "lavarocks2" }, /turf/simulated/floor/exoplanet/water/shallow, @@ -4296,9 +4169,7 @@ /area/cruise/beach) "dkH" = ( /obj/structure/sign/flag/idris/large/north, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "dlh" = ( /obj/machinery/hologram/holopad, @@ -4317,7 +4188,6 @@ /area/template_noop) "dlE" = ( /obj/structure/flora/rock{ - anchored = 1; desc = "A big, sad derelict hovercar!"; icon = 'icons/effects/64x64.dmi'; icon_state = "derelict_hovercar"; @@ -4434,9 +4304,7 @@ /area/cruise/pool) "dsS" = ( /obj/structure/lattice/catwalk/indoor/grate, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "dty" = ( /obj/item/tape_roll, @@ -4487,9 +4355,7 @@ /area/cruise/beach) "dxi" = ( /obj/structure/closet/crate/freezer/rations, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/escort) "dxK" = ( /turf/unsimulated/floor{ @@ -4524,9 +4390,7 @@ /area/cruise/library) "dxW" = ( /obj/structure/bed/stool/padded, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/escort) "dyf" = ( /obj/effect/floor_decal/corner/blue{ @@ -4557,9 +4421,7 @@ /area/cruise/hydroponics) "dzo" = ( /obj/structure/reagent_dispensers/watertank, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "dzw" = ( /turf/simulated/floor/reinforced, @@ -4578,9 +4440,7 @@ /area/cruise/pool/sauna3) "dzW" = ( /obj/structure/closet/crate/loot, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/escort) "dAe" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ @@ -4612,22 +4472,8 @@ name = "Beach" }, /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) -"dBm" = ( -/obj/structure/flora/tree/jungle/small{ - icon_state = "tree2"; - }, -/obj/structure/flora/grass/jungle, -/turf/unsimulated/floor{ - footstep_sound = /singleton/sound_category/grass_footstep; - icon = 'icons/jungle.dmi'; - icon_state = "grass1"; - name = "lush grass" - }, -/area/cruise/jungle) "dBx" = ( /obj/effect/floor_decal/corner/green/diagonal, /turf/unsimulated/floor{ @@ -4675,9 +4521,7 @@ /obj/structure/window/reinforced/crescent{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "dEu" = ( /obj/structure/table/standard, @@ -4717,9 +4561,7 @@ dir = 4 }, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "dFH" = ( /obj/structure/flora/grass/jungle, @@ -4802,9 +4644,7 @@ dir = 8 }, /obj/structure/railing/mapped, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "dJH" = ( /obj/structure/bed/stool/padded/red, @@ -4832,9 +4672,7 @@ name = "Coalitioner retrofitted powerloader" }, /obj/machinery/mech_recharger, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "dMa" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -4904,9 +4742,7 @@ dir = 1; id = "private_office" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "dSf" = ( /obj/machinery/door/firedoor, @@ -4922,9 +4758,7 @@ name = "Secure Storage"; req_access = list(101) }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "dTa" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ @@ -4941,9 +4775,7 @@ }, /area/cruise/hangar) "dUV" = ( -/obj/structure/flora/rock{ - anchored = 1 - }, +/obj/structure/flora/rock, /turf/unsimulated/floor{ footstep_sound = /singleton/sound_category/grass_footstep; icon = 'icons/jungle.dmi'; @@ -5006,9 +4838,7 @@ }, /obj/structure/table/wood, /obj/item/clothing/head/cone, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "dXx" = ( /obj/structure/railing/mapped{ @@ -5043,9 +4873,7 @@ }, /area/cruise/fore) "dYf" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore_p) "dYl" = ( /obj/structure/table/rack, @@ -5131,9 +4959,7 @@ dir = 4 }, /obj/structure/lattice/catwalk, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "efG" = ( /obj/structure/bed/stool/chair/wood, @@ -5145,9 +4971,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/escort) "egl" = ( /obj/structure/railing/mapped{ @@ -5181,9 +5005,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "ehQ" = ( /turf/unsimulated/floor{ @@ -5323,9 +5145,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced/crescent, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "enw" = ( /obj/machinery/door/airlock/multi_tile/glass{ @@ -5420,9 +5240,7 @@ "era" = ( /obj/structure/bed/stool/bar/padded/red, /obj/effect/floor_decal/spline/fancy, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "erg" = ( /obj/structure/flora/grass/jungle{ @@ -5586,9 +5404,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "ewg" = ( /obj/effect/floor_decal/corner/blue{ @@ -5649,9 +5465,7 @@ /area/cruise/medical) "ext" = ( /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "exy" = ( /obj/machinery/reagentgrinder{ @@ -5831,9 +5645,7 @@ /obj/machinery/light_switch{ pixel_y = -24 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "eFF" = ( /obj/effect/floor_decal/corner/blue{ @@ -5902,11 +5714,6 @@ icon_state = "freezer" }, /area/cruise/washroom_aft) -"eKe" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/cruise/main_bar) "eKq" = ( /obj/structure/flora/grass/jungle{ icon_state = "bushb2"; @@ -5992,9 +5799,7 @@ /area/cruise/dining_hall) "eNY" = ( /obj/structure/reagent_dispensers/watertank, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "eOl" = ( /obj/structure/railing/mapped, @@ -6089,11 +5894,6 @@ icon_state = "carpet" }, /area/cruise/security) -"eVv" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/template_noop) "eVC" = ( /obj/effect/floor_decal/spline/fancy{ dir = 1 @@ -6118,9 +5918,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "eWe" = ( /obj/structure/bed/stool/padded/red, @@ -6135,9 +5933,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "eWp" = ( /obj/structure/railing/mapped{ @@ -6276,9 +6072,7 @@ "fbU" = ( /obj/structure/closet/emcloset, /obj/structure/closet/emcloset, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "fcd" = ( /obj/structure/window/reinforced/crescent{ @@ -6298,9 +6092,7 @@ icon_state = "railing0-1"; name = "railing" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "fcA" = ( /obj/effect/floor_decal/industrial/warning{ @@ -6353,9 +6145,7 @@ dir = 1 }, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "feC" = ( /obj/structure/filingcabinet/chestdrawer, @@ -6401,9 +6191,7 @@ /obj/item/flame/candle{ pixel_x = -5 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "ffL" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -6448,9 +6236,7 @@ "fgV" = ( /obj/structure/lattice, /obj/structure/girder, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/jungle) "fhF" = ( /obj/machinery/door/firedoor, @@ -6468,9 +6254,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "fij" = ( /obj/effect/engine_exhaust{ @@ -6600,9 +6384,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "fmf" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -6701,9 +6483,7 @@ /area/cruise/jungle) "fqV" = ( /obj/structure/railing/mapped, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "frp" = ( /obj/structure/flora/grass/jungle{ @@ -6730,8 +6510,7 @@ }, /area/cruise/central) "fsh" = ( -/obj/structure/flora/tree/jungle/small{ - }, +/obj/structure/flora/tree/jungle/small, /obj/structure/flora/tree/jungle/small{ desc = "A pile of unassuming rocks."; icon = 'icons/obj/flora/largejungleflora.dmi'; @@ -6826,9 +6605,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "fvC" = ( /obj/machinery/light{ @@ -6872,9 +6649,7 @@ dir = 1 }, /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "fxO" = ( /obj/effect/decal/fake_object{ @@ -6911,9 +6686,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/jungle) "fAw" = ( /obj/structure/railing/mapped, @@ -7041,9 +6814,7 @@ /area/cruise/main_bar) "fDY" = ( /obj/machinery/light, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "fEy" = ( /obj/item/towel_flat{ @@ -7159,9 +6930,7 @@ /obj/structure/window/reinforced/crescent{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "fIx" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -7182,9 +6951,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "fJY" = ( /obj/structure/flora/grass/jungle{ @@ -7214,9 +6981,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "fKG" = ( /obj/machinery/door/firedoor, @@ -7324,19 +7089,12 @@ icon_state = "asteroidfloor" }, /area/cruise/beach) -"fQJ" = ( -/obj/structure/bed/stool/bar/padded/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/cruise/main_bar/aft) "fQQ" = ( /obj/structure/table/standard, /obj/structure/window/reinforced/crescent, /obj/effect/floor_decal/corner/orange/diagonal, /obj/machinery/door/window/eastright{ name = "dispensary"; - req_access = null; req_one_access = list(33,104) }, /obj/item/reagent_containers/dropper, @@ -7358,9 +7116,7 @@ icon_state = "1-2"; name = "cable" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "fRt" = ( /obj/structure/flora/ausbushes/ywflowers, @@ -7430,9 +7186,7 @@ "fTa" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/vending/cigarette, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/aft_s) "fTq" = ( /obj/structure/sign/flag/coalition, @@ -7518,9 +7272,7 @@ /obj/machinery/smartfridge/drinks{ opacity = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "fXe" = ( /obj/effect/floor_decal/spline/fancy/wood/full, @@ -7557,15 +7309,11 @@ icon_state = "1-2"; name = "cable" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "fXP" = ( /obj/item/device/radio/intercom/north, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "fYO" = ( /turf/unsimulated/beach/coastline{ @@ -7607,24 +7355,8 @@ /area/cruise/pool) "gbh" = ( /obj/machinery/washing_machine, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) -"gbk" = ( -/obj/structure/flora/tree/jungle/small{ - desc = "A lush and healthy bush."; - icon = 'icons/obj/flora/largejungleflora.dmi'; - icon_state = "bush"; - name = "bush"; - pixel_x = -16 - }, -/turf/unsimulated/floor{ - desc = "Gloomy, depressing grass..."; - icon_state = "grass_stalk_dark"; - name = "gloomy grass" - }, -/area/cruise/virtual_reality) "gbr" = ( /obj/machinery/light{ dir = 1 @@ -7646,9 +7378,7 @@ /obj/structure/window/reinforced/crescent, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "gbQ" = ( /obj/structure/railing/mapped{ @@ -7774,9 +7504,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "gfJ" = ( /mob/living/simple_animal/cosmozoan, @@ -7805,9 +7533,7 @@ /obj/machinery/atmospherics/pipe/tank/nitrous_oxide{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "ggH" = ( /obj/structure/table/rack, @@ -7889,9 +7615,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "gjp" = ( /obj/structure/window/reinforced/crescent{ @@ -7994,9 +7718,7 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-2" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "gmY" = ( /obj/machinery/sleeper{ @@ -8064,9 +7786,7 @@ /area/cruise/jungle) "god" = ( /obj/structure/lattice/catwalk, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "gox" = ( /obj/effect/floor_decal/industrial/warning{ @@ -8075,9 +7795,7 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-3" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "goJ" = ( /obj/effect/floor_decal/corner/mauve{ @@ -8293,15 +8011,11 @@ }, /area/cruise/beach) "gwk" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/security) "gxb" = ( /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "gxB" = ( /obj/structure/flora/grass/jungle{ @@ -8370,9 +8084,7 @@ name = "turret" }, /obj/effect/floor_decal/industrial/warning/full, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore_p) "gBq" = ( /obj/structure/flora/grass/jungle, @@ -8384,17 +8096,6 @@ name = "lush grass" }, /area/cruise/jungle) -"gBO" = ( -/obj/structure/flora/tree/jungle/small{ - icon_state = "tree2"; - }, -/turf/unsimulated/floor{ - footstep_sound = /singleton/sound_category/grass_footstep; - icon = 'icons/jungle.dmi'; - icon_state = "grass1"; - name = "lush grass" - }, -/area/cruise/jungle) "gCK" = ( /obj/machinery/vending/cola, /obj/effect/floor_decal/industrial/outline/yellow, @@ -8414,9 +8115,7 @@ /obj/structure/bed/stool/chair/wood{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "gDZ" = ( /turf/unsimulated/floor{ @@ -8544,11 +8243,6 @@ icon_state = "wood" }, /area/cruise/library) -"gJa" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/cruise/main_bar/aft) "gJx" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning/dust, @@ -8683,9 +8377,7 @@ /area/cruise/centerline) "gMP" = ( /obj/machinery/mech_recharger, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "gMU" = ( /obj/machinery/telecomms/processor/preset_one, @@ -8738,9 +8430,7 @@ dir = 8; pixel_x = 20 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "gPK" = ( /obj/item/modular_computer/console/preset/security{ @@ -8756,9 +8446,7 @@ /obj/effect/floor_decal/spline/plain/black{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "gQp" = ( /obj/item/towel, @@ -8840,8 +8528,7 @@ desc = "A descriptive sign."; icon = 'icons/effects/ship_idris_cruise.dmi'; icon_state = "sign_beach"; - name = "Beach Dome directional indicator"; - pixel_y = 0 + name = "Beach Dome directional indicator" }, /turf/simulated/wall/shuttle/idris, /area/cruise/beach) @@ -8883,20 +8570,13 @@ icon_state = "wood_preview" }, /area/cruise/library) -"gWM" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/template_noop) "gWQ" = ( /obj/machinery/computer/arcade/orion_trail, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "gXu" = ( /obj/machinery/light, @@ -9010,16 +8690,6 @@ name = "dirt" }, /area/cruise/jungle) -"hbr" = ( -/obj/structure/flora/tree/jungle{ - icon_state = "tree3"; - }, -/turf/unsimulated/floor{ - desc = "Gloomy, depressing grass..."; - icon_state = "grass_stalk_dark"; - name = "gloomy grass" - }, -/area/cruise/virtual_reality) "hbv" = ( /obj/structure/table/wood, /obj/item/flame/lighter/zippo/gold{ @@ -9067,9 +8737,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "hdk" = ( /obj/structure/table/stone/marble, @@ -9112,9 +8780,7 @@ dir = 8 }, /obj/structure/railing/mapped, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "hfT" = ( /turf/unsimulated/beach/sand{ @@ -9215,9 +8881,7 @@ dir = 8 }, /obj/structure/table/wood, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "hlV" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -9369,9 +9033,7 @@ /obj/item/paper/fluff/idris_cruise/medal_of_valor, /obj/item/paper/fluff/idris_cruise/medal_of_valor, /obj/structure/table/standard, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "hrv" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -9425,9 +9087,7 @@ /obj/structure/window/reinforced/polarized{ id = "private_office" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "hto" = ( /obj/machinery/portable_atmospherics/hydroponics, @@ -9582,9 +9242,7 @@ }, /area/cruise/arcade) "hAl" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/escort) "hAn" = ( /obj/machinery/light{ @@ -9867,16 +9525,6 @@ }, /turf/simulated/floor/plating, /area/cruise/e_supplies) -"hQs" = ( -/obj/structure/flora/tree/jungle/small{ - icon_state = "tree2"; - }, -/turf/unsimulated/floor{ - desc = "Gloomy, depressing grass..."; - icon_state = "grass_stalk_dark"; - name = "gloomy grass" - }, -/area/cruise/virtual_reality) "hRm" = ( /turf/unsimulated/floor{ icon_state = "wood_preview" @@ -9970,9 +9618,7 @@ dir = 8 }, /obj/structure/lattice/catwalk/indoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "hVw" = ( /obj/effect/floor_decal/industrial/warning, @@ -10010,9 +9656,7 @@ /area/cruise/virtual_reality) "hXh" = ( /obj/structure/bed/stool/bar/padded/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "hXy" = ( /obj/machinery/computer/cryopod{ @@ -10032,8 +9676,7 @@ pixel_x = 13 }, /turf/unsimulated/floor{ - dir = 1; - icon_state = "tiled_preview" + dir = 1 }, /area/cruise/virtual_reality) "hXW" = ( @@ -10097,9 +9740,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "ibE" = ( /obj/structure/railing/mapped{ @@ -10120,16 +9761,12 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "icW" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/vending/coffee, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/aft_s) "ida" = ( /obj/machinery/chemical_dispenser, @@ -10168,9 +9805,7 @@ name = "Pool" }, /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "ieK" = ( /obj/effect/decal/fake_object{ @@ -10195,7 +9830,7 @@ /area/cruise/main_bar/aft) "ieV" = ( /obj/structure/flora/tree/jungle/small{ - icon_state = "tree2"; + icon_state = "tree2" }, /obj/structure/flora/tree/jungle/small{ desc = "A pile of unassuming rocks."; @@ -10254,9 +9889,7 @@ /obj/structure/window/reinforced/polarized{ id = "reading_room" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "igM" = ( /obj/machinery/door/firedoor, @@ -10272,9 +9905,7 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "iiE" = ( /turf/unsimulated/floor{ @@ -10386,20 +10017,8 @@ "ilW" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) -"imp" = ( -/obj/structure/flora/tree/jungle{ - icon_state = "tree3"; - }, -/turf/unsimulated/floor{ - desc = "Gloomy, depressing grass..."; - icon_state = "grass_stalk_dark"; - name = "gloomy grass" - }, -/area/cruise/virtual_reality) "imw" = ( /obj/machinery/power/solar/fake, /obj/effect/floor_decal/industrial/warning{ @@ -10487,9 +10106,7 @@ /area/cruise/main_bar) "ioT" = ( /obj/machinery/hologram/holopad, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "ipv" = ( /obj/structure/table/standard, @@ -10588,7 +10205,7 @@ /area/cruise/fore) "isP" = ( /obj/structure/flora/tree/jungle{ - icon_state = "tree3"; + icon_state = "tree3" }, /turf/unsimulated/floor{ footstep_sound = /singleton/sound_category/grass_footstep; @@ -10617,9 +10234,7 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-13" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "iue" = ( /obj/item/storage/firstaid/trauma, @@ -10654,9 +10269,7 @@ /obj/effect/floor_decal/spline/fancy/corner{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "iuV" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -10699,9 +10312,7 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-7" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "iwM" = ( /obj/machinery/light{ @@ -10829,9 +10440,7 @@ pixel_x = 7; pixel_y = 16 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "iCX" = ( /obj/structure/bed/stool/chair/wood{ @@ -10851,9 +10460,7 @@ /obj/machinery/light/spot{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "iFe" = ( /obj/machinery/telecomms/broadcaster/preset_right, @@ -10915,9 +10522,7 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-16" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "iJb" = ( /obj/structure/table/wood, @@ -10943,9 +10548,7 @@ icon_state = "1-2"; name = "cable" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "iKg" = ( /obj/structure/railing/mapped, @@ -10999,15 +10602,12 @@ icon = 'icons/effects/160x160.dmi'; icon_state = "idris_ship_engine"; name = "starslinger thruster"; - opacity = 0; pixel_y = -128 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "iNp" = ( /obj/structure/table/standard, @@ -11083,9 +10683,7 @@ dir = 1 }, /obj/structure/tank_wall/carbon_dioxide, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "iPq" = ( /obj/effect/floor_decal/corner/blue{ @@ -11180,9 +10778,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "iTi" = ( /obj/effect/floor_decal/corner/blue{ @@ -11399,9 +10995,7 @@ dir = 1; id = "private_office" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "jbm" = ( /obj/structure/window/reinforced/crescent{ @@ -11419,9 +11013,7 @@ }, /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "jct" = ( /obj/machinery/computer/robotics{ @@ -11463,9 +11055,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "jdi" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -11519,16 +11109,12 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "jfO" = ( /obj/random/pottedplant, /obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "jgm" = ( /obj/effect/decal/fake_object{ @@ -11673,9 +11259,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "jli" = ( /obj/structure/closet/emcloset, @@ -11764,7 +11348,6 @@ name = "Door Bolt Control"; pixel_x = 5; pixel_y = 25; - req_access = null; specialfunctions = 4 }, /turf/unsimulated/floor{ @@ -11786,9 +11369,7 @@ icon_state = "intact-scrubbers"; name = "pipe" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "jqa" = ( /obj/structure/bed/stool/chair/remote/human, @@ -11841,11 +11422,9 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /obj/structure/sign/nosmoking_1{ pixel_y = 30 }, @@ -11977,9 +11556,7 @@ dir = 1; name = "Main Bar Suite Entry" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "jxS" = ( /obj/machinery/door/airlock/glass{ @@ -11993,9 +11570,7 @@ /area/cruise/dining_hall) "jyd" = ( /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/central) "jyn" = ( /obj/structure{ @@ -12004,15 +11579,12 @@ icon = 'icons/effects/160x160.dmi'; icon_state = "idris_ship_engine"; name = "starslinger thruster"; - opacity = 0; pixel_y = -128 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "jzd" = ( /turf/unsimulated/floor{ @@ -12070,9 +11642,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "jBz" = ( /obj/machinery/recharge_station, @@ -12134,9 +11704,7 @@ /obj/effect/floor_decal/spline/fancy/corner{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "jJg" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -12187,9 +11755,7 @@ name = "Main Bar Suite Entry" }, /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "jMW" = ( /obj/structure/railing/mapped{ @@ -12262,9 +11828,7 @@ /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "jQV" = ( /obj/machinery/door/airlock/multi_tile/glass{ @@ -12295,9 +11859,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore_s) "jSa" = ( /obj/structure/window/reinforced{ @@ -12428,9 +11990,7 @@ "jXQ" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/hydrogen, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "jYi" = ( /obj/effect/floor_decal/corner/green/diagonal, @@ -12546,9 +12106,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "kdk" = ( /obj/machinery/door/airlock{ @@ -12599,9 +12157,7 @@ dir = 8 }, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "kfl" = ( /obj/machinery/cryopod, @@ -12683,9 +12239,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "kjL" = ( /obj/structure/table/stone/marble, @@ -12752,9 +12306,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "klH" = ( /obj/machinery/door/firedoor, @@ -12919,19 +12471,6 @@ "kpO" = ( /turf/simulated/wall/shuttle/idris, /area/cruise/hydroponics) -"kpV" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/cruise/main_bar) -"kqe" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/template_noop) "kqC" = ( /obj/effect/map_effect/window_spawner/reinforced/crescent, /turf/unsimulated/floor/plating, @@ -13010,21 +12549,6 @@ icon_state = "tiles_small" }, /area/cruise/aft_p) -"kup" = ( -/obj/structure/flora/tree/jungle/small{ - desc = "A lush and healthy bush."; - icon = 'icons/obj/flora/largejungleflora.dmi'; - icon_state = "bush"; - name = "bush"; - pixel_x = -16 - }, -/turf/unsimulated/floor{ - footstep_sound = /singleton/sound_category/grass_footstep; - icon = 'icons/jungle.dmi'; - icon_state = "grass1"; - name = "lush grass" - }, -/area/cruise/jungle) "kuq" = ( /obj/effect/decal/fake_object{ icon = 'icons/misc/beach.dmi'; @@ -13039,7 +12563,7 @@ /area/cruise/beach) "kuu" = ( /obj/structure/flora/tree/jungle/small{ - icon_state = "tree2"; + icon_state = "tree2" }, /obj/structure/flora/tree/jungle/small{ desc = "A pile of unassuming rocks."; @@ -13119,9 +12643,7 @@ /area/cruise/main_bar) "kvJ" = ( /obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "kvO" = ( /obj/structure/closet/emcloset, @@ -13137,9 +12659,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "kyu" = ( /obj/machinery/light/small, @@ -13233,9 +12753,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "kCw" = ( /obj/structure/table/rack, @@ -13340,9 +12858,7 @@ /area/cruise/virtual_reality) "kGs" = ( /obj/structure/bed/stool/padded/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "kGH" = ( /obj/machinery/telecomms/server/presets/security, @@ -13517,9 +13033,7 @@ "kPk" = ( /obj/machinery/hologram/holopad, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/escort) "kPB" = ( /turf/template_noop, @@ -13527,9 +13041,7 @@ "kQc" = ( /obj/structure/railing/mapped, /obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "kQi" = ( /obj/structure/curtain/black{ @@ -13555,9 +13067,7 @@ /area/cruise/pool) "kQx" = ( /obj/structure/table/rack, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "kQz" = ( /obj/structure/railing/mapped, @@ -13720,9 +13230,7 @@ /area/cruise/beach) "kXA" = ( /obj/structure/bed/stool/padded/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "kYm" = ( /obj/effect/floor_decal/industrial/warning{ @@ -13791,8 +13299,7 @@ pixel_x = -14 }, /turf/unsimulated/floor{ - dir = 1; - icon_state = "tiled_preview" + dir = 1 }, /area/cruise/virtual_reality) "lbj" = ( @@ -13878,9 +13385,7 @@ /area/cruise/jungle) "ldq" = ( /obj/structure/bed/stool/padded/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "leB" = ( /turf/unsimulated/floor{ @@ -14008,9 +13513,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "ljm" = ( /obj/effect/floor_decal/industrial/warning{ @@ -14061,17 +13564,13 @@ pixel_x = -3; pixel_y = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "llz" = ( /obj/machinery/light/small{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "llM" = ( /obj/effect/decal/fake_object{ @@ -14090,9 +13589,7 @@ name = "VR Suite"; dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "lnT" = ( /obj/structure/railing/mapped, @@ -14130,28 +13627,8 @@ /obj/machinery/light{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) -"lpP" = ( -/obj/structure/flora/tree/jungle/small{ - }, -/obj/structure/flora/tree/jungle/small{ - desc = "A pile of unassuming rocks."; - icon = 'icons/obj/flora/largejungleflora.dmi'; - icon_state = "rocks2"; - name = "rocks"; - pixel_x = -16; - pixel_y = -16 - }, -/turf/unsimulated/floor{ - footstep_sound = /singleton/sound_category/grass_footstep; - icon = 'icons/jungle.dmi'; - icon_state = "grass1"; - name = "lush grass" - }, -/area/cruise/jungle) "lpS" = ( /obj/structure/flora/tree/jungle/small{ desc = "A lush and healthy bush."; @@ -14227,9 +13704,7 @@ /turf/unsimulated/floor/plating, /area/cruise/hangar) "lux" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "luH" = ( /obj/structure/bed/roller, @@ -14263,9 +13738,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "lvA" = ( /obj/structure/closet/crate/bin, @@ -14550,9 +14023,7 @@ "lDf" = ( /obj/structure/bed/stool/padded/red, /obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "lDu" = ( /obj/effect/floor_decal/corner/mauve{ @@ -14600,8 +14071,7 @@ desc = "A descriptive sign."; icon = 'icons/effects/ship_idris_cruise.dmi'; icon_state = "sign_beach"; - name = "Beach Dome directional indicator"; - pixel_y = 0 + name = "Beach Dome directional indicator" }, /turf/simulated/wall/shuttle/idris, /area/cruise/pool) @@ -14710,7 +14180,6 @@ /area/cruise/beach) "lJJ" = ( /obj/structure/flora/rock{ - anchored = 1; icon_state = "basalt3" }, /turf/unsimulated/floor{ @@ -14722,9 +14191,7 @@ /area/cruise/jungle) "lJU" = ( /obj/machinery/recharge_station, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "lKb" = ( /turf/simulated/floor/tiled/ramp{ @@ -14778,9 +14245,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "lMW" = ( /turf/simulated/wall/shuttle/idris, @@ -14822,9 +14287,7 @@ "lNp" = ( /obj/machinery/computer/arcade/battle, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "lNz" = ( /obj/machinery/status_display, @@ -15009,9 +14472,7 @@ /turf/simulated/floor/wood, /area/cruise/dining_hall) "lTe" = ( -/obj/structure/flora/rock{ - anchored = 1 - }, +/obj/structure/flora/rock, /turf/unsimulated/floor{ footstep_sound = /singleton/sound_category/grass_footstep; icon_state = "asteroid"; @@ -15129,9 +14590,7 @@ pixel_y = 6 }, /obj/structure/table/stone/marble, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "lXU" = ( /obj/effect/decal/fake_object{ @@ -15231,9 +14690,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "mes" = ( /obj/structure/sign/goldenplaque{ @@ -15357,9 +14814,7 @@ /obj/machinery/atmospherics/pipe/tank/air{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "mjc" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -15460,9 +14915,7 @@ dir = 5 }, /obj/machinery/vending/dinnerware/plastic, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "mmt" = ( /obj/machinery/light{ @@ -15690,9 +15143,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "myB" = ( /obj/item/clothing/under/rank/security/idris/idrissec/alt, @@ -15862,18 +15313,14 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "mEq" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 }, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "mEF" = ( /obj/structure/flora/grass/jungle{ @@ -15906,9 +15353,7 @@ /area/cruise/beach_cave) "mFr" = ( /obj/effect/floor_decal/industrial/warning, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "mFL" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -16056,11 +15501,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/reinforced, /area/cruise/virtual_reality) -"mNt" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/cruise/escort) "mNx" = ( /obj/effect/decal/fake_object{ desc = "A descriptive arrow connected to the adjacent sign."; @@ -16073,9 +15513,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "mOa" = ( /obj/structure/bed/stool/padded/red, @@ -16169,16 +15607,6 @@ }, /turf/simulated/floor/beach/water/pool, /area/cruise/pool) -"mOx" = ( -/obj/structure/flora/tree/jungle/small{ - }, -/turf/unsimulated/floor{ - footstep_sound = /singleton/sound_category/grass_footstep; - icon = 'icons/jungle.dmi'; - icon_state = "grass1"; - name = "lush grass" - }, -/area/cruise/jungle) "mOC" = ( /obj/structure/bed/stool/chair/remote/human, /turf/simulated/floor/bluegrid, @@ -16233,9 +15661,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "mPU" = ( /obj/effect/floor_decal/industrial/warning{ @@ -16266,9 +15692,7 @@ /area/cruise/beach) "mRr" = ( /obj/structure/lattice/catwalk/indoor/grate, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "mRD" = ( /obj/effect/map_effect/window_spawner/reinforced/crescent, @@ -16385,9 +15809,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "mXr" = ( /obj/structure/window/reinforced/crescent{ @@ -16417,9 +15839,7 @@ name = "turret" }, /obj/effect/floor_decal/industrial/warning/full, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "mXZ" = ( /obj/structure/railing/mapped{ @@ -16430,7 +15850,7 @@ /area/cruise/jungle) "mYa" = ( /obj/structure/flora/tree/jungle{ - icon_state = "tree3"; + icon_state = "tree3" }, /obj/structure/flora/grass/jungle, /turf/unsimulated/floor{ @@ -16451,8 +15871,7 @@ /area/cruise/security) "mZW" = ( /obj/structure/flora/grass/jungle, -/obj/structure/flora/tree/jungle{ - }, +/obj/structure/flora/tree/jungle, /obj/structure/flora/tree/jungle/small{ desc = "A pile of unassuming rocks."; icon = 'icons/obj/flora/largejungleflora.dmi'; @@ -16488,9 +15907,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "nbP" = ( /obj/structure/table/reinforced, @@ -16604,9 +16021,7 @@ name = "Secure Storage"; req_access = list(101) }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "ngO" = ( /obj/effect/floor_decal/corner/blue{ @@ -16712,11 +16127,6 @@ name = "extranet" }, /area/cruise/virtual_reality) -"noJ" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/cruise/virtual_reality) "noU" = ( /turf/template_noop, /area/cruise/escort) @@ -16759,12 +16169,6 @@ icon_state = "white" }, /area/cruise/pool) -"nqY" = ( -/obj/structure/bed/stool/padded/red, -/turf/unsimulated/floor{ - icon_state = "carpet" - }, -/area/cruise/centerline) "nrB" = ( /turf/unsimulated/beach/coastline{ icon = 'icons/misc/beach.dmi'; @@ -16870,9 +16274,7 @@ desc = "A sleek, modern combat exosuit. It's Solarian! Run!"; name = "solarian combat exosuit" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "nxB" = ( /obj/structure/flora/tree/jungle{ @@ -16990,9 +16392,7 @@ icon_state = "1-2"; name = "cable" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "nAc" = ( /obj/effect/floor_decal/corner/green/diagonal, @@ -17023,9 +16423,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "nBB" = ( /obj/effect/decal/fake_object{ @@ -17170,18 +16568,14 @@ /obj/machinery/light/spot{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "nJp" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 }, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "nJz" = ( /obj/machinery/status_display, @@ -17227,9 +16621,7 @@ name = "turret" }, /obj/effect/floor_decal/industrial/warning/full, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool/sauna1) "nLx" = ( /turf/unsimulated/floor{ @@ -17249,9 +16641,7 @@ /obj/structure/cryofeed{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/jungle) "nMJ" = ( /obj/item/reagent_containers/glass/beaker/bluespace, @@ -17304,9 +16694,7 @@ icon_state = "railing0-1"; name = "railing" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "nOZ" = ( /obj/effect/floor_decal/spline/fancy{ @@ -17388,7 +16776,6 @@ /obj/effect/floor_decal/corner/orange/diagonal, /obj/machinery/door/window/eastleft{ name = "dispensary"; - req_access = null; req_one_access = list(33,104) }, /obj/item/reagent_containers/glass/beaker/large, @@ -17398,7 +16785,6 @@ /area/cruise/medical) "nRv" = ( /obj/structure/flora/rock/pile{ - anchored = 1; icon_state = "lavarocks2" }, /obj/effect/decal/cleanable/dirt, @@ -17407,9 +16793,7 @@ }, /area/cruise/jungle) "nRX" = ( -/obj/structure/flora/rock/pile{ - anchored = 1 - }, +/obj/structure/flora/rock/pile, /turf/simulated/floor/exoplanet/water/shallow, /area/cruise/jungle) "nSH" = ( @@ -17457,9 +16841,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "nTq" = ( /obj/structure/blocker, @@ -17487,14 +16869,10 @@ icon_state = "railing0-1"; name = "railing" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "nTu" = ( -/obj/structure/flora/rock{ - anchored = 1 - }, +/obj/structure/flora/rock, /turf/simulated/floor/exoplanet/water/shallow, /area/cruise/jungle) "nUk" = ( @@ -17515,9 +16893,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "nXK" = ( /obj/structure/railing/mapped{ @@ -17552,9 +16928,7 @@ }, /area/cruise/escort) "nYS" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "nZf" = ( /obj/machinery/telecomms/server/presets/supply, @@ -17563,9 +16937,7 @@ }, /area/cruise/tcomms_sat) "nZk" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore_s) "nZN" = ( /obj/structure/railing/mapped, @@ -17588,9 +16960,7 @@ dir = 1; id = "private_office" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "oax" = ( /obj/machinery/vending/coffee, @@ -17613,9 +16983,7 @@ /area/cruise/centerline) "oaK" = ( /obj/structure/railing/mapped, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "oaW" = ( /obj/machinery/light{ @@ -17673,9 +17041,7 @@ dir = 8 }, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "odB" = ( /obj/machinery/light{ @@ -17751,8 +17117,7 @@ /area/cruise/security) "ogR" = ( /obj/structure/table/standard, -/obj/item/storage/box/fancy/tray{ - }, +/obj/item/storage/box/fancy/tray, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/unsimulated/floor{ icon_state = "white" @@ -17790,9 +17155,7 @@ /obj/structure/sign/flag/idris{ pixel_y = 32 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore_s) "ojz" = ( /obj/effect/decal/fake_object/light_source{ @@ -17907,23 +17270,18 @@ "omp" = ( /obj/structure/railing/mapped, /turf/unsimulated/floor{ - dir = 4; - icon_state = "tiled_preview" + dir = 4 }, /area/cruise/virtual_reality) "omN" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "omS" = ( /obj/random/pottedplant, /obj/structure/sign/flag/idris{ pixel_y = 32 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore_p) "onn" = ( /turf/simulated/wall/shuttle/idris, @@ -17986,9 +17344,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "oqZ" = ( /obj/item/flame/candle, @@ -18105,9 +17461,7 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-8" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "ouv" = ( /obj/effect/floor_decal/industrial/warning{ @@ -18123,9 +17477,7 @@ dir = 1 }, /obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "ouM" = ( /obj/machinery/door/airlock/multi_tile/glass{ @@ -18133,9 +17485,7 @@ name = "Main Bar Suite Entry" }, /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "ouY" = ( /obj/effect/floor_decal/industrial/warning, @@ -18285,9 +17635,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "oDr" = ( /obj/structure/barricade/plasteel/wired{ @@ -18325,11 +17673,6 @@ icon_state = "dark_preview" }, /area/cruise/hangar) -"oEG" = ( -/turf/unsimulated/floor{ - icon_state = "wood_preview" - }, -/area/cruise/beach) "oES" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 2; @@ -18372,15 +17715,11 @@ /obj/structure/cryofeed{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "oHF" = ( /obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "oIe" = ( /obj/effect/floor_decal/industrial/warning{ @@ -18410,9 +17749,7 @@ name = "code firewall point defense" }, /obj/effect/floor_decal/industrial/warning/full, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "oJY" = ( /obj/effect/floor_decal/spline/fancy{ @@ -18507,9 +17844,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 10 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "oOK" = ( /turf/unsimulated/floor{ @@ -18529,9 +17864,7 @@ "oPB" = ( /obj/structure/window/reinforced/crescent, /obj/structure/lattice/catwalk/indoor/grate, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "oQb" = ( /obj/random/pottedplant, @@ -18541,9 +17874,7 @@ /area/cruise/aft) "oRe" = ( /obj/structure/closet/emcloset, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "oRk" = ( /obj/structure/window/reinforced/crescent{ @@ -18638,9 +17969,7 @@ "oVJ" = ( /obj/structure/lattice, /obj/structure/girder, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "oVS" = ( /obj/structure/window/reinforced/crescent{ @@ -18714,9 +18043,7 @@ "oXB" = ( /obj/structure/lattice/catwalk, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "oXD" = ( /obj/structure/railing/mapped{ @@ -18725,9 +18052,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "oXT" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -18749,9 +18074,7 @@ /area/cruise/dining_hall) "oXX" = ( /obj/item/poppet, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/washroom_aft) "oYb" = ( /turf/unsimulated/floor{ @@ -18808,9 +18131,7 @@ /obj/structure/cryofeed{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "paO" = ( /obj/item/modular_computer/console/preset/civilian{ @@ -18986,9 +18307,7 @@ dir = 8 }, /obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "pkf" = ( /obj/structure/railing/mapped, @@ -19014,9 +18333,7 @@ icon_state = "railing0-1"; name = "railing" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "plL" = ( /obj/structure/tank_wall/carbon_dioxide{ @@ -19030,9 +18347,7 @@ /area/cruise/fore) "pmh" = ( /obj/structure/undies_wardrobe, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "pmv" = ( /obj/effect/floor_decal/corner/beige/diagonal, @@ -19053,9 +18368,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "pmN" = ( /turf/simulated/floor/tiled/ramp/bottom{ @@ -19107,9 +18420,7 @@ dir = 8; id = "reading_room" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "pod" = ( /obj/effect/floor_decal/spline/fancy/corner{ @@ -19144,9 +18455,7 @@ pixel_y = 17 }, /obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "poz" = ( /obj/structure/table/standard, @@ -19216,9 +18525,7 @@ icon_state = "4-8"; name = "cable" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "pqv" = ( /obj/machinery/light/small{ @@ -19393,9 +18700,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "pxV" = ( /obj/structure/railing/mapped{ @@ -19511,9 +18816,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "pCv" = ( /obj/structure/foamedmetal, @@ -19534,9 +18837,7 @@ dir = 8 }, /obj/structure/lattice/catwalk, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "pCW" = ( /obj/structure/table/standard, @@ -19600,9 +18901,7 @@ icon_state = "door_as_ext0"; name = "damaged airlock" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "pFR" = ( /obj/machinery/door/airlock/multi_tile/glass{ @@ -19616,9 +18915,7 @@ /obj/effect/floor_decal/spline/plain/black{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "pHh" = ( /obj/structure/bed/stool/chair/office/dark, @@ -19672,9 +18969,7 @@ }, /area/cruise/aft) "pMK" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "pOp" = ( /obj/structure/table/stone/marble, @@ -19716,9 +19011,7 @@ icon_state = "1-2"; name = "cable" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "pPg" = ( /obj/effect/floor_decal/corner/blue/diagonal, @@ -19794,9 +19087,7 @@ /obj/item/device/flashlight/lamp{ pixel_y = 5 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "pRX" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -19979,9 +19270,7 @@ /obj/item/towel, /obj/item/towel, /obj/item/towel, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "pZN" = ( /turf/unsimulated/wall/fakeairlock{ @@ -20007,9 +19296,7 @@ "qbE" = ( /obj/machinery/shieldwallgen, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "qbQ" = ( /obj/structure/window/reinforced, @@ -20025,9 +19312,7 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-14" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "qcE" = ( /obj/machinery/door/airlock/multi_tile/glass{ @@ -20042,9 +19327,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "qdk" = ( /obj/structure/bed/stool/bar/padded/red, @@ -20076,9 +19359,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "qfG" = ( /obj/effect/floor_decal/industrial/warning{ @@ -20101,9 +19382,7 @@ /area/cruise/dining_hall) "qgb" = ( /obj/structure/table/wood, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "qgk" = ( /obj/structure/table/wood, @@ -20158,9 +19437,7 @@ dir = 1 }, /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "qjQ" = ( /turf/unsimulated/floor/concrete, @@ -20212,9 +19489,7 @@ /area/cruise/escort) "qmJ" = ( /obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "qmT" = ( /obj/structure/bed/stool/chair/shuttle, @@ -20302,9 +19577,7 @@ /area/cruise/medical) "qqm" = ( /obj/structure/curtain/open/privacy, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "qqE" = ( /obj/structure/bed/stool/chair/shuttle{ @@ -20518,9 +19791,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "qAF" = ( /turf/unsimulated/floor{ @@ -20615,9 +19886,7 @@ /obj/machinery/door/blast/shutters/open{ id = "bar_west" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "qEt" = ( /obj/structure/window/reinforced/crescent, @@ -20637,8 +19906,7 @@ }, /area/cruise/hydroponics) "qEZ" = ( -/obj/structure/flora/tree/jungle{ - }, +/obj/structure/flora/tree/jungle, /turf/unsimulated/floor{ footstep_sound = /singleton/sound_category/grass_footstep; icon = 'icons/jungle.dmi'; @@ -20669,9 +19937,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "qGc" = ( /obj/structure/window/reinforced/crescent{ @@ -20712,9 +19978,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "qHA" = ( /obj/structure/table/wood, @@ -20734,8 +19998,7 @@ /area/cruise/security) "qIH" = ( /obj/structure/table/standard, -/obj/item/storage/box/fancy/tray{ - }, +/obj/item/storage/box/fancy/tray, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/unsimulated/floor{ icon_state = "white" @@ -20762,9 +20025,7 @@ /obj/effect/floor_decal/spline/fancy/corner{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "qLX" = ( /turf/unsimulated/floor{ @@ -20851,7 +20112,6 @@ icon = 'icons/effects/160x160.dmi'; icon_state = "idris_ship_engine"; name = "starslinger thruster"; - opacity = 0; pixel_y = -128 }, /turf/unsimulated/floor/plating, @@ -20908,17 +20168,6 @@ "qQX" = ( /turf/simulated/floor/beach/water/pool, /area/cruise/pool/sauna3) -"qRu" = ( -/obj/structure/flora/tree/jungle{ - icon_state = "tree3" - }, -/turf/unsimulated/floor{ - footstep_sound = /singleton/sound_category/grass_footstep; - icon = 'icons/jungle.dmi'; - icon_state = "grass1"; - name = "lush grass" - }, -/area/cruise/jungle) "qRy" = ( /obj/structure/table/stone/marble, /obj/effect/floor_decal/corner/mauve/diagonal, @@ -20930,7 +20179,7 @@ /area/cruise/main_bar) "qSc" = ( /obj/structure/flora/tree/jungle{ - icon_state = "tree3"; + icon_state = "tree3" }, /obj/structure/flora/tree/jungle/small{ desc = "A pile of unassuming rocks."; @@ -21151,9 +20400,7 @@ /area/cruise/escort) "rdY" = ( /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "rei" = ( /obj/structure/table/wood, @@ -21203,9 +20450,7 @@ /turf/unsimulated/floor/plating, /area/cruise/hangar) "rfF" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "rgm" = ( /obj/machinery/door/airlock/service{ @@ -21225,11 +20470,6 @@ icon_state = "dark_preview" }, /area/cruise/security) -"rgO" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/cruise/arcade) "rhb" = ( /obj/structure/sign/flag/scc{ pixel_y = 32 @@ -21265,9 +20505,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "rkI" = ( /obj/effect/floor_decal/corner/blue{ @@ -21278,9 +20516,7 @@ }, /area/cruise/arcade) "rkR" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "rlv" = ( /turf/unsimulated/beach/coastline{ @@ -21303,15 +20539,11 @@ /obj/structure/window/reinforced/crescent{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "rmw" = ( /obj/structure/bed/stool/padded/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "rnb" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -21319,9 +20551,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "rnP" = ( /obj/item/towel_flat{ @@ -21377,9 +20607,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "rph" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -21404,11 +20632,6 @@ icon_state = "dark" }, /area/cruise/fore) -"rqe" = ( -/turf/unsimulated/floor{ - icon_state = "carpet" - }, -/area/cruise/escort) "rqB" = ( /turf/simulated/wall/shuttle/idris, /area/cruise/e_supplies) @@ -21522,9 +20745,7 @@ name = "garden indicator"; pixel_y = 32 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "rtq" = ( /obj/structure/railing/mapped, @@ -21761,7 +20982,6 @@ name = "Door Bolt Control"; pixel_x = 5; pixel_y = 25; - req_access = null; specialfunctions = 4 }, /turf/unsimulated/floor{ @@ -21881,9 +21101,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "rJK" = ( /turf/unsimulated/floor{ @@ -21913,9 +21131,7 @@ /mob/living/heavy_vehicle/premade/combatripley{ name = "Coalitioner retrofitted powerloader" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "rLN" = ( /obj/structure/bed/stool/chair/wood, @@ -21932,9 +21148,7 @@ /area/cruise/aft) "rLT" = ( /obj/structure/table/wood, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "rMe" = ( /obj/machinery/light{ @@ -21974,9 +21188,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "rNg" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -22066,9 +21278,7 @@ name = "turret" }, /obj/effect/floor_decal/industrial/warning/full, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/jungle) "rUv" = ( /obj/effect/landmark/force_spawnpoint{ @@ -22326,7 +21536,7 @@ /area/cruise/e_supplies) "ses" = ( /obj/structure/table/rack{ - dir = 8; + dir = 8 }, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, @@ -22374,9 +21584,7 @@ }, /obj/structure/table/wood, /obj/item/clothing/head/chicken, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "sfD" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -22427,9 +21635,7 @@ }, /area/cruise/aft_p) "shs" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "sht" = ( /obj/structure/closet/crate/bin, @@ -22510,9 +21716,7 @@ "slK" = ( /obj/effect/floor_decal/industrial/warning, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "smT" = ( /obj/structure/table/standard, @@ -22593,15 +21797,11 @@ name = "Pool" }, /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "sqW" = ( /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/escort) "sra" = ( /obj/machinery/portable_atmospherics/powered/scrubber, @@ -22637,9 +21837,7 @@ dir = 2; name = "Main Bar Suite Entry" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore_p) "ssH" = ( /obj/structure/table/wood, @@ -22776,9 +21974,7 @@ /area/cruise/main_bar/aft) "sCx" = ( /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/jungle) "sCG" = ( /obj/structure/bed/stool/padded, @@ -22895,9 +22091,7 @@ "sGr" = ( /obj/structure/table/wood, /obj/item/material/ashtray/bronze, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "sGy" = ( /obj/structure/flora/grass/jungle{ @@ -22958,9 +22152,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "sIH" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -22970,11 +22162,6 @@ icon_state = "wood_birch" }, /area/cruise/dining_hall) -"sIS" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/cruise/main_bar) "sIV" = ( /obj/effect/decal/fake_object{ color = "#ff0000"; @@ -23072,9 +22259,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/jungle) "sOP" = ( /obj/effect/floor_decal/corner/lime{ @@ -23090,16 +22275,12 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "sPo" = ( /obj/machinery/computer/arcade/orion_trail, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "sPq" = ( /turf/unsimulated/floor{ @@ -23230,9 +22411,7 @@ }, /area/cruise/library) "sUg" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "sUv" = ( /obj/structure/railing/mapped{ @@ -23246,9 +22425,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "sUS" = ( /obj/effect/decal/fake_object{ @@ -23258,9 +22435,7 @@ name = "turret" }, /obj/effect/floor_decal/industrial/warning/full, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "sVA" = ( /obj/effect/decal/fake_object/light_source{ @@ -23325,9 +22500,7 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-4" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "sWZ" = ( /obj/effect/decal/fake_object{ @@ -23396,9 +22569,7 @@ name = "turret" }, /obj/effect/floor_decal/industrial/warning/full, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/security) "sYw" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -23415,11 +22586,6 @@ dir = 4 }, /area/cruise/hangar) -"sZf" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/cruise/hangar) "sZg" = ( /obj/machinery/light/small, /turf/unsimulated/floor{ @@ -23434,9 +22600,7 @@ name = "turret" }, /obj/effect/floor_decal/industrial/warning/full, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "sZE" = ( /obj/structure/railing/mapped, @@ -23471,9 +22635,7 @@ dir = 8 }, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "tbe" = ( /obj/effect/floor_decal/corner/blue{ @@ -23488,7 +22650,6 @@ /area/cruise/escort) "tbF" = ( /obj/structure/flora/rock{ - anchored = 1; desc = "A true to life depiction of a Jotun main battle tank, once used to kill quite a lot of people in a war a really long time ago! Wow! Horrifying. It's beached and immobile."; icon = 'icons/mecha/mecha_114x59.dmi'; icon_state = "jotun-broken"; @@ -23557,9 +22718,7 @@ /obj/machinery/door/blast/shutters/open{ id = "bar_west" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "tdJ" = ( /obj/structure/railing/mapped{ @@ -23588,14 +22747,6 @@ "tec" = ( /turf/simulated/wall/shuttle/idris, /area/cruise/tcomms_sat) -"teH" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/door/airlock/external{ - dir = 1 - }, -/obj/effect/map_effect/door_helper/unres, -/turf/simulated/floor/reinforced, -/area/cruise/virtual_reality) "tfW" = ( /obj/structure/window/reinforced/crescent{ dir = 1 @@ -23614,9 +22765,7 @@ icon_state = "railing0-1"; name = "railing" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "tfY" = ( /obj/machinery/atm{ @@ -23642,9 +22791,7 @@ "tjk" = ( /obj/structure/reagent_dispensers/watertank, /obj/machinery/light/spot, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "tjm" = ( /obj/structure/flora/grass/jungle, @@ -23654,20 +22801,6 @@ icon_state = "beachcorner" }, /area/cruise/virtual_reality) -"tjo" = ( -/obj/structure/flora/tree/jungle/small{ - desc = "A lush and healthy bush."; - icon = 'icons/obj/flora/largejungleflora.dmi'; - icon_state = "bush"; - name = "bush"; - pixel_x = -16 - }, -/turf/unsimulated/floor{ - footstep_sound = /singleton/sound_category/grass_footstep; - icon_state = "asteroid"; - name = "dirt" - }, -/area/cruise/jungle) "tjE" = ( /obj/item/storage/toolbox/electrical{ pixel_x = 6; @@ -23686,9 +22819,7 @@ name = "hyperefficient thruster"; pixel_y = -128 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/escort) "tkp" = ( /obj/effect/decal/cleanable/dirt, @@ -23737,14 +22868,12 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /obj/item/storage/firstaid/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -23774,9 +22903,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "tmV" = ( /obj/machinery/computer/telecomms/traffic, @@ -23807,11 +22934,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/unsimulated/floor/plating, /area/cruise/escort) -"tnF" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, -/area/cruise/centerline) "tpr" = ( /turf/simulated/floor/grass{ icon_state = "grass_stalk" @@ -23941,9 +23063,7 @@ }, /area/cruise/jungle) "tua" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "tul" = ( /obj/random/pottedplant, @@ -24137,9 +23257,7 @@ /area/cruise/library) "tyZ" = ( /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "tzc" = ( /obj/structure/window/reinforced/crescent{ @@ -24208,7 +23326,6 @@ "tAO" = ( /obj/machinery/door/window/northright{ name = "dispensary"; - req_access = null; req_one_access = list(33,104) }, /obj/effect/floor_decal/corner/orange/diagonal, @@ -24218,9 +23335,7 @@ /area/cruise/medical) "tAP" = ( /obj/machinery/hologram/holopad, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "tBD" = ( /turf/unsimulated/beach/coastline{ @@ -24243,9 +23358,7 @@ /obj/structure/bed/stool/chair/wood{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "tCI" = ( /obj/structure/table/standard, @@ -24255,14 +23368,6 @@ icon_state = "dark_preview" }, /area/cruise/escort) -"tDy" = ( -/obj/structure/table/standard, -/obj/item/storage/box/fancy/tray, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/cruise/virtual_reality) "tDB" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small{ @@ -24272,9 +23377,7 @@ /area/cruise/arcade) "tEy" = ( /obj/structure/closet/firecloset/full, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "tFr" = ( /obj/effect/decal/fake_object{ @@ -24430,9 +23533,7 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-10" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "tMe" = ( /obj/effect/floor_decal/corner/blue/diagonal, @@ -24504,9 +23605,7 @@ name = "service ladder"; pixel_y = 24 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "tPq" = ( /obj/structure/flora/ausbushes/ppflowers, @@ -24634,7 +23733,6 @@ /area/cruise/aft) "tVr" = ( /obj/structure/flora/rock{ - anchored = 1; desc = "A true to life depiction of a Jotun main battle tank, once used to kill quite a lot of people in a war a really long time ago! Wow! Horrifying. It's beached and immobile."; icon = 'icons/mecha/mecha_114x59.dmi'; icon_state = "jotun-broken"; @@ -24657,21 +23755,8 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) -"tWe" = ( -/obj/structure/flora/tree/jungle{ - icon_state = "tree3"; - }, -/turf/unsimulated/floor{ - footstep_sound = /singleton/sound_category/grass_footstep; - icon = 'icons/jungle.dmi'; - icon_state = "grass1"; - name = "lush grass" - }, -/area/cruise/jungle) "tWB" = ( /obj/machinery/door/airlock/service{ id_tag = "reading_room_bolts"; @@ -24724,9 +23809,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "tXr" = ( /obj/structure/table/reinforced, @@ -24783,9 +23866,7 @@ dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "tZP" = ( /obj/effect/floor_decal/industrial/warning{ @@ -24814,9 +23895,7 @@ dir = 8 }, /obj/structure/sign/flag/scc, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "uav" = ( /obj/structure/reagent_dispensers/water_cooler, @@ -24951,9 +24030,7 @@ dir = 1; pixel_x = -48 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "udZ" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -25001,9 +24078,7 @@ name = "holographic directional indicator"; pixel_x = 13 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "ugL" = ( /obj/item/towel, @@ -25051,9 +24126,7 @@ pixel_y = 7 }, /obj/item/pen, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "uha" = ( /obj/structure/bed/stool/chair/wood{ @@ -25207,9 +24280,7 @@ dir = 4; id = "private_office" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "uoE" = ( /obj/structure/table/rack, @@ -25287,9 +24358,7 @@ /area/cruise/aft_s) "urH" = ( /obj/machinery/recharge_station, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "usp" = ( /obj/structure/table/wood/gamblingtable, @@ -25297,9 +24366,7 @@ pixel_x = 9; pixel_y = 17 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "usu" = ( /obj/effect/decal/fake_object{ @@ -25309,9 +24376,7 @@ name = "turret" }, /obj/effect/floor_decal/industrial/warning/full, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "usz" = ( /turf/simulated/floor/tiled/ramp{ @@ -25321,9 +24386,7 @@ "usO" = ( /obj/machinery/bluespace_beacon, /obj/item/device/radio/beacon, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "usR" = ( /obj/structure/table/steel, @@ -25346,9 +24409,7 @@ /area/cruise/arcade) "uti" = ( /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "utD" = ( /obj/structure/bed/stool/chair/wood{ @@ -25366,9 +24427,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "utI" = ( /obj/machinery/blackbox_recorder, @@ -25378,9 +24437,7 @@ /area/cruise/tcomms_sat) "utV" = ( /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool/sauna1) "uum" = ( /obj/machinery/shieldgen, @@ -25391,9 +24448,7 @@ /area/cruise/escort) "uvq" = ( /obj/structure/bed/stool/chair/wood, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "uvG" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -25452,9 +24507,7 @@ /area/cruise/pool) "uwx" = ( /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "uwX" = ( /obj/structure/railing/mapped{ @@ -25485,9 +24538,7 @@ /area/cruise/main_bar/aft) "uxb" = ( /obj/effect/floor_decal/industrial/warning/corner, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "uAd" = ( /obj/effect/floor_decal/corner/blue/diagonal, @@ -25597,9 +24648,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "uDX" = ( /obj/machinery/door/airlock/freezer{ @@ -25640,18 +24689,14 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "uFn" = ( /obj/structure/holohoop{ dir = 4 }, /obj/effect/floor_decal/industrial/outline/blue, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "uGE" = ( /obj/effect/overlay/palmtree_r, @@ -25800,9 +24845,7 @@ /area/cruise/jungle) "uMB" = ( /obj/structure/table/stone/marble, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "uMH" = ( /obj/effect/floor_decal/industrial/outline/red, @@ -25839,9 +24882,7 @@ pixel_y = 11 }, /obj/item/storage/box/drinkingglasses, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "uNI" = ( /obj/effect/floor_decal/corner/beige/diagonal, @@ -25913,9 +24954,7 @@ opacity = 0 }, /obj/machinery/vending/dinnerware, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "uSS" = ( /obj/structure/railing/mapped{ @@ -25975,8 +25014,7 @@ "uUn" = ( /obj/structure/railing/mapped, /turf/unsimulated/floor{ - dir = 8; - icon_state = "tiled_preview" + dir = 8 }, /area/cruise/virtual_reality) "uUO" = ( @@ -25992,9 +25030,7 @@ name = "solarian combat exosuit" }, /obj/machinery/mech_recharger, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "uUW" = ( /obj/structure/window/reinforced/crescent{ @@ -26223,9 +25259,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "vfC" = ( /obj/structure/table/reinforced, @@ -26431,9 +25465,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/jungle) "vqt" = ( /obj/structure/window/reinforced, @@ -26511,9 +25543,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/pool) "vuo" = ( /obj/structure/flora/tree/jungle/small{ @@ -26659,8 +25689,7 @@ desc = "A descriptive sign."; icon = 'icons/effects/ship_idris_cruise.dmi'; icon_state = "sign_beach"; - name = "Beach Dome directional indicator"; - pixel_y = 0 + name = "Beach Dome directional indicator" }, /turf/simulated/wall/shuttle/idris, /area/cruise/main_bar) @@ -26693,9 +25722,7 @@ /area/cruise/beach) "vAW" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "vBz" = ( /obj/effect/floor_decal/corner/green/diagonal, @@ -26715,9 +25742,7 @@ /area/cruise/escort) "vBE" = ( /obj/structure/railing/mapped, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "vBJ" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -26755,9 +25780,7 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-15" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/fore) "vFk" = ( /obj/machinery/light{ @@ -26783,9 +25806,7 @@ name = "Main Bar"; dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "vHp" = ( /obj/structure/railing/mapped, @@ -26814,9 +25835,7 @@ icon_state = "cover_0"; name = "turret" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "vIP" = ( /obj/effect/floor_decal/spline/fancy/wood/full, @@ -26915,15 +25934,11 @@ /area/cruise/aft_s) "vPu" = ( /obj/machinery/floor_light/dance, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "vPU" = ( /obj/structure/lattice/catwalk/indoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "vQu" = ( /turf/simulated/floor/greengrid, @@ -26977,7 +25992,6 @@ /area/cruise/centerline) "vRC" = ( /obj/structure/flora/rock{ - anchored = 1; desc = "A big, scary derelict mech!"; icon = 'icons/effects/96x96.dmi'; icon_state = "derelict_mech"; @@ -27114,9 +26128,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "vYa" = ( /obj/structure/railing/mapped, @@ -27215,9 +26227,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "waL" = ( /obj/machinery/vending/cigarette, @@ -27248,9 +26258,7 @@ /area/cruise/pool) "wcC" = ( /obj/structure/bed/stool/chair/wood, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "wdg" = ( /obj/effect/decal/fake_object/light_source{ @@ -27268,7 +26276,6 @@ /area/cruise/jungle) "wdh" = ( /obj/structure/flora/rock{ - anchored = 1; icon_state = "basalt3" }, /turf/unsimulated/floor{ @@ -27326,8 +26333,7 @@ desc = "A descriptive sign."; icon = 'icons/effects/ship_idris_cruise.dmi'; icon_state = "sign_beach"; - name = "Beach Dome directional indicator"; - pixel_y = 0 + name = "Beach Dome directional indicator" }, /turf/simulated/wall/shuttle/idris, /area/cruise/fore_p) @@ -27340,9 +26346,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "wgm" = ( /obj/effect/floor_decal/corner/blue{ @@ -27424,15 +26428,11 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "whR" = ( /obj/item/device/radio/intercom/east, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "whY" = ( /obj/item/beach_ball, @@ -27517,9 +26517,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "wjD" = ( /obj/machinery/door/firedoor, @@ -27565,9 +26563,7 @@ pixel_x = -9 }, /obj/structure/table/wood/gamblingtable, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "wli" = ( /obj/structure/railing/mapped{ @@ -27622,8 +26618,7 @@ desc = "A descriptive sign."; icon = 'icons/effects/ship_idris_cruise.dmi'; icon_state = "sign_beach"; - name = "Beach Dome directional indicator"; - pixel_y = 0 + name = "Beach Dome directional indicator" }, /turf/simulated/wall/shuttle/idris, /area/cruise/custodial_p) @@ -27661,9 +26656,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "wsh" = ( /obj/structure/closet/crate/coffin, @@ -27753,9 +26746,7 @@ name = "holographic directional indicator"; pixel_x = -14 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/virtual_reality) "wyy" = ( /obj/machinery/door/airlock{ @@ -27830,9 +26821,7 @@ icon_state = "intact-supply"; name = "pipe" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/central) "wBK" = ( /obj/structure/table/wood, @@ -27889,9 +26878,7 @@ /obj/machinery/atm{ pixel_y = 28 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "wFi" = ( /obj/item/device/radio/intercom/east, @@ -27914,9 +26901,7 @@ "wFX" = ( /obj/structure/table/wood, /obj/item/material/ashtray/bronze, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/aft_s) "wGn" = ( /obj/effect/floor_decal/corner/blue/diagonal, @@ -28141,9 +27126,7 @@ "wNo" = ( /obj/structure/table/stone/marble, /obj/item/device/camera, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "wON" = ( /obj/structure/table/wood/gamblingtable, @@ -28166,13 +27149,10 @@ /obj/machinery/light_switch{ pixel_y = 24 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach_bar) "wQN" = ( -/obj/structure/flora/tree/jungle{ - }, +/obj/structure/flora/tree/jungle, /obj/structure/flora/tree/jungle/small{ desc = "A pile of unassuming rocks."; icon = 'icons/obj/flora/largejungleflora.dmi'; @@ -28217,9 +27197,7 @@ /turf/template_noop, /area/template_noop) "wSB" = ( -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/e_supplies) "wSF" = ( /obj/effect/floor_decal/industrial/warning{ @@ -28244,9 +27222,7 @@ /obj/structure/cryofeed{ dir = 2 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "wTb" = ( /obj/structure/flora/grass/jungle/b, @@ -28362,9 +27338,7 @@ /obj/structure/table/wood, /obj/item/material/ashtray/bronze, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "wYE" = ( /obj/effect/decal/fake_object{ @@ -28384,9 +27358,7 @@ dir = 8 }, /obj/structure/bed/stool/padded/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar) "wYV" = ( /obj/effect/decal/fake_object/light_source{ @@ -28509,9 +27481,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "xdC" = ( /obj/structure/bed/stool/chair/shuttle{ @@ -28528,9 +27498,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "xeN" = ( /turf/simulated/wall/shuttle/scc, @@ -28696,9 +27664,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "xmg" = ( /obj/structure/blocker, @@ -28802,9 +27768,7 @@ "xpD" = ( /obj/structure/window/reinforced/crescent, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "xpJ" = ( /obj/item/device/radio/intercom/west, @@ -28851,7 +27815,6 @@ /area/cruise/main_bar) "xqn" = ( /obj/structure/flora/rock{ - anchored = 1; icon_state = "basalt3" }, /turf/simulated/floor/exoplanet/water/shallow, @@ -28908,9 +27871,7 @@ pixel_y = 11 }, /obj/item/storage/box/drinkingglasses, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "xrg" = ( /obj/structure/railing/mapped{ @@ -28930,18 +27891,14 @@ dir = 8 }, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "xsd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "xsl" = ( /obj/machinery/door/airlock/multi_tile/glass{ @@ -29049,9 +28006,7 @@ /area/cruise/medical) "xyh" = ( /obj/structure/bed/stool/padded/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "xyu" = ( /turf/unsimulated/floor{ @@ -29165,9 +28120,7 @@ /area/cruise/central) "xBh" = ( /obj/structure/closet/emcloset, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/beach) "xBm" = ( /obj/structure/closet/walllocker/emerglocker/north{ @@ -29190,9 +28143,7 @@ /area/cruise/fore_p) "xBV" = ( /obj/structure/lattice/catwalk, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "xCq" = ( /obj/effect/floor_decal/industrial/warning{ @@ -29217,9 +28168,7 @@ /obj/structure/bed/stool/chair/wood{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/hangar) "xDq" = ( /obj/item/card/id/all_access, @@ -29255,7 +28204,7 @@ /area/cruise/virtual_reality) "xEM" = ( /obj/structure/table/rack{ - dir = 8; + dir = 8 }, /obj/item/storage/bag/inflatable, /obj/item/storage/bag/inflatable, @@ -29296,9 +28245,7 @@ /area/cruise/jungle) "xGA" = ( /obj/machinery/portable_atmospherics/canister/hydrogen, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "xHc" = ( /obj/effect/floor_decal/corner/green/diagonal, @@ -29320,9 +28267,7 @@ /obj/machinery/door/blast/shutters/open{ id = "bar_west" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/main_bar/aft) "xHn" = ( /obj/structure/flora/tree/jungle/small{ @@ -29351,9 +28296,7 @@ opacity = 0 }, /obj/machinery/door/firedoor, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "xIc" = ( /obj/effect/floor_decal/corner/green/diagonal, @@ -29388,9 +28331,7 @@ /obj/structure/cryofeed{ dir = 2 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "xJS" = ( /obj/machinery/telecomms/bus/preset_two, @@ -29480,9 +28421,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/centerline) "xOJ" = ( /obj/structure/table/rack, @@ -29624,9 +28563,7 @@ dir = 2; name = "VR Suite" }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/arcade) "xXz" = ( /obj/structure{ @@ -29687,17 +28624,13 @@ name = "turret" }, /obj/effect/floor_decal/industrial/warning/full, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/escort) "yaB" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/tcomms_sat) "yaR" = ( /obj/structure/barricade/metal{ @@ -29710,14 +28643,6 @@ name = "gloomy grass" }, /area/cruise/virtual_reality) -"ybG" = ( -/obj/structure/table/standard, -/obj/item/storage/box/fancy/tray, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/cruise/medical) "ych" = ( /turf/unsimulated/floor{ icon = 'icons/turf/flooring/carpet.dmi'; @@ -29790,9 +28715,7 @@ dir = 4 }, /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/template_noop) "yeJ" = ( /obj/machinery/door/window/southleft, @@ -29845,9 +28768,7 @@ /area/cruise/library) "yhk" = ( /obj/item/hullbeacon/red, -/turf/unsimulated/floor{ - icon_state = "tiled_preview" - }, +/turf/unsimulated/floor, /area/cruise/security) "yhl" = ( /obj/effect/decal/fake_object/light_source{ @@ -32519,7 +31440,7 @@ oSt oSt oSt oSt -kqe +omN oSt oSt oSt @@ -33033,7 +31954,7 @@ tzV imw tzV imw -eVv +omN wKK bGs wKK @@ -33547,7 +32468,7 @@ oSt oSt oSt oSt -eVv +omN oSt oSt oSt @@ -34061,7 +32982,7 @@ tzV imw tzV imw -eVv +omN wKK bGs wKK @@ -34575,7 +33496,7 @@ oSt oSt oSt oSt -eVv +omN oSt oSt oSt @@ -35089,7 +34010,7 @@ tzV imw tzV imw -eVv +omN wKK bGs wKK @@ -35603,7 +34524,7 @@ oSt oSt oSt oSt -eVv +omN oSt oSt oSt @@ -36117,7 +35038,7 @@ tzV imw tzV imw -eVv +omN wKK bGs wKK @@ -41257,7 +40178,7 @@ tzV imw tzV imw -eVv +omN wKK bGs wKK @@ -41771,7 +40692,7 @@ uee oSt oSt oSt -eVv +omN oSt oSt oSt @@ -42285,7 +41206,7 @@ tzV imw tzV imw -eVv +omN wKK bGs wKK @@ -42799,7 +41720,7 @@ oSt oSt oSt oSt -eVv +omN oSt oSt oSt @@ -43313,7 +42234,7 @@ tzV imw tzV imw -eVv +omN wKK bGs wKK @@ -43827,7 +42748,7 @@ oSt oSt oSt oSt -eVv +omN oSt oSt oSt @@ -44341,7 +43262,7 @@ tzV imw tzV imw -eVv +omN wKK bGs wKK @@ -52224,9 +51145,9 @@ pbo pbo tlN sRC -oEG -oEG -oEG +flZ +flZ +flZ leQ pbo pbo @@ -52483,7 +51404,7 @@ ixF qKO sGG dkj -oEG +flZ leQ roq roq @@ -52740,7 +51661,7 @@ pbo wdG vzp dkj -oEG +flZ mRm ibE ibE @@ -53507,8 +52428,8 @@ hfT eFA pbo dkj -oEG -oEG +flZ +flZ leQ sUg sUg @@ -55652,7 +54573,7 @@ wym mOH fgt qPz -eVv +omN oSt oSt oSt @@ -59962,9 +58883,9 @@ xAP xAP xAP cNG -gJa -gJa -gJa +lux +lux +lux cNG ezk ezk @@ -60007,9 +58928,9 @@ nhW cYi cYi phj -tnF +aaR eWm -tnF +aaR hde uti jHC @@ -60219,9 +59140,9 @@ xAP xAP xAP cNG -gJa -gJa -gJa +lux +lux +lux cNG ezk ezk @@ -60264,8 +59185,8 @@ nhW nhW nhW phj -tnF -tnF +aaR +aaR fqV vHO dwA @@ -60733,7 +59654,7 @@ qRy iKO iUS kxc -fQJ +hXh hXh hXh kxc @@ -60767,7 +59688,7 @@ oRC dwA mWW qWZ -nqY +pRn vzm xyh qWZ @@ -61248,7 +60169,7 @@ aiT gtd fWV lXO -gWM +omN apD uSu mHB @@ -61505,7 +60426,7 @@ aiT aiT xHK gPo -gWM +omN acC amX oMh @@ -61751,8 +60672,8 @@ qNr cYc hMx kcP -sIS -sIS +shs +shs iUS lvA aiT @@ -62007,9 +60928,9 @@ cfr cfr nCO hMx -kpV -sIS -sIS +sIE +shs +shs byz aiT aiT @@ -62265,8 +61186,8 @@ qNr iUP hMx pxT -sIS -sIS +shs +shs cei lQi aiT @@ -64119,10 +63040,10 @@ sPq sPq sPq nkY -tnF -tnF -tnF -tnF +aaR +aaR +aaR +aaR iXD oUL qWZ @@ -64278,7 +63199,7 @@ pfD soG hUO dEl -kup +lpS tpO cLb sDZ @@ -64378,8 +63299,8 @@ sPq dwA wzV mOa -tnF -tnF +aaR +aaR qWZ srP qWZ @@ -64578,7 +63499,7 @@ vac vVA asj iUS -eKe +shs vBE uHY esE @@ -64635,7 +63556,7 @@ dwA dwA xLj cbC -tnF +aaR xNY dwA sQm @@ -64833,7 +63754,7 @@ hto ych rNg bio -eVv +omN iUS wEX shs @@ -65058,7 +63979,7 @@ jlw qQP qQP qQP -qRu +isP kfK qQP qQP @@ -65566,7 +64487,7 @@ qQP qQP qQP qQP -kup +lpS kCY cLb sGy @@ -66074,7 +64995,7 @@ vdS qQP qQP dEl -dBm +wSg dEl qQP qQP @@ -66343,7 +65264,7 @@ hUO hUO aaC qQP -mOx +pfY cLb cLb cLb @@ -66446,7 +65367,7 @@ nWh goT vlW iXJ -eVv +omN oSt oSt oSt @@ -66622,7 +65543,7 @@ hBy hBy kCY qQP -kup +lpS omf onn omf @@ -67103,7 +66024,7 @@ uQJ qQP dEl dEl -dBm +wSg cLb vZg cLb @@ -67115,7 +66036,7 @@ hUO hUO hUO qQP -gBO +uQJ dlP cLb cLb @@ -67614,9 +66535,9 @@ xHn cLb kBn qQP -kup +lpS qQP -gBO +uQJ dFf kCY iHu @@ -67886,7 +66807,7 @@ sGy dou cLb qQP -kup +lpS qQP qQP jlw @@ -68699,12 +67620,12 @@ soC soC mUi soC -eVv +omN asj -eVv -eVv +omN +omN asj -eVv +omN soC mUi soC @@ -68924,7 +67845,7 @@ cLb kBn kCY kBn -tjo +upB aaC joZ hUO @@ -68981,7 +67902,7 @@ cKw cKw sjz cNV -rgO +chC gQK yeJ qOc @@ -69438,7 +68359,7 @@ cLb qQP dEl dEl -kup +lpS hUO hUO hUO @@ -69959,7 +68880,7 @@ hUO hUO hUO uQJ -tWe +isP qQP qQP lpS @@ -70477,7 +69398,7 @@ xni cLb hBy aLK -kup +lpS hUO hUO hUO @@ -70720,7 +69641,7 @@ cun cPE cLb qQP -kup +lpS kBn cLb hUO @@ -70804,7 +69725,7 @@ ogR oNG kBq poz -ybG +ogR vlW vlW pez @@ -71223,7 +70144,7 @@ kBn qQP qQP qQP -bqt +qEZ jlw ave cun @@ -71830,7 +70751,7 @@ fLY sjz sjz sjz -kqe +omN jgm oSt oSt @@ -72285,36 +71206,36 @@ oSt oSt hFF cWB -sZf +rfF dui dui dui dui dui dui -sZf +rfF cWB eWy cWB -sZf +rfF dui dui dui dui dui dui -sZf +rfF cWB eWy cWB -sZf +rfF dui dui dui dui dui dui -sZf +rfF cWB hFF wSN @@ -72781,7 +71702,7 @@ voy tJO jlw qQP -mOx +pfY hUO hUO cLb @@ -73531,13 +72452,13 @@ jlw cLb kBn qQP -bqt +qEZ hUO cLb cLb hUO qQP -mOx +pfY dXc xGq cLb @@ -74577,7 +73498,7 @@ dQM qQP qQP qQP -mOx +pfY qQP erg hUO @@ -74821,7 +73742,7 @@ qQP qQP qQP qQP -lpP +jwi qQP qQP qQP @@ -74829,7 +73750,7 @@ qQP qQP qQP qQP -mOx +pfY qQP lpS qQP @@ -74841,7 +73762,7 @@ hUO hUO xXH cLb -tjo +upB hUO onn qsn @@ -79095,7 +78016,7 @@ aHv dWy dWy dWy -hQs +lPx dWy dWy dWy @@ -79356,7 +78277,7 @@ wid wid dWy dWy -hQs +lPx api suK iRW @@ -80105,7 +79026,7 @@ dWy dWy dWy dWy -imp +tBL dWy dWy mhT @@ -80124,7 +79045,7 @@ dWy cGz dWy dWy -hQs +lPx wid wid wid @@ -80325,7 +79246,7 @@ iiE iiE iiE xeN -mNt +hAl noU noU noU @@ -80359,7 +79280,7 @@ ddu dWy dWy dWy -hbr +tBL dWy dWy dWy @@ -81412,7 +80333,7 @@ wid dWy dWy dWy -hQs +lPx ddu oog oog @@ -81611,7 +80532,7 @@ sDv sDv mQr xeN -mNt +hAl noU noU oSt @@ -81905,15 +80826,15 @@ wIc dWy dWy dWy -gbk +mhT ddu ddu mhT -gbk +mhT ddu ddu mhT -gbk +mhT ddu ddu ddu @@ -81923,8 +80844,8 @@ ooN dWy dWy dWy -noJ -noJ +tua +tua dWy ooN ddu @@ -82457,7 +81378,7 @@ qIH nGD fEQ cDg -tDy +qIH oog ddu jSp @@ -82900,7 +81821,7 @@ xeN xeN pCv xeN -mNt +hAl noU noU oSt @@ -82950,7 +81871,7 @@ ddu dWy uUT uUT -noJ +tua hGy qjQ qjQ @@ -82959,7 +81880,7 @@ hXO kPa dzw dzw -teH +aab dzw dzw kPa @@ -83379,7 +82300,7 @@ xla xHt qZL nMY -aai +aah jTE lHZ lHZ @@ -83473,7 +82394,7 @@ ddu oog dzw dzw -teH +aab dzw dzw kPa @@ -83903,7 +82824,7 @@ mTw xla fSf daT -rqe +mwN jjt aaj iTi @@ -83978,7 +82899,7 @@ ddu dWy nxg uUT -noJ +tua hGy qjQ qjQ @@ -84227,7 +83148,7 @@ dWy dWy dWy dWy -gbk +mhT dWy wid dWy @@ -84431,7 +83352,7 @@ dzW xeN arG nMY -aak +aah iTi nsg nsg @@ -84682,10 +83603,10 @@ xeN arG arG xeN -mNt +hAl arG nMY -aal +aah iTi arG xeN @@ -84956,7 +83877,7 @@ xeN xZL xZL xeN -mNt +hAl noU noU oSt @@ -86237,7 +85158,7 @@ xla kyB xeN xeN -mNt +hAl noU noU oSt @@ -86548,7 +85469,7 @@ ddu dWy dLZ dLZ -noJ +tua hGy qjQ qjQ @@ -86792,7 +85713,7 @@ dWy dWy dWy bQA -gbk +mhT nSV mVh dWy @@ -87055,7 +85976,7 @@ dWy qgK dWy dWy -hQs +lPx dWy dWy ddu @@ -87328,7 +86249,7 @@ fTq oog dzw dzw -aad +aAR dzw dzw kPa @@ -87576,7 +86497,7 @@ ddu dWy rLb rLb -noJ +tua hGy qjQ qjQ @@ -88586,14 +87507,14 @@ dWy dWy dWy dWy -gbk +mhT ddu qwv -gbk +mhT ddu ddu ddu -gbk +mhT qwv ddu ddu @@ -88860,8 +87781,8 @@ dWy cGz dWy dWy -noJ -noJ +tua +tua dWy dWy dWy @@ -88882,7 +87803,7 @@ qIH nGD fEQ cDg -tDy +qIH oog ddu jSp @@ -89097,7 +88018,7 @@ ddu dWy dWy dWy -gbk +mhT dWy dWy dWy @@ -89122,7 +88043,7 @@ dWy dWy dWy dWy -hQs +lPx ddu oog oog @@ -89871,7 +88792,7 @@ igv igv igv dWy -gbk +mhT dWy dWy dWy @@ -90388,7 +89309,7 @@ wid wid dWy dWy -gbk +mhT dWy wid wid @@ -90405,7 +89326,7 @@ cGz dWy dWy dWy -hQs +lPx wid wid api @@ -90638,12 +89559,12 @@ jSp ddu dWy dWy -gbk +mhT dWy dWy dWy dWy -hbr +tBL dWy dWy dWy @@ -91159,7 +90080,7 @@ igv igv igv dWy -gbk +mhT dWy dWy igv diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm index 95446fea274..fc620418e4f 100644 --- a/maps/event/rooftop/rooftop-1.dmm +++ b/maps/event/rooftop/rooftop-1.dmm @@ -44,14 +44,6 @@ }, /turf/simulated/floor/tiled/white, /area/city/mendell/interior) -"af" = ( -/obj/machinery/door/airlock/centcom{ - name = "Administrative Wing"; - req_access = list(101); - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/city/mendell/interior) "ag" = ( /obj/machinery/door/airlock/glass_centcom{ name = "Kitchen"; @@ -60,14 +52,6 @@ }, /turf/simulated/floor/tiled/white, /area/city/mendell/interior) -"ah" = ( -/obj/machinery/door/airlock/glass_centcom{ - name = "Kitchen"; - req_access = list(101); - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/city/mendell/interior) "ai" = ( /obj/structure/railing/mapped{ dir = 1 @@ -214,13 +198,6 @@ name = "hex flooring" }, /area/city/mendell/interior) -"aN" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/door/airlock/glass_security{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/city/mendell) "aP" = ( /obj/machinery/light/small{ dir = 8 @@ -494,7 +471,6 @@ name = "Door Bolt Control"; pixel_x = 5; pixel_y = 25; - req_access = null; specialfunctions = 4 }, /obj/machinery/light/small{ @@ -502,10 +478,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/city/mendell/interior) -"cF" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/indestructible, -/turf/simulated/floor/marble/dark, -/area/city/mendell/interior) "cG" = ( /obj/machinery/chemical_dispenser/bar_soft/full{ pixel_y = 6 @@ -713,7 +685,6 @@ name = "Door Bolt Control"; pixel_x = 5; pixel_y = 25; - req_access = null; specialfunctions = 4 }, /obj/machinery/light/small{ @@ -853,9 +824,6 @@ icon_state = "wood_birch" }, /area/city/mendell/interior) -"ey" = ( -/turf/simulated/floor/lino, -/area/city/mendell) "ez" = ( /obj/structure/railing/mapped{ dir = 8 @@ -1127,7 +1095,6 @@ }, /obj/machinery/door/window/eastleft{ name = "dispensary"; - req_access = null; req_one_access = list(33,104) }, /obj/structure/window/reinforced/crescent{ @@ -1628,15 +1595,6 @@ }, /turf/simulated/floor/carpet, /area/city/mendell/interior) -"il" = ( -/obj/structure/table/standard, -/obj/item/storage/box/fancy/tray{ - }, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/city/mendell) "is" = ( /obj/effect/floor_decal/spline/fancy/wood/full, /obj/random/pottedplant, @@ -1770,15 +1728,13 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /obj/effect/floor_decal/corner/lime/diagonal, /obj/item/storage/firstaid/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /obj/structure/sign/nosmoking_1{ pixel_y = 30 }, @@ -1867,12 +1823,6 @@ }, /turf/simulated/floor/tiled/dark, /area/city/mendell/interior) -"jy" = ( -/obj/machinery/door/airlock/glass_centcom{ - dir = 1 - }, -/turf/simulated/floor/marble/dark, -/area/city/mendell/interior) "jB" = ( /obj/machinery/floor_light/dance, /turf/simulated/floor/marble/dark, @@ -2044,12 +1994,6 @@ }, /turf/simulated/floor/wood, /area/city/mendell/interior) -"kV" = ( -/obj/structure/table/stone/marble, -/turf/unsimulated/floor{ - icon_state = "wood_cherry" - }, -/area/city/mendell/interior) "kW" = ( /obj/structure/railing/mapped{ dir = 1 @@ -2746,7 +2690,6 @@ "pt" = ( /obj/machinery/door/window/northright{ name = "dispensary"; - req_access = null; req_one_access = list(33,104) }, /obj/effect/floor_decal/corner/orange/diagonal, @@ -3529,13 +3472,6 @@ }, /turf/simulated/floor/wood, /area/city/mendell/interior) -"tY" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/door/airlock/external{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/city/mendell) "uc" = ( /obj/structure/sink/puddle{ desc = "A small pool of some water, very likely important to your mission."; @@ -3998,20 +3934,6 @@ /obj/machinery/door/window/southright, /turf/simulated/floor/plating, /area/city/mendell) -"wR" = ( -/obj/structure/table/wood, -/obj/item/paper/fluff/rooftop/vr_prep, -/obj/item/paper/fluff/rooftop/vr_prep, -/obj/item/paper/fluff/rooftop/vr_prep, -/obj/item/paper/fluff/rooftop/vr_prep, -/obj/item/paper/fluff/rooftop/vr_prep, -/obj/item/paper/fluff/rooftop/vr_prep, -/obj/item/paper/fluff/rooftop/vr_prep, -/obj/item/paper/fluff/rooftop/vr_prep, -/turf/unsimulated/floor{ - icon_state = "wood_preview" - }, -/area/city/mendell) "wS" = ( /obj/structure/railing/mapped, /turf/simulated/floor/tiled, @@ -5886,10 +5808,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/dark, /area/city/mendell/interior) -"IA" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/indestructible, -/turf/simulated/floor/marble/dark, -/area/city/mendell/interior) "IC" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/hatch, @@ -6157,7 +6075,6 @@ /area/city/mendell/interior) "JX" = ( /obj/machinery/door/airlock/command{ - id_tag = null; name = "Conference Room"; req_access = list(19); dir = 1 @@ -7259,14 +7176,12 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /obj/item/storage/firstaid/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -7376,7 +7291,6 @@ /obj/effect/floor_decal/corner/orange/diagonal, /obj/machinery/door/window/eastleft{ name = "dispensary"; - req_access = null; req_one_access = list(33,104) }, /obj/item/reagent_containers/glass/beaker/large, @@ -7653,7 +7567,6 @@ name = "Door Bolt Control"; pixel_x = 5; pixel_y = 25; - req_access = null; specialfunctions = 4 }, /obj/machinery/light/small{ @@ -8905,7 +8818,6 @@ /obj/effect/floor_decal/corner/orange/diagonal, /obj/machinery/door/window/eastright{ name = "dispensary"; - req_access = null; req_one_access = list(33,104) }, /obj/item/reagent_containers/dropper, @@ -11190,7 +11102,7 @@ Yw fe Or Or -il +hJ OE HG ma @@ -12538,8 +12450,8 @@ Or ej ej ej -ey -ey +en +en fK rO ar @@ -12625,8 +12537,8 @@ Or en en en -ey -ey +en +en fK is ar @@ -12709,12 +12621,12 @@ ZL ZL ZL Or -ey -ey -ey -ey -ey -ey +en +en +en +en +en +en rY ar ar @@ -12796,12 +12708,12 @@ ZL ZL ZL Or -ey +en iJ -ey -ey -ey -ey +en +en +en +en rY ar ar @@ -12883,12 +12795,12 @@ ZL ZL ZL Or -ey -ey -ey -ey -ey -ey +en +en +en +en +en +en rY ar ar @@ -12973,8 +12885,8 @@ Or eU en en -ey -ey +en +en fK is ar @@ -13060,8 +12972,8 @@ Or eZ eZ eZ -ey -ey +en +en fK rZ Pk @@ -18588,7 +18500,7 @@ uz Ti Us CP -kV +zH vL CO CP @@ -18940,7 +18852,7 @@ hx rz CP CP -IA +cL CP js nn @@ -19148,7 +19060,7 @@ ZL ZL bo ZG -jy +ac ZG ZG ZG @@ -19322,7 +19234,7 @@ ZL ZL bk ZG -jy +ac ZG ZG ZG @@ -19524,8 +19436,8 @@ zU Eq AN CP -IA -IA +cL +cL CP fa Hn @@ -19692,7 +19604,7 @@ CP CP CP ae -af +ae CP Eq Eq @@ -19977,7 +19889,7 @@ Rb Iw jq tj -IA +cL ZL ZL ZL @@ -20040,7 +19952,7 @@ UZ ob CP ag -ah +ag CP Eq Eq @@ -20151,7 +20063,7 @@ fg WA EA Lz -IA +cL ZL ZL ZL @@ -20390,7 +20302,7 @@ GI Dt Dt Xs -IA +cL Eq Eq Eq @@ -20477,7 +20389,7 @@ CP CP Dt Dt -IA +cL Eq Eq Eq @@ -20568,7 +20480,7 @@ CP ug ug CP -IA +cL CP CP yA @@ -20743,7 +20655,7 @@ ZG ZG ZG ZG -IA +cL CY yU yU @@ -20804,7 +20716,7 @@ ZG ZG ZG lc -IA +cL JQ Dt Dt @@ -20830,7 +20742,7 @@ Dt Dt ZG ZG -IA +cL Dt Dt Dt @@ -20891,7 +20803,7 @@ ZG ZG ZG ZG -IA +cL JQ sm Ph @@ -20917,7 +20829,7 @@ KX Dt ZG ZG -IA +cL Dt Dt Dt @@ -20978,23 +20890,23 @@ ZG ZG ZG tQ -IA -IA -IA +cL +cL +cL CP -IA -IA -IA +cL +cL +cL CP CP CP -IA -IA -IA +cL +cL +cL CP -IA -IA -IA +cL +cL +cL CP CP CP @@ -21005,14 +20917,14 @@ Dt ZG tQ CP -IA +cL yY yY -IA +cL CP GX jH -IA +cL Vi yj CP @@ -21020,8 +20932,8 @@ YX qT xY kZ -IA -IA +cL +cL ZL ZL ZL @@ -21099,7 +21011,7 @@ kY jH GX GX -IA +cL GX GX CP @@ -21108,7 +21020,7 @@ ny ny QI JF -IA +cL ZL ZL ZL @@ -21186,7 +21098,7 @@ GX GX GX GX -IA +cL GX GX CP @@ -21195,7 +21107,7 @@ Lw ny ny oE -IA +cL ZL ZL ZL @@ -21282,7 +21194,7 @@ CP zk zk zk -IA +cL ZL ZL ZL @@ -21369,7 +21281,7 @@ CP jX zk zk -IA +cL ZL ZL ZL @@ -21456,7 +21368,7 @@ CP zk zO zO -IA +cL ZL ZL ZL @@ -21592,7 +21504,7 @@ jB jB hd oT -IA +cL Bl Df Df @@ -21679,7 +21591,7 @@ jB jB hd UZ -IA +cL Bn Eq Go @@ -21701,7 +21613,7 @@ kd GX kd GX -cF +cL kd GX GX @@ -21766,7 +21678,7 @@ jB jB hd oT -IA +cL Bx Eq Go @@ -21788,7 +21700,7 @@ kd GX kd GX -IA +cL kd GX gZ @@ -21853,7 +21765,7 @@ jB jB hd UZ -IA +cL Bn Eq Go @@ -21879,8 +21791,8 @@ OQ kd GX gZ -IA -IA +cL +cL CP CU CU @@ -21940,7 +21852,7 @@ jB jB hd oT -IA +cL BD yY yY @@ -21962,16 +21874,16 @@ Qs GX Qs GX -cF +cL kd GX GX -IA +cL fh gG ny ny -IA +cL GX wS ZG @@ -22045,20 +21957,20 @@ CP Dt Dt Ix -IA +cL Ee -IA +cL BL WG GX GX GX -IA +cL kd ny ny ny -IA +cL GX wS ZG @@ -22140,12 +22052,12 @@ Vh vJ GX GX -IA +cL fh Gf ny ny -IA +cL GX wS ZG @@ -22227,8 +22139,8 @@ cL vJ GX gZ -IA -IA +cL +cL CP CU CU @@ -22310,7 +22222,7 @@ vJ GX vJ GX -IA +cL vJ GX gZ @@ -22735,11 +22647,11 @@ ZG ZG ZG tQ -IA +cL sj Df Qx -IA +cL Rs ZG ZG @@ -22900,9 +22812,9 @@ nH VY VY yz -IA +cL Tp -IA +cL CP Uc eX @@ -22920,9 +22832,9 @@ CX eX jp CP -IA +cL Tp -IA +cL nH VY VY @@ -22987,7 +22899,7 @@ VY VY VY VY -IA +cL ZL ZL ZL @@ -23009,7 +22921,7 @@ ZL ZL ZL Ju -IA +cL VY VY VY @@ -23074,7 +22986,7 @@ VY VY VY VY -IA +cL ZL ZL ZL @@ -23096,7 +23008,7 @@ ZL ZL ZL ZL -IA +cL VY VY VY @@ -23183,7 +23095,7 @@ ZL ZL ZL ZL -IA +cL Df Df Df @@ -23192,7 +23104,7 @@ CP Hp EO Yu -IA +cL vk EO yL @@ -23239,7 +23151,7 @@ bL Ga EO Yu -IA +cL vk EO EO @@ -23248,7 +23160,7 @@ Df Df Df Df -IA +cL ZL ZL ZL @@ -23335,7 +23247,7 @@ sj Df Df Qx -IA +cL ZL ZL ZL @@ -23357,7 +23269,7 @@ ZL ZL ZL ZL -IA +cL sj Df Df @@ -23780,7 +23692,7 @@ FM Lo Rj uO -IA +cL FM yQ yQ @@ -23865,9 +23777,9 @@ FM FM FM Yu -IA +cL vk -IA +cL FM yQ GJ @@ -23954,7 +23866,7 @@ Po ZS po vr -IA +cL FM yQ cW @@ -24109,7 +24021,7 @@ cK ho ho ls -IA +cL rk ho oZ @@ -24128,7 +24040,7 @@ EO sF EO EO -IA +cL FM yQ GJ @@ -24199,7 +24111,7 @@ ho oD ho ls -IA +cL vk Px UZ @@ -24215,7 +24127,7 @@ yL CP EO EO -IA +cL FM yQ yQ @@ -24302,7 +24214,7 @@ EO EO EO EO -IA +cL Hk yQ yQ @@ -24563,11 +24475,11 @@ wp CG CA ho -IA +cL ho -IA +cL ho -IA +cL FM yQ CP @@ -24721,7 +24633,7 @@ ho oZ ho ls -IA +cL vk wo UZ @@ -24805,7 +24717,7 @@ cK ho ho ls -IA +cL rk ho oD @@ -24824,7 +24736,7 @@ EO EO EO EO -IA +cL FM yQ EO @@ -24849,7 +24761,7 @@ GJ rl CG CG -IA +cL ZL ZL ZL @@ -24911,7 +24823,7 @@ EO EO EO EO -IA +cL FM yQ EO @@ -24998,7 +24910,7 @@ EO cW EO EO -IA +cL FM yQ EO @@ -25023,7 +24935,7 @@ EO rl CG Sp -IA +cL ZL ZL ZL @@ -25110,7 +25022,7 @@ EO rl CG rc -IA +cL ZL ZL ZL @@ -25174,9 +25086,9 @@ PF PF CP CP -IA +cL Tp -IA +cL CP CP CP @@ -25195,8 +25107,8 @@ nr yZ CP Tp -IA -IA +cL +cL CP ZL ZL @@ -28834,7 +28746,7 @@ fK MJ MJ fK -il +hJ OE HG ma @@ -29000,7 +28912,7 @@ Kg xD xD xD -tY +aj xD xD hM @@ -29030,19 +28942,19 @@ pn hP xW hC -wR +do hP xW hC -wR +do hP xW hC -wR +do hP xW hC -wR +do hP "} (231,1,1) = {" @@ -29174,7 +29086,7 @@ Kg xD xD xD -tY +aj xD xD hM @@ -30074,19 +29986,19 @@ QX hP xW hC -wR +do hP xW hC -wR +do hP xW hC -wR +do hP xW hC -wR +do hP "} (243,1,1) = {" @@ -30392,7 +30304,7 @@ Kg xD xD xD -aN +ao xD xD hM @@ -30566,7 +30478,7 @@ Kg xD xD xD -aN +ao xD xD hM @@ -31009,7 +30921,7 @@ Or Jy Jy Or -il +hJ OE HG ma diff --git a/maps/helpers/event_shuttles/sccv_apollo_v1.dmm b/maps/helpers/event_shuttles/sccv_apollo_v1.dmm index 4b75606df7a..ab9a4af5078 100644 --- a/maps/helpers/event_shuttles/sccv_apollo_v1.dmm +++ b/maps/helpers/event_shuttles/sccv_apollo_v1.dmm @@ -16,9 +16,7 @@ /obj/effect/floor_decal/industrial/outline_segment/red{ dir = 5 }, -/obj/effect/floor_decal/spline/plain/corner/green{ - dir = 2 - }, +/obj/effect/floor_decal/spline/plain/corner/green, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "aJ" = ( @@ -432,7 +430,6 @@ /area/scc_event_shuttle) "gd" = ( /obj/structure/sign/directions/civ{ - pixel_y = 0; dir = 4; pixel_x = 32 }, @@ -723,20 +720,16 @@ pixel_y = 16 }, /obj/item/device/gps/medical{ - pixel_x = -7; - pixel_y = 0 + pixel_x = -7 }, /obj/item/device/gps/medical{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/item/device/gps/medical{ - pixel_x = -7; - pixel_y = 0 + pixel_x = -7 }, /obj/item/device/gps/medical{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/effect/floor_decal/spline/plain/green{ dir = 8 @@ -816,35 +809,27 @@ name = "shelves" }, /obj/item/stack/material/plasteel/full{ - pixel_y = 0; pixel_x = -6 }, /obj/item/stack/material/plasteel/full{ - pixel_y = 0; pixel_x = -6 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /turf/simulated/floor/tiled, @@ -993,7 +978,6 @@ "nC" = ( /obj/structure/sign/directions/engineering{ dir = 4; - pixel_y = 0; pixel_x = 32 }, /obj/effect/floor_decal/spline/plain{ @@ -1140,11 +1124,9 @@ name = "shelves" }, /obj/item/stack/material/lead/full{ - pixel_y = 0; pixel_x = -5 }, /obj/item/stack/material/aluminium/full{ - pixel_y = 0; pixel_x = 8 }, /turf/simulated/floor/tiled, @@ -2261,9 +2243,7 @@ /turf/simulated/floor/tiled, /area/scc_event_shuttle) "HG" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4 - }, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/floor_decal/industrial/hatch_door/yellow, /turf/simulated/floor/tiled/full, /area/scc_event_shuttle) diff --git a/maps/helpers/event_shuttles/sccv_apollo_v2.dmm b/maps/helpers/event_shuttles/sccv_apollo_v2.dmm index 5fe9a04e965..6741c1d7c4d 100644 --- a/maps/helpers/event_shuttles/sccv_apollo_v2.dmm +++ b/maps/helpers/event_shuttles/sccv_apollo_v2.dmm @@ -727,11 +727,9 @@ name = "shelves" }, /obj/item/stack/material/lead/full{ - pixel_y = 0; pixel_x = -5 }, /obj/item/stack/material/aluminium/full{ - pixel_y = 0; pixel_x = 8 }, /turf/simulated/floor/tiled, @@ -1264,9 +1262,7 @@ /turf/simulated/floor/tiled, /area/scc_event_shuttle) "st" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4 - }, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/floor_decal/industrial/hatch_door/yellow, /turf/simulated/floor/tiled/full, /area/scc_event_shuttle) @@ -2080,35 +2076,27 @@ name = "shelves" }, /obj/item/stack/material/plasteel/full{ - pixel_y = 0; pixel_x = -6 }, /obj/item/stack/material/plasteel/full{ - pixel_y = 0; pixel_x = -6 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /turf/simulated/floor/tiled, @@ -2894,20 +2882,16 @@ pixel_y = 16 }, /obj/item/device/gps/medical{ - pixel_x = -7; - pixel_y = 0 + pixel_x = -7 }, /obj/item/device/gps/medical{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/item/device/gps/medical{ - pixel_x = -7; - pixel_y = 0 + pixel_x = -7 }, /obj/item/device/gps/medical{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/effect/floor_decal/spline/plain/green{ dir = 8 diff --git a/maps/helpers/event_shuttles/sccv_apollo_v3.dmm b/maps/helpers/event_shuttles/sccv_apollo_v3.dmm index 39aaacdc505..a23e1ce027e 100644 --- a/maps/helpers/event_shuttles/sccv_apollo_v3.dmm +++ b/maps/helpers/event_shuttles/sccv_apollo_v3.dmm @@ -265,35 +265,27 @@ name = "shelves" }, /obj/item/stack/material/plasteel/full{ - pixel_y = 0; pixel_x = -6 }, /obj/item/stack/material/plasteel/full{ - pixel_y = 0; pixel_x = -6 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /turf/simulated/floor/tiled, @@ -368,11 +360,9 @@ name = "shelves" }, /obj/item/stack/material/lead/full{ - pixel_y = 0; pixel_x = -5 }, /obj/item/stack/material/aluminium/full{ - pixel_y = 0; pixel_x = 8 }, /turf/simulated/floor/tiled, @@ -1606,9 +1596,7 @@ /turf/simulated/floor/tiled, /area/scc_event_shuttle) "zS" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4 - }, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/floor_decal/industrial/hatch_door/yellow, /turf/simulated/floor/tiled/full, /area/scc_event_shuttle) @@ -2700,20 +2688,16 @@ pixel_y = 16 }, /obj/item/device/gps/medical{ - pixel_x = -7; - pixel_y = 0 + pixel_x = -7 }, /obj/item/device/gps/medical{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/item/device/gps/medical{ - pixel_x = -7; - pixel_y = 0 + pixel_x = -7 }, /obj/item/device/gps/medical{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/effect/floor_decal/spline/plain/green{ dir = 8 diff --git a/maps/helpers/event_shuttles/sccv_artemis.dmm b/maps/helpers/event_shuttles/sccv_artemis.dmm index e29a9420ed5..1de6e3f0fd0 100644 --- a/maps/helpers/event_shuttles/sccv_artemis.dmm +++ b/maps/helpers/event_shuttles/sccv_artemis.dmm @@ -537,9 +537,7 @@ /turf/simulated/floor, /area/scc_event_shuttle) "js" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4 - }, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/floor_decal/industrial/hatch_door/yellow, /turf/simulated/floor/tiled/full, /area/scc_event_shuttle) @@ -1984,20 +1982,16 @@ pixel_y = 16 }, /obj/item/device/gps/medical{ - pixel_x = -7; - pixel_y = 0 + pixel_x = -7 }, /obj/item/device/gps/medical{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/item/device/gps/medical{ - pixel_x = -7; - pixel_y = 0 + pixel_x = -7 }, /obj/item/device/gps/medical{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/effect/floor_decal/spline/plain/green{ dir = 8 @@ -2192,43 +2186,33 @@ pixel_x = 6 }, /obj/item/device/radio/off{ - pixel_y = 0; pixel_x = -8 }, /obj/item/device/radio/off{ - pixel_y = 0; pixel_x = -8 }, /obj/item/device/radio/off{ - pixel_y = 0; pixel_x = -8 }, /obj/item/device/radio/off{ - pixel_y = 0; pixel_x = -8 }, /obj/item/device/radio/off{ - pixel_y = 0; pixel_x = -8 }, /obj/item/device/radio/off{ - pixel_y = 0; pixel_x = -8 }, /obj/item/device/radio/off{ - pixel_y = 0; pixel_x = -8 }, /obj/item/device/radio/off{ - pixel_y = 0; pixel_x = -8 }, /obj/item/device/radio/off{ - pixel_y = 0; pixel_x = -8 }, /obj/item/device/radio/off{ - pixel_y = 0; pixel_x = -8 }, /turf/simulated/floor/tiled/dark, @@ -3044,35 +3028,27 @@ name = "shelves" }, /obj/item/stack/material/plasteel/full{ - pixel_y = 0; pixel_x = -6 }, /obj/item/stack/material/plasteel/full{ - pixel_y = 0; pixel_x = -6 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /turf/simulated/floor/tiled/steel, @@ -3407,11 +3383,9 @@ name = "shelves" }, /obj/item/stack/material/lead/full{ - pixel_y = 0; pixel_x = -5 }, /obj/item/stack/material/aluminium/full{ - pixel_y = 0; pixel_x = 8 }, /turf/simulated/floor/tiled/steel, diff --git a/maps/helpers/event_shuttles/sccv_packrat.dmm b/maps/helpers/event_shuttles/sccv_packrat.dmm index c910450a8d8..5e48df9321a 100644 --- a/maps/helpers/event_shuttles/sccv_packrat.dmm +++ b/maps/helpers/event_shuttles/sccv_packrat.dmm @@ -499,9 +499,7 @@ /turf/simulated/floor/tiled, /area/scc_event_shuttle) "kL" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4 - }, +/obj/machinery/door/airlock/multi_tile/glass, /obj/effect/floor_decal/industrial/hatch_door/yellow, /turf/simulated/floor/tiled/full, /area/scc_event_shuttle) @@ -776,7 +774,6 @@ /area/scc_event_shuttle) "rU" = ( /obj/machinery/door/airlock/glass{ - dir = 2; name = "Cryogenic Storage" }, /turf/simulated/floor, @@ -2163,35 +2160,27 @@ name = "shelves" }, /obj/item/stack/material/plasteel/full{ - pixel_y = 0; pixel_x = -6 }, /obj/item/stack/material/plasteel/full{ - pixel_y = 0; pixel_x = -6 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/item/stack/material/cardboard/full{ - pixel_y = 0; pixel_x = 12 }, /obj/effect/floor_decal/industrial/outline/operations, @@ -2216,11 +2205,9 @@ name = "shelves" }, /obj/item/stack/material/lead/full{ - pixel_y = 0; pixel_x = -5 }, /obj/item/stack/material/aluminium/full{ - pixel_y = 0; pixel_x = 8 }, /obj/effect/floor_decal/industrial/outline/operations, diff --git a/maps/helpers/guidelines/guidelines_airlocks.dmm b/maps/helpers/guidelines/guidelines_airlocks.dmm index dd1476bb19a..6a4f89c95dc 100644 --- a/maps/helpers/guidelines/guidelines_airlocks.dmm +++ b/maps/helpers/guidelines/guidelines_airlocks.dmm @@ -1,12 +1,9 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aw" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = -28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock, @@ -24,9 +21,7 @@ /turf/template_noop, /area/template_noop) "cH" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, /area/template_noop) @@ -44,9 +39,7 @@ /turf/simulated/floor/plating, /area/template_noop) "dk" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock, /turf/simulated/floor/plating, @@ -75,7 +68,6 @@ pixel_x = 6 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -90,7 +82,6 @@ pixel_x = 20 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -121,9 +112,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock, /obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/plating, @@ -156,7 +145,6 @@ dir = 1 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -28 }, @@ -186,9 +174,7 @@ /area/template_noop) "kg" = ( /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock, /turf/simulated/floor/plating, /area/template_noop) @@ -230,7 +216,6 @@ pixel_x = 6 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -246,7 +231,6 @@ pixel_x = 20 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -268,7 +252,6 @@ "nz" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 8; - pixel_y = 0; pixel_x = 20 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ @@ -276,12 +259,10 @@ pixel_y = -20 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 4; - pixel_y = 0; pixel_x = -20 }, /obj/effect/map_effect/marker/airlock, @@ -301,9 +282,7 @@ /turf/simulated/floor/plating, /area/template_noop) "oG" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock, @@ -313,9 +292,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock, /obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, @@ -353,12 +330,10 @@ pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -384,7 +359,6 @@ dir = 4 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28 }, /obj/effect/map_effect/marker/airlock, @@ -396,7 +370,6 @@ }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 8; - pixel_y = 0; pixel_x = 20 }, /obj/effect/map_effect/marker/airlock, @@ -414,9 +387,7 @@ /turf/simulated/floor/tiled/dark/full, /area/template_noop) "sh" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = -28; pixel_y = 12; @@ -435,7 +406,6 @@ "sx" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 8; - pixel_y = 0; pixel_x = 20 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ @@ -443,12 +413,10 @@ pixel_y = -20 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 4; - pixel_y = 0; pixel_x = -20 }, /obj/effect/map_effect/marker/airlock/docking, @@ -457,7 +425,6 @@ "sN" = ( /obj/machinery/access_button{ pixel_x = 24; - pixel_y = 0; dir = 8 }, /turf/simulated/floor/airless, @@ -486,7 +453,6 @@ "vo" = ( /obj/machinery/access_button{ pixel_x = 24; - pixel_y = 0; dir = 8 }, /obj/effect/map_effect/marker/airlock, @@ -499,9 +465,7 @@ /turf/simulated/floor/tiled/dark/full, /area/template_noop) "wa" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/plating, @@ -510,9 +474,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 4 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock, /obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/plating, @@ -550,13 +512,10 @@ /turf/simulated/floor/tiled/dark/full, /area/template_noop) "xX" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock, @@ -582,7 +541,6 @@ pixel_x = 6 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -597,7 +555,6 @@ pixel_x = 20 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28; pixel_x = -6 }, @@ -621,17 +578,13 @@ /area/template_noop) "Bl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock, /turf/simulated/floor/plating, /area/template_noop) "Bt" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/map_effect/marker/airlock, /turf/simulated/floor/plating, @@ -654,12 +607,10 @@ }, /obj/effect/map_effect/marker/airlock, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28; pixel_x = 6 }, @@ -710,13 +661,10 @@ /turf/simulated/floor/plating, /area/template_noop) "Ht" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/effect/map_effect/marker/airlock, /turf/simulated/floor/plating, @@ -736,7 +684,6 @@ "Ij" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 4; - pixel_y = 0; pixel_x = -20 }, /obj/effect/map_effect/marker/airlock, @@ -761,9 +708,7 @@ /turf/template_noop, /area/template_noop) "KX" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock, /turf/simulated/floor/plating, /area/template_noop) @@ -778,9 +723,7 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/template_noop) "LF" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /turf/template_noop, /area/template_noop) "LJ" = ( @@ -803,9 +746,7 @@ /turf/simulated/floor/plating, /area/template_noop) "Nr" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, /turf/template_noop, /area/template_noop) "Nt" = ( @@ -813,7 +754,6 @@ dir = 4 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28 }, /obj/effect/map_effect/marker/airlock, @@ -822,9 +762,7 @@ /area/template_noop) "NH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 28; pixel_y = 12; @@ -845,8 +783,7 @@ "Pe" = ( /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ - pixel_y = 28; - dir = 2 + pixel_y = 28 }, /obj/effect/map_effect/marker/airlock, /turf/simulated/floor/tiled/dark/full, @@ -886,9 +823,7 @@ /turf/simulated/floor/plating, /area/template_noop) "Qu" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock, @@ -900,7 +835,6 @@ "QL" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 8; - pixel_y = 0; pixel_x = 20 }, /obj/effect/map_effect/marker/airlock, @@ -918,13 +852,10 @@ /turf/simulated/floor/airless, /area/template_noop) "Rh" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock, @@ -934,12 +865,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/effect/map_effect/marker/airlock, /obj/effect/map_effect/marker_helper/airlock/exterior, @@ -972,7 +900,6 @@ "SH" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 8; - pixel_y = 0; pixel_x = 20 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ @@ -1018,7 +945,6 @@ }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 8; - pixel_y = 0; pixel_x = 20 }, /obj/effect/map_effect/marker/airlock, @@ -1040,7 +966,6 @@ "VO" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 8; - pixel_y = 0; pixel_x = 20 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ @@ -1048,25 +973,20 @@ pixel_y = -20 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 2; pixel_y = 28 }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 4; - pixel_y = 0; pixel_x = -20 }, /obj/effect/map_effect/marker/airlock/shuttle, /turf/template_noop, /area/template_noop) "Wc" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, @@ -1093,8 +1013,7 @@ dir = 8 }, /obj/machinery/access_button{ - pixel_x = -28; - dir = 2 + pixel_x = -28 }, /obj/machinery/access_button{ pixel_x = -12; @@ -1107,8 +1026,7 @@ dir = 1 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 + pixel_x = 28 }, /obj/machinery/access_button{ pixel_x = 20; @@ -1142,20 +1060,16 @@ }, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /obj/machinery/access_button{ pixel_x = -28; - pixel_y = 32; - dir = 2 + pixel_y = 32 }, /turf/template_noop, /area/template_noop) "Wz" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = -28; pixel_y = 12; @@ -1180,9 +1094,7 @@ /turf/template_noop, /area/template_noop) "Xv" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -1214,9 +1126,7 @@ /turf/template_noop, /area/template_noop) "Yf" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = -28; pixel_y = 12; @@ -1240,7 +1150,6 @@ dir = 8 }, /obj/machinery/airlock_sensor{ - dir = 2; pixel_y = 28 }, /turf/template_noop, @@ -1267,9 +1176,7 @@ /turf/simulated/floor/airless, /area/template_noop) "YW" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = -28; pixel_y = 12; @@ -1283,9 +1190,7 @@ /turf/space, /area/template_noop) "ZE" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock, /turf/simulated/floor/plating, diff --git a/maps/helpers/guidelines/guidelines_docks.dmm b/maps/helpers/guidelines/guidelines_docks.dmm index fb422ebb0e6..a8c557bbdbf 100644 --- a/maps/helpers/guidelines/guidelines_docks.dmm +++ b/maps/helpers/guidelines/guidelines_docks.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "cB" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/shuttle_landmark{ dir = 1 }, @@ -43,9 +41,7 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/template_noop) "lO" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/map_helper/mark_good, /turf/simulated/floor/plating, /area/template_noop) @@ -53,16 +49,12 @@ /turf/simulated/wall, /area/template_noop) "pS" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/map_helper/mark_bad, /turf/simulated/floor/plating, /area/template_noop) "qS" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plating, /area/template_noop) "sX" = ( @@ -87,9 +79,7 @@ /turf/simulated/floor/plating, /area/template_noop) "AE" = ( -/obj/effect/shuttle_landmark{ - dir = 2 - }, +/obj/effect/shuttle_landmark, /turf/template_noop, /area/template_noop) "AS" = ( @@ -117,9 +107,7 @@ /turf/simulated/floor/plating, /area/template_noop) "KX" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/template_noop) "Lt" = ( @@ -132,12 +120,8 @@ /turf/simulated/floor/plating, /area/template_noop) "Nh" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, -/obj/effect/shuttle_landmark{ - dir = 2 - }, +/obj/machinery/door/airlock/external, +/obj/effect/shuttle_landmark, /turf/simulated/floor/plating, /area/template_noop) "Qa" = ( @@ -159,9 +143,7 @@ /turf/simulated/floor/plating, /area/template_noop) "Zz" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/map_helper/mark_acceptable, /turf/simulated/floor/plating, /area/template_noop) diff --git a/maps/helpers/guidelines/guidelines_shuttles.dmm b/maps/helpers/guidelines/guidelines_shuttles.dmm index 317c3483db0..8fc43165e37 100644 --- a/maps/helpers/guidelines/guidelines_shuttles.dmm +++ b/maps/helpers/guidelines/guidelines_shuttles.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "bn" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/engine, /turf/simulated/floor/tiled/dark/full, /area/template_noop) "dA" = ( @@ -60,9 +58,7 @@ /turf/simulated/floor/tiled/dark/full, /area/template_noop) "qD" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/engine, /turf/template_noop, /area/template_noop) "sw" = ( @@ -123,9 +119,7 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/template_noop) "KX" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/template_noop) "Lt" = ( @@ -145,9 +139,7 @@ /turf/simulated/floor/plating, /area/template_noop) "ZA" = ( -/obj/effect/shuttle_landmark{ - dir = 2 - }, +/obj/effect/shuttle_landmark, /turf/template_noop, /area/template_noop) diff --git a/maps/helpers/guidelines/guidelines_wiring.dmm b/maps/helpers/guidelines/guidelines_wiring.dmm index 5f55d9d1039..a32b1cbd3e7 100644 --- a/maps/helpers/guidelines/guidelines_wiring.dmm +++ b/maps/helpers/guidelines/guidelines_wiring.dmm @@ -204,9 +204,7 @@ /turf/simulated/floor/tiled/steel, /area/template_noop) "jx" = ( -/obj/structure/cable/green{ - icon_state = "0-1" - }, +/obj/structure/cable/green, /obj/machinery/power/apc/low/west, /obj/structure/cable/green{ icon_state = "1-4" @@ -996,9 +994,7 @@ /area/template_noop) "PU" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, -/obj/structure/cable/green{ - icon_state = "0-1" - }, +/obj/structure/cable/green, /turf/simulated/floor/tiled/dark/full, /area/template_noop) "Qf" = ( diff --git a/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm b/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm index 4f457ffdf79..eaaa4ffcd36 100644 --- a/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm +++ b/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm @@ -709,8 +709,7 @@ pixel_y = 14 }, /obj/item/material/ashtray/bronze{ - pixel_x = 3; - pixel_y = 0 + pixel_x = 3 }, /turf/simulated/floor/marble/dark, /area/space) @@ -1382,12 +1381,10 @@ pixel_x = -7 }, /obj/item/reagent_containers/glass/bottle/syrup/pumpkin{ - pixel_x = 1; - pixel_y = 0 + pixel_x = 1 }, /obj/item/reagent_containers/glass/bottle/syrup/vanilla{ - pixel_x = 9; - pixel_y = 0 + pixel_x = 9 }, /obj/item/reagent_containers/food/drinks/shaker{ pixel_x = -3; diff --git a/maps/helpers/pre_fabricated/massfab_medical.dmm b/maps/helpers/pre_fabricated/massfab_medical.dmm index 0d6335bc166..8553c98ef65 100644 --- a/maps/helpers/pre_fabricated/massfab_medical.dmm +++ b/maps/helpers/pre_fabricated/massfab_medical.dmm @@ -474,8 +474,7 @@ pixel_y = 6 }, /obj/item/storage/toolbox/mechanical{ - pixel_x = 2; - pixel_y = 0 + pixel_x = 2 }, /turf/simulated/floor/tiled/white, /area/space) @@ -2515,8 +2514,7 @@ }, /obj/structure/sink{ dir = 8; - pixel_x = -12; - pixel_y = 0 + pixel_x = -12 }, /obj/structure/mirror{ pixel_x = -28 @@ -2684,8 +2682,7 @@ pixel_y = 6 }, /obj/item/storage/toolbox/mechanical{ - pixel_x = 2; - pixel_y = 0 + pixel_x = 2 }, /turf/simulated/floor/tiled/white, /area/space) diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm index 547d2b6c2ab..eab9c24e7ed 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm @@ -813,9 +813,7 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) "TJ" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/reagent_containers/food/snacks/meat/adhomai, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm index 96427e9dbaa..16bf846618d 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm @@ -1151,8 +1151,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/sign/flag/pra/large/north{ pixel_y = 32 diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm index fc343f5f07a..66c63455d8e 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm @@ -169,8 +169,7 @@ /area/adhomai_silo/cabin) "C" = ( /obj/structure/window/reinforced{ - dir = 1; - icon_state = "rwindow" + dir = 1 }, /obj/structure/table/steel, /obj/item/handcuffs, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm index 2fb0e440e90..ffbe6b31aff 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm @@ -750,9 +750,7 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_village) "Pc" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/storage/box/produce{ pixel_x = 3; pixel_y = -11 diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm index bdde7092be7..fd1dd0c79cb 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm @@ -32,9 +32,7 @@ /turf/simulated/floor/concrete/square, /area/exoplanet/adhomai) "u" = ( -/obj/structure/sign/adhomai_memorial{ - pixel_y = 0 - }, +/obj/structure/sign/adhomai_memorial, /turf/simulated/floor/concrete/square, /area/exoplanet/adhomai) "w" = ( diff --git a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm index b4bc4c66ee0..3ae16ae2a99 100644 --- a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm +++ b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm @@ -16,8 +16,7 @@ "av" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -382,8 +381,7 @@ /area/space) "fa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -734,8 +732,7 @@ /area/abandoned_prison/wardenoffice) "ks" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6; - icon_state = "spline_fancy" + dir = 6 }, /obj/structure/table/wood, /obj/item/toy/desk/officetoy, @@ -814,8 +811,7 @@ }, /obj/random/junk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -1009,8 +1005,7 @@ "ni" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, @@ -1066,9 +1061,7 @@ pixel_y = 8; pixel_x = -28 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/abandoned_prison/eva_prep) "og" = ( @@ -1507,8 +1500,7 @@ /area/space) "sU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1532,13 +1524,10 @@ }, /area/abandoned_prison/exterior) "sZ" = ( -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock{ @@ -2336,8 +2325,7 @@ /obj/machinery/power/apc/south, /obj/structure/cable/green, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 10; - icon_state = "spline_fancy" + dir = 10 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/walnut, @@ -2435,8 +2423,7 @@ /area/abandoned_prison/eva_prep) "Gx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -2861,13 +2848,6 @@ /obj/structure/sign/securearea, /turf/simulated/floor/airless, /area/abandoned_prison/exterior) -"LK" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" - }, -/turf/simulated/floor/airless, -/area/abandoned_prison/exterior) "LL" = ( /obj/effect/decal/fake_object{ icon_state = "processor"; @@ -3224,9 +3204,7 @@ /area/space) "RM" = ( /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock{ name = "airlock_prison_base"; master_tag = "airlock_prison_base" @@ -3254,8 +3232,7 @@ /area/abandoned_prison/eva_prep) "Sf" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/effect/floor_decal/corner_wide/black/diagonal, /obj/structure/cable/green{ @@ -3372,8 +3349,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - icon_state = "map-supply" + dir = 1 }, /obj/structure/cable/green{ icon_state = "2-4" @@ -3480,9 +3456,7 @@ name = "airlock_prison_base"; master_tag = "airlock_prison_base" }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/abandoned_prison/eva_prep) "Xh" = ( @@ -3565,7 +3539,6 @@ }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 8; - pixel_y = 0; pixel_x = 20 }, /obj/effect/decal/cleanable/dirt, @@ -5603,7 +5576,7 @@ Sg Sg Sg Sg -LK +Vt KY Zg hH diff --git a/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm b/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm index 2d35fa07b5f..1e7e9218822 100644 --- a/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm +++ b/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm @@ -78,9 +78,7 @@ /turf/simulated/wall/r_wall, /area/coalition_base/kitchen) "bU" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/reagent_containers/food/condiment/flour, /obj/effect/floor_decal/corner/brown/diagonal, /obj/item/reagent_containers/food/drinks/carton/milk, @@ -731,8 +729,7 @@ dir = 6 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/machinery/power/apc/north, /obj/structure/cable/green{ @@ -1231,8 +1228,7 @@ }, /obj/effect/floor_decal/corner/brown/diagonal, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/coalition_base/kitchen) @@ -1649,9 +1645,7 @@ "IC" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 27 diff --git a/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm b/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm index 3f50c9442fe..bf1be7cb530 100644 --- a/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm @@ -335,8 +335,7 @@ name = "dilapitated cryogenic freezer"; pixel_x = 1 }, -/obj/effect/decal/cleanable/dirt{ - }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/airless, /area/template_noop) "hg" = ( @@ -399,8 +398,7 @@ /obj/structure/closet/walllocker/medical/secure{ name = "blood closet"; pixel_y = 32; - req_access = null; - store_mobs = 0 + req_access = null }, /obj/item/reagent_containers/blood/OMinus, /obj/effect/floor_decal/corner/green/diagonal, @@ -1378,8 +1376,7 @@ name = "dilapitated cryogenic freezer"; pixel_x = 1 }, -/obj/effect/decal/cleanable/dirt{ - }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/airless, /area/template_noop) "DE" = ( @@ -1597,7 +1594,6 @@ /area/template_noop) "Iv" = ( /obj/machinery/door/airlock/external{ - electrified_until = 0; dir = 4 }, /obj/effect/decal/cleanable/dirt, diff --git a/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_unique.dmm b/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_unique.dmm index 396bddea857..63d711b5354 100644 --- a/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_unique.dmm @@ -106,8 +106,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -698,8 +697,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -920,8 +918,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -1496,8 +1493,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 diff --git a/maps/random_ruins/exoplanets/asteroid/satellite_crash/satellite_crash_unique.dmm b/maps/random_ruins/exoplanets/asteroid/satellite_crash/satellite_crash_unique.dmm index f3455d8d348..ff98b8070cb 100644 --- a/maps/random_ruins/exoplanets/asteroid/satellite_crash/satellite_crash_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/satellite_crash/satellite_crash_unique.dmm @@ -40,8 +40,7 @@ /area/dungeon/crashed_satellite) "i" = ( /obj/effect/decal/cleanable/liquid_fuel, -/obj/structure/computerframe{ - }, +/obj/structure/computerframe, /obj/item/device/gps, /obj/item/material/shard, /turf/simulated/floor/airless, diff --git a/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm b/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm index 119b193eb01..ec0763ab675 100644 --- a/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm @@ -6,19 +6,10 @@ "ab" = ( /obj/structure/window/shuttle/skrell, /obj/structure/grille/diagonal{ - icon_state = "grille_diagonal"; dir = 8 }, /turf/template_noop, /area/template_noop) -"ac" = ( -/obj/machinery/door/airlock/external{ - icon_state = "door_locked"; - locked = 1; - dir = 4 - }, -/turf/simulated/floor/shuttle/advanced, -/area/template_noop) "ad" = ( /obj/structure/window/shuttle/skrell, /obj/structure/grille, @@ -41,7 +32,6 @@ /area/template_noop) "ah" = ( /obj/structure/bed/stool/chair/office/hover{ - icon_state = "hover_chair"; dir = 1 }, /turf/simulated/floor/shuttle/skrell/blue/airless, @@ -77,7 +67,6 @@ "an" = ( /obj/structure/window/shuttle/skrell, /obj/structure/grille/diagonal{ - icon_state = "grille_diagonal"; dir = 4 }, /turf/simulated/floor/shuttle/skrell/blue/airless, @@ -120,7 +109,6 @@ /area/template_noop) "av" = ( /obj/structure/bed/stool/chair/office/hover/command{ - icon_state = "hover_command"; dir = 1 }, /turf/simulated/floor/shuttle/skrell/airless, @@ -179,7 +167,6 @@ /area/template_noop) "aF" = ( /obj/machinery/body_scanconsole{ - icon_state = "body_scannerconsole"; dir = 1 }, /obj/effect/floor_decal/industrial/warning, @@ -354,8 +341,7 @@ /obj/item/storage/box/gloves, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning{ - icon_state = "loadingarea"; - dir = 2 + icon_state = "loadingarea" }, /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -662,7 +648,6 @@ /area/template_noop) "cm" = ( /obj/structure/cryofeed{ - icon_state = "cryo_rear"; dir = 2 }, /obj/machinery/light/skrell{ @@ -736,14 +721,10 @@ "cy" = ( /obj/structure/window/shuttle/skrell, /obj/structure/grille/diagonal{ - icon_state = "grille_diagonal"; dir = 1 }, /turf/template_noop, /area/template_noop) -"cz" = ( -/turf/simulated/wall/shuttle/skrell, -/area/template_noop) "cA" = ( /obj/effect/landmark/clear, /obj/effect/landmark/clear, @@ -758,14 +739,6 @@ /obj/item/clothing/under/gearharness, /turf/simulated/floor/shuttle/skrell, /area/template_noop) -"cD" = ( -/obj/machinery/door/airlock/external{ - icon_state = "door_locked"; - locked = 1; - dir = 4 - }, -/turf/simulated/floor/shuttle/advanced, -/area/template_noop) "cH" = ( /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/shuttle/advanced, @@ -811,7 +784,7 @@ /obj/item/stack/material/plasteel, /obj/item/powerdrill, /obj/item/landmine/frag{ - deployed = 1; + deployed = 1 }, /turf/simulated/floor/shuttle/advanced, /area/template_noop) @@ -891,7 +864,7 @@ aq aq ap ad -cD +bx ad ap aa @@ -959,7 +932,7 @@ ap ap ap aS -ac +bx ad ap ap @@ -1058,8 +1031,8 @@ ad ap aK aK -cz -cz +ap +ap bw ap ap @@ -1092,7 +1065,7 @@ bz ap bV aH -cz +ap aN aC aZ @@ -1164,8 +1137,8 @@ ap aP aG bp -cz -cz +ap +ap al al ct @@ -1300,8 +1273,8 @@ ap by aC cB -cz -cz +ap +ap cp al cs @@ -1364,7 +1337,7 @@ Dz ap bV aH -cz +ap bv aC aZ @@ -1398,8 +1371,8 @@ ad ap aH aK -cz -cz +ap +ap bw ap ap @@ -1571,7 +1544,7 @@ aq aq ap ad -cD +bx ad ap aa diff --git a/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm b/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm index 3ec35b54020..42c3684ba04 100644 --- a/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm +++ b/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm @@ -43,8 +43,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10; - pixel_y = 0 + dir = 10 }, /obj/structure/lattice/catwalk/indoor/grate/old, /obj/effect/decal/cleanable/blood/gibs/limb, @@ -222,8 +221,7 @@ /area/template_noop) "hv" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/exoplanet/tiled, /area/template_noop) @@ -274,8 +272,7 @@ "iL" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled, @@ -1392,8 +1389,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - pixel_y = 0 + dir = 5 }, /obj/structure/lattice/catwalk/indoor/grate/old, /obj/random/dirt_75, @@ -1692,8 +1688,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/lattice/catwalk/indoor/grate/old, /turf/simulated/floor/exoplanet/plating, diff --git a/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm b/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm index 85d583fc087..85fc6047bdc 100644 --- a/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm +++ b/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm @@ -916,8 +916,7 @@ /area/burzsia_mining/mining) "zB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6; - pixel_y = 0 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -1672,8 +1671,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/burzsia_mining/foreman) @@ -1704,8 +1702,7 @@ /obj/item/ore_detector, /obj/item/device/flashlight/lantern, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /obj/item/device/radio, /obj/item/stack/flag/yellow, diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm index 46cfdbb79de..d4c2e5b68ef 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm @@ -378,9 +378,7 @@ /turf/simulated/floor/sidewalk/dark/grid, /area/konyang/robotics_factory) "tU" = ( -/obj/structure/window/reinforced{ - dir = 2 - }, +/obj/structure/window/reinforced, /turf/simulated/floor/sidewalk/dark, /area/konyang/robotics_factory) "uk" = ( @@ -604,9 +602,7 @@ /turf/simulated/floor/foundation, /area/konyang/robotics_factory) "Go" = ( -/obj/structure/window/reinforced{ - dir = 2 - }, +/obj/structure/window/reinforced, /turf/simulated/floor/foundation, /area/konyang/robotics_factory) "GU" = ( diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm index ef4f8d55fc4..87e639e2be7 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm @@ -54,8 +54,7 @@ /turf/simulated/floor/exoplanet/sidewalk/paved, /area/exoplanet/grass/konyang) "dj" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, +/obj/structure/lattice/catwalk/indoor/planks/deep, /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) "ek" = ( @@ -80,8 +79,7 @@ /turf/simulated/floor/exoplanet/sidewalk/paved, /area/exoplanet/grass/konyang) "fb" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, +/obj/structure/lattice/catwalk/indoor/planks/deep, /obj/structure/table/wood, /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) @@ -151,20 +149,13 @@ /obj/structure/ledge/quarter, /turf/simulated/floor/exoplanet/sidewalk/blocks, /area/exoplanet/grass/konyang) -"jA" = ( -/obj/structure/window/urban{ - dir = 8; - }, -/turf/simulated/floor/exoplanet/sidewalk/dark, -/area/konyang/house_small) "jB" = ( /obj/item/mop, /obj/item/device/flashlight/empty, /turf/simulated/floor/exoplanet/sidewalk/dark, /area/konyang/house_small) "jL" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, +/obj/structure/lattice/catwalk/indoor/planks/deep, /obj/random/dirt_75, /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) @@ -185,8 +176,7 @@ /turf/simulated/floor/exoplanet/foundation, /area/konyang/house_small) "kf" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, +/obj/structure/lattice/catwalk/indoor/planks/deep, /obj/machinery/door/urban{ dir = 4 }, @@ -331,19 +321,12 @@ }, /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) -"re" = ( -/obj/structure/window/urban{ - dir = 4; - }, -/turf/simulated/floor/exoplanet/sidewalk/dark, -/area/konyang/house_small) "rh" = ( /obj/random/junk, /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) "rl" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, +/obj/structure/lattice/catwalk/indoor/planks/deep, /obj/structure/curtain/black, /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) @@ -387,7 +370,7 @@ "um" = ( /obj/random/dirt_75, /obj/structure/table/rack/clothing{ - dir = 4; + dir = 4 }, /turf/simulated/floor/exoplanet/sidewalk/dark, /area/konyang/house_small) @@ -508,10 +491,9 @@ /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/exoplanet/grass/konyang) "yn" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, +/obj/structure/lattice/catwalk/indoor/planks/deep, /obj/structure/window/urban{ - dir = 4; + dir = 4 }, /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) @@ -532,14 +514,6 @@ /obj/random/dirt_75, /turf/simulated/floor/exoplanet/tiled/white, /area/konyang/house_small) -"BH" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, -/obj/structure/window/urban{ - dir = 4 - }, -/turf/simulated/floor/exoplanet/wood/bamboo, -/area/konyang/house_small) "BP" = ( /obj/structure/table/standard, /obj/item/tape_roll, @@ -561,8 +535,7 @@ /turf/simulated/floor/exoplanet/asphalt, /area/exoplanet/grass/konyang) "EF" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, +/obj/structure/lattice/catwalk/indoor/planks/deep, /obj/structure/bed/stool/padded/red{ dir = 8 }, @@ -621,8 +594,7 @@ /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) "HQ" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, +/obj/structure/lattice/catwalk/indoor/planks/deep, /obj/structure/bed/stool/padded/red{ dir = 1 }, @@ -654,8 +626,7 @@ /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) "Ix" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, +/obj/structure/lattice/catwalk/indoor/planks/deep, /obj/structure/window/urban, /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) @@ -675,8 +646,7 @@ /turf/simulated/floor/exoplanet/sidewalk/blocks, /area/exoplanet/grass/konyang) "IS" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, +/obj/structure/lattice/catwalk/indoor/planks/deep, /obj/structure/bed/stool/padded/red, /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) @@ -703,8 +673,7 @@ /turf/simulated/floor/exoplanet/sidewalk/paved, /area/exoplanet/grass/konyang) "Kc" = ( -/obj/structure/lattice/catwalk/indoor/planks/deep{ - }, +/obj/structure/lattice/catwalk/indoor/planks/deep, /obj/structure/bed/stool/padded/red{ dir = 4 }, @@ -1027,13 +996,13 @@ vQ jm xY xY -BH +yn yn xY cq -re +cq xY -BH +yn yn xY xY @@ -1357,7 +1326,7 @@ xY xo xY ep -jA +ep xY kr lT diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm index b02fa8289a1..03b00814922 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm @@ -274,13 +274,6 @@ /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/konyang_landing_zone/command_center_abandoned/greenhouse) -"dJ" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, -/obj/structure/chainlink_fence, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang_landing_zone) "dK" = ( /turf/simulated/floor/concrete, /area/konyang_landing_zone) @@ -461,10 +454,6 @@ }, /turf/simulated/floor/tiled/white, /area/konyang_landing_zone/command_center_abandoned/greenhouse) -"gk" = ( -/obj/structure/chainlink_fence, -/turf/simulated/floor/concrete, -/area/konyang_landing_zone) "gm" = ( /obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/exoplanet/konyang/no_edge, @@ -2821,10 +2810,6 @@ }, /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center_abandoned/landing_pads) -"Is" = ( -/obj/structure/chainlink_fence, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/konyang_landing_zone) "Iv" = ( /obj/structure/chainlink_fence{ dir = 4 @@ -3481,7 +3466,6 @@ "PZ" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 1; - frequency = 1441; id_tag = "lz_air_out" }, /turf/simulated/floor/reinforced/airmix, @@ -3621,10 +3605,6 @@ }, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center_abandoned) -"Rs" = ( -/obj/structure/chainlink_fence, -/turf/simulated/floor/exoplanet/konyang, -/area/konyang_landing_zone) "RD" = ( /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, @@ -3778,7 +3758,6 @@ /area/konyang_landing_zone/command_center_abandoned/greenhouse) "Tm" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "lz_co2_out"; dir = 1 }, @@ -4930,7 +4909,7 @@ dK dK dK dK -gk +Wa BF YV YV @@ -5595,7 +5574,7 @@ Da gu Sk dK -gk +Wa jU zh uc @@ -5652,7 +5631,7 @@ YH gu NB Zi -gk +Wa Po zh uc @@ -5709,7 +5688,7 @@ gu gu HR Zi -gk +Wa Po zh uc @@ -5766,7 +5745,7 @@ gu yi dH Zi -gk +Wa Po zh uc @@ -5808,7 +5787,7 @@ BF Kl Kl yd -Rs +eU rf "} (29,1,1) = {" @@ -5823,7 +5802,7 @@ gu kO jR Zi -gk +Wa jU zh uc @@ -5865,7 +5844,7 @@ bX Kl gm YV -Is +Ey rf "} (30,1,1) = {" @@ -5979,7 +5958,7 @@ BF YV YV YV -Is +Ey dt "} (32,1,1) = {" @@ -6036,7 +6015,7 @@ UH YV yd rf -Is +Ey rf "} (33,1,1) = {" @@ -6150,7 +6129,7 @@ IO YV YV YV -Rs +eU rf "} (35,1,1) = {" @@ -6165,7 +6144,7 @@ ib oq YY Zi -gk +Wa jU zh uc @@ -6207,7 +6186,7 @@ IO rf rf rf -Rs +eU rf "} (36,1,1) = {" @@ -6222,7 +6201,7 @@ oq oq fg Zi -gk +Wa Po zh uc @@ -6264,7 +6243,7 @@ IO sS Aj rf -Rs +eU rf "} (37,1,1) = {" @@ -6279,7 +6258,7 @@ pD oq Ny Zi -gk +Wa Po zh uc @@ -6336,7 +6315,7 @@ TO VV Ny Zi -gk +Wa Po zh uc @@ -6393,7 +6372,7 @@ TO oq oq ld -gk +Wa Po zh uc @@ -6450,7 +6429,7 @@ jS SL Ca Zi -gk +Wa Po zh uc @@ -6507,7 +6486,7 @@ Hk zR Ca Zi -gk +Wa jU zh Br @@ -6735,7 +6714,7 @@ TD TD TD Zi -gk +Wa AD Ly Ly @@ -6923,7 +6902,7 @@ ym YV YV YV -Rs +eU Ep jn zh @@ -6980,7 +6959,7 @@ rf rf rf YV -Rs +eU Ep jn zh @@ -7037,7 +7016,7 @@ Mv rf Mv YV -Rs +eU PJ GG fi @@ -7094,7 +7073,7 @@ Mv rf Mv YV -Rs +eU qa oJ zh @@ -7151,7 +7130,7 @@ Mv rf Mv YV -Rs +eU qa Bq zh @@ -7208,7 +7187,7 @@ Mv rf Mv YV -Rs +eU qa FA zh @@ -7265,7 +7244,7 @@ YV Mw YV WK -Rs +eU zC Nk Uz @@ -7322,7 +7301,7 @@ Fz dO cG dO -dJ +OR ZU GK ef diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm index 1c350de7e52..b1b7147cb1a 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm @@ -118,7 +118,6 @@ "pV" = ( /obj/machinery/light{ dir = 8; - pixel_y = 0; pixel_x = -4 }, /turf/simulated/floor/tiled/white, @@ -170,9 +169,7 @@ /obj/effect/floor_decal/corner/green/diagonal{ dir = 4 }, -/obj/machinery/light{ - pixel_y = 0 - }, +/obj/machinery/light, /turf/simulated/floor/tiled/white, /area/konyang/rural_clinic) "vO" = ( @@ -190,9 +187,7 @@ pixel_y = 9; pixel_x = -5 }, -/obj/item/storage/pill_bottle/inaprovaline{ - pixel_y = 0 - }, +/obj/item/storage/pill_bottle/inaprovaline, /obj/item/storage/pill_bottle/inaprovaline{ pixel_y = -5; pixel_x = 8 @@ -213,7 +208,6 @@ pixel_y = -4 }, /obj/item/stack/nanopaste{ - pixel_y = 0; pixel_x = 10 }, /obj/item/stack/nanopaste{ @@ -317,7 +311,6 @@ pixel_y = 9 }, /obj/item/stack/medical/advanced/bruise_pack/full{ - pixel_y = 0; pixel_x = 6 }, /turf/simulated/floor/tiled/white, diff --git a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm index 81195d75fae..6681ea8ff1f 100644 --- a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm @@ -3396,7 +3396,6 @@ "PZ" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 1; - frequency = 1441; id_tag = "lz_air_out" }, /turf/simulated/floor/reinforced/airmix, @@ -3682,7 +3681,6 @@ /area/konyang_landing_zone/command_center/greenhouse) "Tm" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "lz_co2_out"; dir = 1 }, @@ -3904,10 +3902,6 @@ /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center/living) -"Wa" = ( -/obj/structure/chainlink_fence, -/turf/simulated/floor/concrete, -/area/konyang_landing_zone) "WB" = ( /obj/structure/lattice/catwalk/indoor/urban, /obj/structure/railing/mapped{ @@ -5339,7 +5333,7 @@ zh zh Rh dK -Wa +gk xT PD dK @@ -5396,7 +5390,7 @@ zh qc Rh dK -Wa +gk jr zA dK @@ -5453,7 +5447,7 @@ zh zh UB dK -Wa +gk jr zA dK @@ -5510,7 +5504,7 @@ zh zh Rh dK -Wa +gk jr zA dK @@ -5567,7 +5561,7 @@ zh zh Rh dK -Wa +gk jr MK dK @@ -5624,7 +5618,7 @@ zh zh Rh dK -Wa +gk jr zA dK @@ -5681,7 +5675,7 @@ zh zh UB dK -Wa +gk jr Ql dK @@ -5738,7 +5732,7 @@ zh zh Rh dK -Wa +gk jr Ql dK @@ -5795,7 +5789,7 @@ zh zh Rh dK -Wa +gk jr Ql dK @@ -5852,7 +5846,7 @@ zh zh Rh dK -Wa +gk jr zA dK @@ -5909,7 +5903,7 @@ zh zh Rh dK -Wa +gk Oe zA dK @@ -5966,7 +5960,7 @@ zh zh Rh dK -Wa +gk Oe zA dK @@ -6023,7 +6017,7 @@ zh zh Rh dK -Wa +gk Oe zA dK @@ -6080,7 +6074,7 @@ zh zh Rh dK -Wa +gk jr zA dK @@ -6137,7 +6131,7 @@ zh zh wj dK -Wa +gk jr zA dK @@ -6194,7 +6188,7 @@ zh zh Rh dK -Wa +gk jr zA dK @@ -6251,7 +6245,7 @@ zh zh Rh dK -Wa +gk jr zA dK @@ -6308,7 +6302,7 @@ zh qc Rh dK -Wa +gk jr zA dK @@ -6365,7 +6359,7 @@ zh zh wj dK -Wa +gk jr MK Mf @@ -6422,7 +6416,7 @@ zh zh Rh dK -Wa +gk jr Az mi @@ -6479,7 +6473,7 @@ zh zh Rh dK -Wa +gk jr ND KV @@ -6536,7 +6530,7 @@ cw Ly tc dK -Wa +gk jr ND KV @@ -6593,7 +6587,7 @@ gB gB gB dK -Wa +gk jr KV KV diff --git a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm index 32a66bd951a..1bdee84effe 100644 --- a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm @@ -289,10 +289,6 @@ "de" = ( /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center) -"dg" = ( -/obj/structure/railing/mapped, -/turf/simulated/floor/asphalt, -/area/konyang_landing_zone) "di" = ( /turf/simulated/wall, /area/konyang_landing_zone/command_center/living) @@ -1837,7 +1833,6 @@ /area/konyang_landing_zone/command_center/living) "yJ" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - frequency = 1441; id_tag = "lz_co2_out"; dir = 1 }, @@ -2113,15 +2108,6 @@ /obj/structure/lattice/catwalk/indoor/urban, /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) -"Dy" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/konyang_landing_zone) "DB" = ( /obj/structure/cable{ icon_state = "1-4" @@ -2949,7 +2935,6 @@ "PO" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 1; - frequency = 1441; id_tag = "lz_air_out" }, /turf/simulated/floor/reinforced/airmix, @@ -6117,7 +6102,7 @@ FU FU lb FU -dg +kx ae ae gF @@ -6219,13 +6204,13 @@ ae Lr Lr Lr -Dy -Dy -Dy -Dy -Dy -Dy -Dy +MH +MH +MH +MH +MH +MH +MH eS eS eS diff --git a/maps/random_ruins/exoplanets/konyang/tribute.dmm b/maps/random_ruins/exoplanets/konyang/tribute.dmm index 9528395924f..e08dd6833e5 100644 --- a/maps/random_ruins/exoplanets/konyang/tribute.dmm +++ b/maps/random_ruins/exoplanets/konyang/tribute.dmm @@ -38,15 +38,6 @@ /obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/exoplanet/konyang, /area/space) -"ch" = ( -/obj/structure/flora/bush/konyang_reeds, -/obj/structure/konyang_cliff{ - icon_state = "cliff2-bottom"; - pixel_y = 25; - density = 0 - }, -/turf/simulated/floor/exoplanet/konyang, -/area/space) "cq" = ( /obj/structure/flora/rock/konyang/water{ density = 0 @@ -105,15 +96,6 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/exoplanet/konyang, /area/space) -"fi" = ( -/obj/structure/konyang_cliff{ - icon_state = "cliff2-bottom"; - pixel_y = 25; - density = 0 - }, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/exoplanet/konyang, -/area/space) "fk" = ( /obj/structure/flora/rock/konyang/small, /obj/random/dirt_75, @@ -160,15 +142,6 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/exoplanet/konyang, /area/space) -"ih" = ( -/obj/effect/floor_decal/konyang_flowers, -/obj/structure/konyang_cliff{ - icon_state = "cliff2-bottom"; - pixel_y = 25; - density = 0 - }, -/turf/simulated/floor/exoplanet/konyang/pink, -/area/space) "iy" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/reedbush, @@ -336,14 +309,6 @@ /obj/structure/flora/rock/konyang/small, /turf/simulated/floor/exoplanet/konyang, /area/space) -"pR" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/konyang_cliff{ - icon_state = "topcorner_east"; - density = 0 - }, -/turf/simulated/floor/exoplanet/konyang, -/area/space) "pW" = ( /obj/structure/konyang_cliff{ icon_state = "cliff-west"; @@ -560,15 +525,6 @@ }, /turf/simulated/floor/exoplanet/konyang, /area/space) -"AC" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/konyang_cliff{ - icon_state = "cliff2-bottom"; - pixel_y = 25; - density = 0 - }, -/turf/simulated/floor/exoplanet/konyang, -/area/space) "AF" = ( /obj/structure/konyang_cliff{ icon_state = "cliff-top1" @@ -847,15 +803,6 @@ }, /turf/simulated/floor/exoplanet/konyang, /area/space) -"MD" = ( -/obj/effect/floor_decal/konyang_flowers, -/obj/structure/konyang_cliff{ - icon_state = "cliff2-bottom"; - pixel_y = 25; - density = 0 - }, -/turf/simulated/floor/exoplanet/konyang, -/area/space) "MO" = ( /obj/structure/konyang_cliff{ icon_state = "cliff-top1"; @@ -876,14 +823,6 @@ }, /turf/simulated/floor/exoplanet/konyang, /area/space) -"NT" = ( -/obj/structure/konyang_cliff{ - icon_state = "cliff2-bottom"; - pixel_y = 25; - density = 0 - }, -/turf/simulated/floor/exoplanet/konyang, -/area/space) "OW" = ( /obj/effect/floor_decal/konyang_flowers, /obj/structure/konyang_cliff{ @@ -898,15 +837,6 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/exoplanet/konyang, /area/space) -"PG" = ( -/obj/structure/konyang_cliff{ - icon_state = "cliff2-bottom"; - pixel_y = 25; - density = 0 - }, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/exoplanet/konyang, -/area/space) "PR" = ( /obj/structure/flora/bush/konyang_reeds, /obj/structure/konyang_cliff{ @@ -1060,16 +990,6 @@ /obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/exoplanet/konyang, /area/space) -"UJ" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/konyang_cliff{ - icon_state = "cliff2-bottom"; - pixel_y = 25; - density = 0 - }, -/turf/simulated/floor/exoplanet/konyang, -/area/space) "UM" = ( /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/space) @@ -1161,13 +1081,6 @@ /obj/effect/decal/cleanable/generic/beet_tree_petals, /turf/simulated/floor/exoplanet/konyang/pink, /area/space) -"XR" = ( -/obj/structure/konyang_cliff{ - icon_state = "topcorner_east"; - density = 0 - }, -/turf/simulated/floor/exoplanet/konyang, -/area/space) "XS" = ( /obj/structure/konyang_cliff{ icon_state = "innercorner3" @@ -1656,7 +1569,7 @@ jJ XS Nw nK -NT +av Wc jJ Lk @@ -1816,7 +1729,7 @@ jJ Jn Xs YP -AC +tA hd Lk Lk @@ -1895,7 +1808,7 @@ cA zB yv Hc -NT +av Do hd hd @@ -2047,7 +1960,7 @@ Jn Jn XS nK -ch +jz KC hf zB @@ -2187,7 +2100,7 @@ Nw Nw Nw nK -NT +av hf jJ jJ @@ -2206,7 +2119,7 @@ KC hf Jn YP -MD +OW Jn Jn jJ @@ -2278,7 +2191,7 @@ Nw Nw Nw nK -NT +av jJ Wc jJ @@ -2359,13 +2272,13 @@ Wc XS Nw nK -NT +av Pi Jn Wc XS nK -PG +Ji Do KC YP @@ -2439,7 +2352,7 @@ jJ Wc XS nK -PG +Ji Jn KC hf @@ -2495,7 +2408,7 @@ Nw Nw Nw nK -ch +jz Wc KC hf @@ -2520,10 +2433,10 @@ Jn XS Nw nK -ch +jz jJ YP -MD +OW Wc Wc YP @@ -2579,7 +2492,7 @@ Nw Nw Nw nK -ch +jz xO Jn KC @@ -2603,7 +2516,7 @@ jz jJ XS nK -NT +av Pi YP jz @@ -2659,7 +2572,7 @@ jJ jJ XS nK -PG +Ji jJ Jn Wc @@ -2678,14 +2591,14 @@ KC hf Jn YP -fi +Ji Jn Jn YP -MD +OW Wc YP -MD +OW KC Jn Wc @@ -2741,7 +2654,7 @@ XS Nw Nw nK -NT +av bW Wc KC @@ -2919,7 +2832,7 @@ jz Wc Wc YP -fi +Ji jJ YP jz @@ -2978,7 +2891,7 @@ ww Jn oh tR -UJ +iy Jn Jn Jn @@ -3056,7 +2969,7 @@ jJ Jn Jn kZ -MD +OW xO QK QK @@ -3073,11 +2986,11 @@ Lk Lk Lk YP -fi +Ji hf Jn YP -MD +OW Pi YP dM @@ -3135,7 +3048,7 @@ hf bW oh tR -ch +jz QK QK QK @@ -3292,7 +3205,7 @@ Jn jJ kZ tR -ch +jz QK QK QK @@ -3370,7 +3283,7 @@ KC Pi oh tR -ch +jz Jn QK QK @@ -4021,7 +3934,7 @@ QK Jn Lk YP -fi +Ji Lk Lk YP @@ -4107,7 +4020,7 @@ YP nv oh tR -ih +nv Lk QK QK @@ -4159,7 +4072,7 @@ oh ny ny tR -NT +av LB hd hd @@ -4261,7 +4174,7 @@ YP jz ns YP -fi +Ji Wc YP nv @@ -4337,10 +4250,10 @@ Lk Lk oh tR -PG +Ji jJ YP -MD +OW Jn YP nv @@ -4415,7 +4328,7 @@ hd Sp hd YP -MD +OW KC jJ YP @@ -4501,7 +4414,7 @@ YP jz jJ YP -MD +OW Jn hd mu @@ -4573,7 +4486,7 @@ Lk hd oh tR -ch +jz Wc Wc YP @@ -4632,7 +4545,7 @@ Lk Lk mu kZ -fi +Ji Jn Jn jJ @@ -4651,7 +4564,7 @@ Lk Lk jJ YP -MD +OW Wc Jn Jn @@ -4730,15 +4643,15 @@ Lk Lk oh tR -PG +Ji jJ Jn KC YP -fi +Ji Wc YP -fi +Ji jJ hd Wu @@ -4786,7 +4699,7 @@ WD ny ny tR -PG +Ji KC hf Jn @@ -4808,16 +4721,16 @@ cA Wc oh tR -NT +av Jn Do KC hf YP -MD +OW Jn YP -fi +Ji ns hd mu @@ -4886,7 +4799,7 @@ ls Br FZ YP -MD +OW Jn Jn Wc @@ -4896,7 +4809,7 @@ YP Mj jJ YP -MD +OW Jn Wc hd @@ -4965,17 +4878,17 @@ YK cA ST tR -PG +Ji KC hf KC hf Wc YP -fi +Ji Jn YP -MD +OW Jn Jn KC @@ -5009,7 +4922,7 @@ jJ Jn Wc Wc -XR +An ny ny ny @@ -5054,7 +4967,7 @@ YP jz Jn YP -fi +Ji Wc Jn jJ @@ -5130,7 +5043,7 @@ Jn ns jJ YP -MD +OW Wc YP jz @@ -5291,7 +5204,7 @@ YP av KC YP -MD +OW Jn Wc Wu @@ -5446,10 +5359,10 @@ Jn Wc oh tR -PG +Ji jJ YP -MD +OW KC hf hd @@ -5552,7 +5465,7 @@ Jn Jn Jn ns -pR +WD ny ny Ns @@ -5602,12 +5515,12 @@ Wc Jn oh tR -NT +av KC hf oh tR -NT +av jJ Wc KC @@ -5680,12 +5593,12 @@ ny ny ny tR -NT +av Wc Wc jJ YP -fi +Ji jJ Wc Wc @@ -5703,7 +5616,7 @@ jJ "} (57,1,1) = {" jJ -XR +An Ns KC Pi @@ -5754,7 +5667,7 @@ ny ny ny tR -ch +jz Xs Jn jJ @@ -5764,7 +5677,7 @@ hf rw Wc YP -fi +Ji KC Jn jJ @@ -5823,7 +5736,7 @@ ny ny ny tR -PG +Ji jJ jJ Jn @@ -5843,7 +5756,7 @@ Wc jJ oh tR -NT +av KC Ck Lk @@ -5863,7 +5776,7 @@ zB KC Wc Jn -XR +An Ns KC jJ @@ -5999,7 +5912,7 @@ ny ny ny tR -NT +av Jn jJ Jn @@ -6030,7 +5943,7 @@ Jn Jn Jn Jn -XR +An ny ny ny @@ -6117,7 +6030,7 @@ ns jJ rw Jn -XR +An ny ny ny @@ -6140,7 +6053,7 @@ ny ny ny tR -NT +av jJ KC Wc diff --git a/maps/random_ruins/exoplanets/konyang/village.dmm b/maps/random_ruins/exoplanets/konyang/village.dmm index 586eb8cf843..39912ee4efc 100644 --- a/maps/random_ruins/exoplanets/konyang/village.dmm +++ b/maps/random_ruins/exoplanets/konyang/village.dmm @@ -277,16 +277,13 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/junk{ - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/random/junk{ - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/random/junk{ - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/random/junk{ pixel_x = -6; @@ -513,8 +510,7 @@ dir = 8 }, /obj/item/paper_scanner{ - pixel_x = 4; - pixel_y = 0 + pixel_x = 4 }, /obj/item/toy/desk/fan{ pixel_y = 7; @@ -524,9 +520,7 @@ /turf/simulated/floor/lino/diamond, /area/konyang_village) "mT" = ( -/obj/structure/lattice/catwalk/indoor/tatami{ - dir = 2 - }, +/obj/structure/lattice/catwalk/indoor/tatami, /obj/structure/flora/pottedplant/orchid, /turf/simulated/floor/wood, /area/konyang_village) @@ -865,12 +859,10 @@ pixel_y = -5 }, /obj/random/junk{ - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/random/junk{ - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/item/trash/ricetub, /turf/simulated/floor/sidewalk, @@ -1571,7 +1563,6 @@ pixel_x = 8 }, /obj/item/reagent_containers/food/drinks/dry_ramen{ - pixel_y = 0; pixel_x = -7 }, /turf/simulated/floor/wood/bamboo, @@ -1607,15 +1598,12 @@ pixel_x = -9 }, /obj/item/reagent_containers/food/drinks/dry_ramen{ - pixel_y = 0; pixel_x = -9 }, /obj/item/reagent_containers/food/drinks/dry_ramen{ - pixel_y = 0; pixel_x = -9 }, /obj/item/reagent_containers/food/drinks/dry_ramen{ - pixel_y = 0; pixel_x = -9 }, /obj/item/reagent_containers/food/drinks/cans/peach_soda, @@ -1635,7 +1623,6 @@ }, /obj/item/reagent_containers/food/drinks/cans/peach_soda, /obj/item/reagent_containers/food/drinks/dry_ramen{ - pixel_y = 0; pixel_x = -9 }, /turf/simulated/floor/lino/diamond, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_guild_mining.dmm b/maps/random_ruins/exoplanets/moghes/moghes_guild_mining.dmm index 960eef313b6..3f5835c916c 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_guild_mining.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_guild_mining.dmm @@ -238,8 +238,7 @@ /area/moghes_guild_mining) "uX" = ( /obj/machinery/conveyor{ - id = "miners_guild_outpost"; - dir = 2 + id = "miners_guild_outpost" }, /obj/structure/railing/mapped{ dir = 8 @@ -370,8 +369,7 @@ /area/moghes_guild_mining) "Gy" = ( /obj/machinery/conveyor{ - id = "miners_guild_outpost"; - dir = 2 + id = "miners_guild_outpost" }, /obj/structure/railing/mapped{ dir = 8 diff --git a/maps/random_ruins/exoplanets/moghes/moghes_skakh.dmm b/maps/random_ruins/exoplanets/moghes/moghes_skakh.dmm index 594b7ee65f4..8842a423e8c 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_skakh.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_skakh.dmm @@ -86,9 +86,7 @@ }, /area/moghes_skakh) "lQ" = ( -/obj/effect/floor_decal/corner/yellow{ - dir = 2 - }, +/obj/effect/floor_decal/corner/yellow, /turf/simulated/floor/exoplanet/marble{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm index e7a6766a772..4a7c6ea99cf 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm @@ -367,9 +367,7 @@ /obj/item/reagent_containers/food/snacks/fish/fishfillet, /obj/item/reagent_containers/food/snacks/fish/fishfillet, /obj/item/reagent_containers/food/snacks/fish/fishfillet, -/obj/structure/closet/secure_closet/freezer{ - req_access = null - }, +/obj/structure/closet/secure_closet/freezer, /turf/simulated/floor/exoplanet/tiled/white{ temperature = 303.15 }, @@ -596,9 +594,7 @@ /area/moghes_vihnmes) "xv" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/closet/secure_closet/freezer{ - req_access = null - }, +/obj/structure/closet/secure_closet/freezer, /obj/item/storage/box/fancy/egg_box, /obj/item/storage/box/fancy/egg_box, /obj/item/reagent_containers/food/condiment/flour, @@ -797,9 +793,7 @@ /area/moghes_vihnmes) "GL" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/closet/secure_closet/freezer{ - req_access = null - }, +/obj/structure/closet/secure_closet/freezer, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, diff --git a/maps/random_ruins/exoplanets/new_gibson/gibson_resupply.dmm b/maps/random_ruins/exoplanets/new_gibson/gibson_resupply.dmm index dfe06fe511a..ae41fbe59d1 100644 --- a/maps/random_ruins/exoplanets/new_gibson/gibson_resupply.dmm +++ b/maps/random_ruins/exoplanets/new_gibson/gibson_resupply.dmm @@ -185,8 +185,7 @@ /obj/effect/floor_decal/corner/lime/diagonal, /obj/structure/table/steel, /obj/item/folder/white{ - pixel_x = -5; - pixel_y = 0 + pixel_x = -5 }, /obj/item/storage/box/masks{ pixel_y = 5; diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_guild_mining.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_guild_mining.dmm index 0d1cc66551e..b632d2e8f29 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_guild_mining.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_guild_mining.dmm @@ -10,8 +10,7 @@ /area/ouerea_guild_mining) "cG" = ( /obj/machinery/conveyor{ - id = "miners_guild_outpost"; - dir = 2 + id = "miners_guild_outpost" }, /obj/structure/railing/mapped{ dir = 8 @@ -538,8 +537,7 @@ /area/ouerea_guild_mining) "TB" = ( /obj/machinery/conveyor{ - id = "miners_guild_outpost"; - dir = 2 + id = "miners_guild_outpost" }, /obj/structure/railing/mapped{ dir = 8 diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_sol_base.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_sol_base.dmm index c7c2b4330b5..44767a4a74b 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_sol_base.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_sol_base.dmm @@ -169,8 +169,7 @@ "jl" = ( /obj/machinery/light, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, @@ -201,8 +200,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -293,8 +291,7 @@ /area/ouerea_sol) "pQ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/plating, /area/ouerea_sol) diff --git a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm index 0b2bdebad25..0d77697f45b 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm +++ b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm @@ -2712,9 +2712,7 @@ /turf/template_noop, /area/exoplanet/barren/raskara) "Ic" = ( -/obj/structure/closet/secure_closet/kitchen_cabinet/standard{ - req_access = null - }, +/obj/structure/closet/secure_closet/kitchen_cabinet/standard, /obj/item/storage/box/produce{ pixel_x = 3; pixel_y = -11 diff --git a/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm b/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm index 5b7fce8db22..5a5b0e91bbc 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm @@ -1768,8 +1768,7 @@ /obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /turf/simulated/floor{ temperature = 303.15 diff --git a/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm b/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm index 4bca81dd828..25a26d1a84f 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm @@ -1,8 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, @@ -1151,8 +1150,7 @@ /obj/machinery/door/airlock/external, /obj/machinery/access_button{ pixel_x = 28; - pixel_y = -8; - dir = 2 + pixel_y = -8 }, /obj/effect/map_effect/marker/airlock{ frequency = 1003; diff --git a/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm b/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm index bf2c7e74fe5..1ae71fb2c64 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm @@ -91,9 +91,7 @@ pixel_y = 12; dir = 1 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/shuttle{ cycle_to_external_air = 1; master_tag = "airlock_kazhkz_crash"; @@ -313,9 +311,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 10 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/shuttle{ cycle_to_external_air = 1; master_tag = "airlock_kazhkz_crash"; @@ -407,9 +403,7 @@ req_one_access = null; shuttle_tag = "Crashed Kazhkz Shuttle" }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/plating, /area/shuttle/kazhkz_crash) @@ -846,9 +840,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 8 }, -/obj/machinery/door/airlock/external{ - dir = 2 - }, +/obj/machinery/door/airlock/external, /obj/effect/map_effect/marker/airlock/shuttle{ cycle_to_external_air = 1; master_tag = "airlock_kazhkz_crash"; diff --git a/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm b/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm index 13589e88298..5d88e87c596 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm @@ -121,8 +121,7 @@ /area/miners_guild_outpost/engineering) "bV" = ( /obj/machinery/conveyor{ - id = "miners_guild_outpost"; - dir = 2 + id = "miners_guild_outpost" }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -1231,8 +1230,7 @@ /area/miners_guild_outpost/eva) "xe" = ( /obj/machinery/conveyor{ - id = "miners_guild_outpost"; - dir = 2 + id = "miners_guild_outpost" }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -1934,8 +1932,7 @@ /area/miners_guild_outpost/mining) "Kr" = ( /obj/machinery/conveyor{ - id = "miners_guild_outpost"; - dir = 2 + id = "miners_guild_outpost" }, /obj/effect/floor_decal/industrial/warning{ dir = 8 diff --git a/maps/random_ruins/exoplanets/uueoaesa/pid_crashed_shuttle.dmm b/maps/random_ruins/exoplanets/uueoaesa/pid_crashed_shuttle.dmm index 95c9772fb84..a07e08f738b 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/pid_crashed_shuttle.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/pid_crashed_shuttle.dmm @@ -67,8 +67,7 @@ /obj/effect/floor_decal/corner_wide/red/diagonal, /obj/effect/floor_decal/corner_wide/red/diagonal, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4; - icon_state = "map_scrubber_on" + dir = 4 }, /turf/simulated/floor/tiled/airless, /area/template_noop) diff --git a/maps/random_ruins/space_ruins/multi_zas_test.dmm b/maps/random_ruins/space_ruins/multi_zas_test.dmm index 006036739c1..edd44950f0d 100644 --- a/maps/random_ruins/space_ruins/multi_zas_test.dmm +++ b/maps/random_ruins/space_ruins/multi_zas_test.dmm @@ -53,6 +53,7 @@ a a a "} + (1,1,2) = {" a a diff --git a/maps/runtime/runtime.dmm b/maps/runtime/runtime.dmm index ac6a04af26d..f0b433466e0 100644 --- a/maps/runtime/runtime.dmm +++ b/maps/runtime/runtime.dmm @@ -1451,7 +1451,6 @@ name = "Physician" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled, @@ -2026,7 +2025,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled{ diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 6f9d77ca2b8..5d77e1082da 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -990,7 +990,6 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1776,8 +1775,7 @@ /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/door/blast/regular/open{ dir = 8; - id = "crescent_bridge_blast"; - name = "blast door" + id = "crescent_bridge_blast" }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/hapt) @@ -2629,7 +2627,6 @@ dir = 10 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/cable/green{ @@ -4485,7 +4482,6 @@ /area/horizon/kitchen/freezer) "aGF" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4697,7 +4693,6 @@ /area/hangar/intrepid) "aIe" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled, @@ -4883,7 +4878,6 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/light_switch{ @@ -5920,7 +5914,6 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -6588,7 +6581,6 @@ "aVP" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/cable{ @@ -12369,7 +12361,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction/flipped{ - dir = 2; name = "Security"; sortType = "Security" }, @@ -12695,7 +12686,6 @@ /area/engineering/atmos) "bOX" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/cable{ @@ -15249,8 +15239,7 @@ "chJ" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/odin/open{ - id = "arrivals_inner"; - name = "blast door" + id = "arrivals_inner" }, /turf/unsimulated/floor, /area/centcom/spawning) @@ -15880,8 +15869,7 @@ "cmH" = ( /obj/machinery/door/blast/regular/open{ dir = 8; - id = "crescent_exterior_blast"; - name = "blast door" + id = "crescent_exterior_blast" }, /turf/unsimulated/floor{ icon_state = "dark_preview" @@ -17835,7 +17823,6 @@ /area/horizon/holodeck/source_emptycourt) "cCI" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -26319,8 +26306,7 @@ /obj/effect/map_effect/window_spawner/full/reinforced, /obj/machinery/door/blast/regular/open{ dir = 2; - id = "raidercockpit"; - name = "blast door" + id = "raidercockpit" }, /turf/simulated/floor/plating, /area/shuttle/skipjack) @@ -29721,7 +29707,6 @@ }, /obj/machinery/firealarm/east, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30082,7 +30067,6 @@ /area/maintenance/wing/starboard/far) "esq" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, @@ -33294,7 +33278,6 @@ "eTc" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/disposalpipe/sortjunction/flipped{ - dir = 2; name = "Kitchen"; sortType = "Kitchen" }, @@ -37684,7 +37667,6 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor/grate, @@ -44581,7 +44563,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -45306,7 +45287,6 @@ /area/lawoffice/consular_two) "gHd" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -45953,9 +45933,7 @@ /turf/simulated/floor/tiled, /area/horizon/security/hallway) "gMf" = ( -/obj/structure/disposalpipe/junction{ - dir = 2 - }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "gMg" = ( @@ -49074,7 +49052,6 @@ /area/hangar/auxiliary) "hla" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -51337,7 +51314,6 @@ dir = 7 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/wood, @@ -52070,7 +52046,6 @@ /area/maintenance/operations) "hIM" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/light/small/emergency{ @@ -54535,8 +54510,7 @@ /obj/effect/map_effect/window_spawner/full/reinforced, /obj/machinery/door/blast/regular/open{ dir = 4; - id = "raidercockpit"; - name = "blast door" + id = "raidercockpit" }, /turf/simulated/floor/plating, /area/shuttle/skipjack) @@ -55291,7 +55265,6 @@ /area/horizon/crew_quarters/cryo/washroom) "ijF" = ( /obj/structure/disposalpipe/junction{ - dir = 2; icon_state = "pipe-j2" }, /obj/effect/floor_decal/corner/dark_blue{ @@ -64169,7 +64142,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/bed/stool/chair/padded/black{ @@ -64253,7 +64225,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction/flipped{ - dir = 2; name = "Operations"; sortType = "Cargo" }, @@ -68149,7 +68120,6 @@ dir = 10 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/cable/green{ @@ -71744,7 +71714,6 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -74512,7 +74481,6 @@ dir = 10 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/cable/green{ @@ -75214,7 +75182,6 @@ /area/template_noop) "ley" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -75237,7 +75204,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, @@ -75790,7 +75756,6 @@ /area/medical/surgery) "lis" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/cable/green{ @@ -75847,7 +75812,6 @@ /area/engineering/atmos) "liE" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/effect/floor_decal/corner_wide/green{ @@ -76918,7 +76882,6 @@ /area/rnd/xenoarch_atrium) "lrE" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/wood, @@ -77791,7 +77754,6 @@ /area/maintenance/aux_atmospherics/deck_2/starboard/wing) "lyo" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor/grate, @@ -79747,7 +79709,6 @@ /obj/structure/cable, /obj/machinery/power/apc/east, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor/grate, @@ -80469,7 +80430,6 @@ /area/hangar/operations) "lSd" = ( /obj/structure/disposalpipe/junction{ - dir = 2; icon_state = "pipe-j2" }, /obj/effect/floor_decal/corner/red/diagonal, @@ -81697,7 +81657,6 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -81962,8 +81921,7 @@ "mer" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/door/blast/regular/open{ - id = "crescent_bridge_blast"; - name = "blast door" + id = "crescent_bridge_blast" }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/hapt) @@ -84748,7 +84706,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/cable/green{ @@ -86005,7 +85962,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, @@ -90574,7 +90530,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/disposalpipe/junction{ - dir = 2; icon_state = "pipe-j2" }, /obj/structure/cable/green{ @@ -91740,7 +91695,6 @@ /area/hallway/primary/aft) "nEh" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 2; name = "Machinist Workshop"; sortType = "Machinist Workshop" }, @@ -92802,7 +92756,6 @@ /area/horizon/hallway/deck_three/primary/central) "nMz" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/bed/stool/chair/sofa/left/brown{ @@ -96483,7 +96436,6 @@ dir = 8 }, /obj/structure/disposalpipe/junction{ - dir = 2; icon_state = "pipe-j2" }, /obj/structure/lattice/catwalk/indoor/grate, @@ -97786,7 +97738,6 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -99157,7 +99108,6 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/wood, @@ -99672,7 +99622,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ - dir = 2; icon_state = "pipe-j2" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -100228,7 +100177,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, @@ -102295,7 +102243,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/effect/decal/cleanable/dirt, @@ -102492,7 +102439,6 @@ /area/centcom/bar) "pkq" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -105023,7 +104969,6 @@ /area/maintenance/research_port) "pCu" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor, @@ -105771,8 +105716,7 @@ "pHK" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/odin/open{ - id = "arrivals_outer"; - name = "blast door" + id = "arrivals_outer" }, /turf/unsimulated/floor, /area/centcom/spawning) @@ -105879,7 +105823,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -108959,7 +108902,6 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/effect/floor_decal/corner_wide/green{ @@ -108972,7 +108914,6 @@ /area/medical/icu) "qgg" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/cable/green{ @@ -112968,7 +112909,6 @@ /area/rnd/xenoarch_atrium) "qKs" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -115035,8 +114975,7 @@ "rab" = ( /obj/machinery/door/blast/regular/open{ dir = 2; - id = "burglar_blast"; - name = "blast door" + id = "burglar_blast" }, /obj/machinery/door/airlock/hatch{ dir = 4; @@ -121027,7 +120966,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor/grate, @@ -122336,7 +122274,6 @@ dir = 6 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -122851,7 +122788,6 @@ dir = 8 }, /obj/structure/disposalpipe/junction{ - dir = 2; icon_state = "pipe-j2" }, /turf/simulated/floor/tiled/dark/full, @@ -123094,7 +123030,6 @@ /area/shuttle/mining) "snG" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -125228,7 +125163,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, @@ -125486,7 +125420,6 @@ dir = 8 }, /obj/structure/disposalpipe/junction{ - dir = 2; icon_state = "pipe-j2" }, /obj/structure/cable/green{ @@ -125617,7 +125550,6 @@ dir = 5 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled, @@ -126921,7 +126853,6 @@ dir = 8 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/wood, @@ -128475,7 +128406,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -129904,7 +129834,6 @@ /area/merchant_station/warehouse) "tpP" = ( /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor/grate, @@ -131163,8 +131092,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 8; - id = "crescent_exterior_blast"; - name = "blast door" + id = "crescent_exterior_blast" }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/map_effect/marker_helper/airlock/interior, @@ -132962,7 +132890,6 @@ /area/medical/icu) "tME" = ( /obj/structure/disposalpipe/junction{ - dir = 2; icon_state = "pipe-j2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -133104,7 +133031,6 @@ pixel_x = 14 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/effect/floor_decal/corner/paleblue/full{ @@ -133863,7 +133789,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled, @@ -138980,8 +138905,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 2; - id = "raiderblastdoor"; - name = "blast door" + id = "raiderblastdoor" }, /obj/machinery/button/remote/blast_door{ id = "raiderblastdoor"; @@ -140622,7 +140546,6 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled, @@ -142527,7 +142450,6 @@ dir = 6 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, @@ -144468,7 +144390,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/sortjunction/flipped{ - dir = 2; name = "Hydroponics"; sortType = "Hydroponics" }, @@ -146726,7 +146647,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ @@ -148195,9 +148115,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 2 - }, +/obj/structure/disposalpipe/junction, /obj/effect/floor_decal/corner/dark_blue, /turf/simulated/floor/tiled, /area/horizon/security/hallway) @@ -150679,7 +150597,6 @@ dir = 9 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/carpet/rubber, @@ -153427,7 +153344,6 @@ dir = 10 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/effect/floor_decal/corner/brown{ @@ -158199,8 +158115,7 @@ "xsB" = ( /obj/machinery/door/blast/regular/open{ dir = 8; - id = "crescent_exterior_blast"; - name = "blast door" + id = "crescent_exterior_blast" }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -158220,8 +158135,7 @@ }, /obj/machinery/door/blast/regular/open{ dir = 8; - id = "crescent_exterior_blast"; - name = "blast door" + id = "crescent_exterior_blast" }, /turf/simulated/floor/tiled/dark, /area/shuttle/hapt) @@ -158668,7 +158582,6 @@ dir = 10 }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/effect/floor_decal/corner/purple{ @@ -161289,7 +161202,6 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /obj/effect/floor_decal/industrial/warning/corner{ @@ -161900,9 +161812,7 @@ /turf/simulated/floor/tiled, /area/engineering/lobby) "xSt" = ( -/obj/structure/disposalpipe/up{ - dir = 2 - }, +/obj/structure/disposalpipe/up, /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, @@ -162177,7 +162087,6 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/full, diff --git a/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm b/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm index 5eab962fdec..79e4d918a8c 100644 --- a/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm +++ b/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm @@ -463,14 +463,6 @@ /obj/structure/closet/crate/rad/gear, /turf/template_noop, /area/template_noop) -"Sm" = ( -/obj/structure/bed/stool/bar/padded{ - dir = 8; - pixel_y = 0; - pixel_x = -8 - }, -/turf/template_noop, -/area/template_noop) "SE" = ( /obj/structure/table/rack/no_cargo, /obj/item/circuitboard/rdtechprocessor, @@ -2163,7 +2155,7 @@ Gz Gz Gz Gz -Sm +go go Gz Gz diff --git a/maps/templates/distress/iac.dmm b/maps/templates/distress/iac.dmm index 4a9c7fbd681..f88075d8960 100644 --- a/maps/templates/distress/iac.dmm +++ b/maps/templates/distress/iac.dmm @@ -89,8 +89,7 @@ }, /area/centcom/distress_prep) "f" = ( -/obj/structure/closet/crate/medical{ - }, +/obj/structure/closet/crate/medical, /obj/item/cane/crutch, /obj/item/cane/crutch, /obj/item/cane/crutch,