From f3bb1849192e02f7249d2bf0768fdced87cb471c Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sun, 29 May 2022 20:26:06 +0200 Subject: [PATCH] Fixes drop pods, fixes the Ninja TP consoles, fixes shuttles being unable to dock with the Horizon. (#14138) --- code/game/area/areas.dm | 2 - code/game/machinery/teleporter.dm | 6 + .../computers/subtypes/preset_console.dm | 5 + .../file_system/programs/app_presets.dm | 20 + .../programs/command/teleporter.dm | 5 + code/modules/vehicles/droppod.dm | 71 ++- html/changelogs/mattatlas-antagfixes.yml | 44 ++ maps/sccv_horizon/code/sccv_horizon_areas.dm | 11 - .../code/sccv_horizon_unittest.dm | 1 - maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 504 +++++++++--------- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 355 ++++++------ maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 297 ++++++----- maps/sccv_horizon/sccv_horizon-4_centcomm.dmm | 4 +- .../src/components/view/vehicles/droppod.vue | 6 +- 14 files changed, 689 insertions(+), 642 deletions(-) create mode 100644 html/changelogs/mattatlas-antagfixes.yml diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 2c3e000ee37..af59364aa62 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -387,8 +387,6 @@ var/list/mob/living/forced_ambiance_list = new continue if (istype(A, /area/mine)) continue - if (istype(A, /area/horizon/exterior)) - continue //Although hostile mobs instadying to turrets is fun //If there's no AI they'll just be hit with stunbeams all day and spam the attack logs. diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index d5c859e769a..da819fecd7e 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -19,6 +19,7 @@ var/max_teleport_range = 4 //max overmap teleport distance var/calibration = 0 // a percentage chance for teleporting into space instead of your target. 0 is perfectly calibrated, 100 is totally uncalibrated var/engaged = FALSE + var/ignore_distance = FALSE // For antag teleporters. /obj/machinery/teleport/pad/Initialize() . = ..() @@ -68,6 +69,8 @@ add_overlay(I) /obj/machinery/teleport/pad/proc/within_range(var/target) + if(ignore_distance) + return TRUE if (isweakref(target)) var/datum/weakref/target_ref = target target = target_ref.resolve() @@ -115,3 +118,6 @@ /obj/machinery/teleport/pad/proc/recalibrate() calibration = 0 audible_message(SPAN_NOTICE("Calibration complete.")) + +/obj/machinery/teleport/pad/ninja + ignore_distance = TRUE \ No newline at end of file diff --git a/code/modules/modular_computers/computers/subtypes/preset_console.dm b/code/modules/modular_computers/computers/subtypes/preset_console.dm index 9f0234bba45..bf912a910b4 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_console.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_console.dm @@ -110,6 +110,11 @@ desc = "A computer that has a special teleporter control program loaded." _app_preset_type = /datum/modular_computer_app_presets/command/teleporter +/obj/item/modular_computer/console/preset/command/teleporter/ninja + name = "teleporter control console" + desc = "A computer that has a special teleporter control program loaded." + _app_preset_type = /datum/modular_computer_app_presets/command/teleporter/ninja + // Civilian /obj/item/modular_computer/console/preset/civilian name = "civilian console" diff --git a/code/modules/modular_computers/file_system/programs/app_presets.dm b/code/modules/modular_computers/file_system/programs/app_presets.dm index f72e86b6190..e4d71565817 100644 --- a/code/modules/modular_computers/file_system/programs/app_presets.dm +++ b/code/modules/modular_computers/file_system/programs/app_presets.dm @@ -245,6 +245,26 @@ ) return _prg_list +/datum/modular_computer_app_presets/command/teleporter/ninja + name = "ninja_teleporter" + display_name = "Offsite - Teleporter" + description = "Contains the most common command programs and has a special teleporter control program loaded." + available = FALSE + +/datum/modular_computer_app_presets/command/teleporter/ninja/return_install_programs(obj/item/modular_computer/comp) + var/list/_prg_list = list( + new /datum/computer_file/program/ntnetdownload(comp), + new /datum/computer_file/program/filemanager(comp), + new /datum/computer_file/program/newsbrowser(comp), + new /datum/computer_file/program/manifest(comp), + new /datum/computer_file/program/chat_client(comp), + new /datum/computer_file/program/civilian/cargoorder(comp), + new /datum/computer_file/program/comm(comp, FALSE), + new /datum/computer_file/program/records/employment(comp), + new /datum/computer_file/program/teleporter/ninja(comp) + ) + return _prg_list + /datum/modular_computer_app_presets/command/hop name = "command_hop" display_name = "Command - HoP" diff --git a/code/modules/modular_computers/file_system/programs/command/teleporter.dm b/code/modules/modular_computers/file_system/programs/command/teleporter.dm index a25d36f21bf..5cd4b465ee9 100644 --- a/code/modules/modular_computers/file_system/programs/command/teleporter.dm +++ b/code/modules/modular_computers/file_system/programs/command/teleporter.dm @@ -162,3 +162,8 @@ linked_pad.visible_message(SPAN_NOTICE("Locked in."), range = 2) SSvueui.check_uis_for_change(src) + +/datum/computer_file/program/teleporter/ninja + required_access_run = list() + requires_ntnet = FALSE + requires_access_to_run = FALSE \ No newline at end of file diff --git a/code/modules/vehicles/droppod.dm b/code/modules/vehicles/droppod.dm index ba108faa190..d7be2eb19dc 100644 --- a/code/modules/vehicles/droppod.dm +++ b/code/modules/vehicles/droppod.dm @@ -17,8 +17,6 @@ fire_dam_coeff = 0.6 brute_dam_coeff = 0.5 - var/list/validfirelocations = list(1, 7, 9) // above the station, at the centcomm z-level and at derelicts. - var/status = READY var/mob/humanload @@ -180,32 +178,30 @@ var/area/A = null var/target = href_list["fire"] switch(target) - if("arrivals") - var/arrivals_destination_list = list( - /area/hallway/secondary/entry/fore = 35, - /area/hallway/secondary/entry/port = 35, - /area/security/vacantoffice = 15, - /area/hallway/secondary/entry/departure_lounge = 15 + if("recreational_areas") + var/list/recreational_areas_list = list( + /area/horizon/crew_quarters/fitness/hallway = 25, + /area/horizon/crew_quarters/fitness/changing = 25, + /area/horizon/crew_quarters/fitness/pool = 25, + /area/horizon/crew_quarters/fitness/gym = 25 ) - A = pickweight(arrivals_destination_list) - if("cargo") - var/cargo_destination_list = list( - /area/quartermaster/loading = 50, - /area/quartermaster/qm = 20, - /area/maintenance/store = 10, - /area/store = 5, - /area/hallway/secondary/entry/aft = 10, - /area/sconference_room = 5 + A = pickweight(recreational_areas_list) + if("operations") + var/list/ops_list = list( + /area/operations/break_room = 15, + /area/maintenance/wing/starboard = 20, + /area/maintenance/wing/starboard/deck1 = 20, + /area/operations/office = 10, + /area/operations/storage = 15, + /area/outpost/mining_main/refinery = 20 ) - A = pickweight(cargo_destination_list) - if("commandescape") - var/commandescape_destination_list = list( - /area/bridge/levela = 35, - /area/bridge/levela/research_dock = 35, - /area/security/bridge_surface_checkpoint = 15, - /area/maintenance/bridge_elevator/surface = 15 + A = pickweight(ops_list) + if("starboard_wing") + var/list/starboard_wing_list = list( + /area/maintenance/wing/starboard = 50, + /area/maintenance/wing/starboard/far = 50 ) - A = pickweight(commandescape_destination_list) + A = pickweight(starboard_wing_list) if(A) var/mob/user = usr if(!(user in src)) @@ -238,16 +234,23 @@ else obstacle_found = FALSE + if(!length(turf_selection)) //If the list of turfs is empty then the pick below would runtime and break the pod. + pod_error() + return + var/target_turf = pick(turf_selection) if(!target_turf) - playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) - visible_message(SPAN_WARNING("\The [src]'s screen displays an error: Targeting module malfunction. Attempt relaunch.")) - status = READY - if(connected_blastdoor) - blastdoor_interact(TRUE) + pod_error() return fire(target_turf) +/obj/vehicle/droppod/proc/pod_error() + playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) + visible_message(SPAN_WARNING("\The [src]'s screen displays an error: Targeting module malfunction. Attempt relaunch.")) + status = READY + if(connected_blastdoor) + blastdoor_interact(TRUE) + /obj/vehicle/droppod/proc/fire(var/turf/A) if(!isturf(A)) playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) @@ -257,14 +260,6 @@ blastdoor_interact(TRUE) return - if(!(src.z in validfirelocations)) - playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) - visible_message(SPAN_WARNING("\The [src]'s screen displays an error: Pod cannot be launched from this position.")) - status = READY - if(connected_blastdoor) - blastdoor_interact(TRUE) - return - var/turf/aboveturf = GetAbove(A) if(aboveturf) applyfalldamage(aboveturf) diff --git a/html/changelogs/mattatlas-antagfixes.yml b/html/changelogs/mattatlas-antagfixes.yml new file mode 100644 index 00000000000..9159cfa4410 --- /dev/null +++ b/html/changelogs/mattatlas-antagfixes.yml @@ -0,0 +1,44 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "The ninja teleporter console in their base works again." + - bugfix: "Drop pods now work correctly." + - bugfix: "Fixed shuttles that dock to the Horizon's exterior being unable to dock." + - bugfix: "TCFL ERT shuttle can now actually dock with the Horizon." diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm index c467e9e7a4c..2658e6cfb30 100644 --- a/maps/sccv_horizon/code/sccv_horizon_areas.dm +++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm @@ -309,17 +309,6 @@ icon_state = "unknown" station_area = TRUE -// Exterior -/area/horizon/exterior - name = "Horizon - Exterior" - icon_state = "exterior" - base_turf = /turf/space - dynamic_lighting = TRUE - requires_power = FALSE - has_gravity = FALSE - no_light_control = TRUE - allow_nightmode = FALSE - /********** Maintenance Start **********/ // Maintenance /area/horizon/maintenance diff --git a/maps/sccv_horizon/code/sccv_horizon_unittest.dm b/maps/sccv_horizon/code/sccv_horizon_unittest.dm index acaa6a94d77..b4d13a86aae 100644 --- a/maps/sccv_horizon/code/sccv_horizon_unittest.dm +++ b/maps/sccv_horizon/code/sccv_horizon_unittest.dm @@ -12,7 +12,6 @@ /area/supply/dock, /area/turbolift, /area/mine, - /area/horizon/exterior, /area/construction ) diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 0eaf2d8d5d1..d6431aeae05 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -24,7 +24,7 @@ dir = 4 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "abQ" = ( /obj/machinery/alarm{ dir = 8; @@ -1018,12 +1018,12 @@ dir = 4 }, /obj/machinery/button/remote/blast_door{ + dir = 1; id = "shutters_evarecharging"; name = "E.V.A. Recharging Shutters"; pixel_x = -7; pixel_y = -25; - req_access = list(18); - dir = 1 + req_access = list(18) }, /turf/simulated/floor/tiled/dark, /area/rnd/eva) @@ -1416,7 +1416,7 @@ dir = 6 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "beF" = ( /obj/structure/table/rack{ dir = 8; @@ -1645,11 +1645,11 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple, /obj/structure/lattice/catwalk/indoor, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "boH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "boN" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/porta_turret, @@ -2347,8 +2347,8 @@ }, /obj/machinery/conveyor_switch/oneway{ id = "cargo_1"; - pixel_y = 21; - pixel_x = 13 + pixel_x = 13; + pixel_y = 21 }, /obj/structure/disposaloutlet{ dir = 4 @@ -2460,9 +2460,6 @@ }, /turf/simulated/floor/plating, /area/hallway/engineering) -"bQu" = ( -/turf/template_noop, -/area/horizon/exterior) "bQP" = ( /obj/machinery/power/apc/super/critical{ pixel_y = -24 @@ -2683,8 +2680,8 @@ /obj/effect/floor_decal/corner/green/full, /obj/structure/table/rack, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "cbM" = ( @@ -2877,7 +2874,7 @@ dir = 4 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "ckB" = ( /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) @@ -2905,7 +2902,7 @@ "clT" = ( /obj/structure/lattice/catwalk/indoor, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "cnb" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2929,7 +2926,7 @@ dir = 4 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "cnE" = ( /obj/machinery/shield_diffuser, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -2999,7 +2996,7 @@ "cpF" = ( /obj/structure/grille/diagonal, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "cpU" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -3076,7 +3073,7 @@ "ctz" = ( /obj/structure/lattice/catwalk, /turf/space, -/area/horizon/exterior) +/area/template_noop) "ctI" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, /obj/machinery/door/blast/shutters/open{ @@ -3763,7 +3760,7 @@ dir = 4 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "cWd" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/door/firedoor, @@ -3888,8 +3885,8 @@ /obj/machinery/door/firedoor, /obj/structure/table/reinforced/steel, /obj/machinery/door/window/westright{ - req_access = list(29); - name = "Workshop Desk Internal" + name = "Workshop Desk Internal"; + req_access = list(29) }, /obj/machinery/door/window/eastleft{ name = "Workshop Desk External" @@ -4208,7 +4205,7 @@ dir = 9 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "dpK" = ( /obj/structure/lattice/catwalk/indoor/grate/damaged, /turf/simulated/floor/plating, @@ -4457,7 +4454,7 @@ /area/turret_protected/ai_upload) "dEC" = ( /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "dEG" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 6 @@ -4695,7 +4692,7 @@ dir = 8 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "dPt" = ( /obj/machinery/light/small/emergency{ dir = 4 @@ -4844,8 +4841,8 @@ dir = 8 }, /obj/machinery/door/window/eastright{ - req_access = list(48); - name = "Tools Access" + name = "Tools Access"; + req_access = list(48) }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) @@ -5090,8 +5087,8 @@ /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/alarm{ - pixel_x = -28; - dir = 4 + dir = 4; + pixel_x = -28 }, /turf/simulated/floor/tiled, /area/hangar/operations) @@ -5143,8 +5140,8 @@ dir = 8 }, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "ehD" = ( @@ -5262,8 +5259,8 @@ "emH" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/machinery/alarm{ - pixel_x = 28; - dir = 8 + dir = 8; + pixel_x = 28 }, /obj/machinery/light{ dir = 4 @@ -5431,8 +5428,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ - req_access = list(35); - name = "Hydroponics Maintenance" + name = "Hydroponics Maintenance"; + req_access = list(35) }, /obj/structure/cable/green{ icon_state = "1-2" @@ -5578,7 +5575,7 @@ }, /obj/structure/lattice/catwalk/indoor, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "eyW" = ( /obj/machinery/camera/network/intrepid{ c_tag = "Intrepid - Airlock Starboard" @@ -5767,7 +5764,7 @@ /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/black, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "eGE" = ( /obj/effect/floor_decal/corner/brown/full{ dir = 8 @@ -6013,7 +6010,7 @@ /obj/structure/lattice/catwalk, /obj/item/hullbeacon/red, /turf/space, -/area/horizon/exterior) +/area/template_noop) "eMK" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -6136,7 +6133,7 @@ /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "eRF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -6323,9 +6320,9 @@ /area/maintenance/hangar/port) "eYN" = ( /obj/machinery/atmospherics/pipe/tank/air{ + dir = 4; layer = 3.5; - start_pressure = 5066.26; - dir = 4 + start_pressure = 5066.26 }, /obj/machinery/door/window/eastleft, /obj/structure/window/reinforced, @@ -6904,7 +6901,7 @@ }, /obj/structure/lattice/catwalk/indoor, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "fwA" = ( /obj/machinery/power/apc{ dir = 1; @@ -6932,8 +6929,8 @@ dir = 4 }, /obj/machinery/door/airlock/service{ - req_access = list(26); - name = "Custodial Closet" + name = "Custodial Closet"; + req_access = list(26) }, /turf/simulated/floor/tiled, /area/janitor) @@ -7783,7 +7780,7 @@ dir = 1 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "gdR" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -8246,8 +8243,8 @@ dir = 1 }, /obj/machinery/alarm{ - pixel_x = 28; - dir = 8 + dir = 8; + pixel_x = 28 }, /turf/simulated/floor/tiled, /area/hangar/operations) @@ -8995,8 +8992,8 @@ }, /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "hbx" = ( @@ -9286,7 +9283,7 @@ "hoV" = ( /obj/structure/lattice, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "hpA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10690,9 +10687,9 @@ pixel_y = 32 }, /obj/item/device/radio/intercom{ + dir = 4; name = "Station Intercom (General)"; - pixel_x = -24; - dir = 4 + pixel_x = -24 }, /turf/simulated/floor/tiled, /area/hangar/operations) @@ -11291,8 +11288,8 @@ dir = 4 }, /obj/machinery/door/window/westleft{ - req_access = list(48); - name = "Mining Voidsuit" + name = "Mining Voidsuit"; + req_access = list(48) }, /obj/effect/floor_decal/industrial/outline, /obj/item/stack/flag/red, @@ -11660,8 +11657,8 @@ /obj/machinery/button/remote/blast_door{ id = "miningbay"; name = "Mining Bay Entrance"; - req_access = list(48); - pixel_y = 32 + pixel_y = 32; + req_access = list(48) }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -12566,7 +12563,7 @@ /obj/structure/lattice, /obj/machinery/atmospherics/valve/open, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "kiw" = ( /obj/structure/railing/mapped{ dir = 4 @@ -12762,8 +12759,8 @@ dir = 4 }, /obj/machinery/door/window/westleft{ - req_access = list(48); - name = "Mining Voidsuit" + name = "Mining Voidsuit"; + req_access = list(48) }, /obj/effect/floor_decal/industrial/outline, /obj/item/stack/flag/purple, @@ -12823,8 +12820,8 @@ id = "intrepid_cockpit"; name = "Cockpit Bolts"; pixel_x = -38; - specialfunctions = 4; - pixel_y = 8 + pixel_y = 8; + specialfunctions = 4 }, /obj/machinery/firealarm/west, /turf/simulated/floor/tiled/dark, @@ -12876,8 +12873,8 @@ icon_state = "0-4" }, /obj/machinery/camera/network/engineering{ - c_tag = "Engineering - Deck 1 - Security Substation"; - alarm_on = 1 + alarm_on = 1; + c_tag = "Engineering - Deck 1 - Security Substation" }, /turf/simulated/floor/plating, /area/maintenance/substation/security) @@ -13034,12 +13031,12 @@ dir = 1 }, /obj/machinery/button/remote/blast_door{ + dir = 8; id = "shutters_deck1_workshopdesk"; name = "Workshop Desk Shutters"; - dir = 8; pixel_x = 25; - req_access = list(29); - pixel_y = -7 + pixel_y = -7; + req_access = list(29) }, /turf/simulated/floor/tiled/dark, /area/operations/lower/machinist) @@ -13104,7 +13101,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red, /obj/structure/lattice, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "kBF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13159,7 +13156,7 @@ }, /obj/structure/lattice, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "kDf" = ( /obj/structure/railing/mapped, /obj/effect/decal/cleanable/dirt, @@ -13612,10 +13609,10 @@ /obj/machinery/button/remote/airlock{ id = "starboard_combustion"; name = "Door Bolt Control"; + pixel_x = -39; pixel_y = 8; req_access = list(10); - specialfunctions = 4; - pixel_x = -39 + specialfunctions = 4 }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) @@ -13695,7 +13692,7 @@ "kVe" = ( /obj/structure/lattice/catwalk, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "kVn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -13984,7 +13981,7 @@ }, /obj/structure/lattice/catwalk, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "ljs" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, @@ -14044,8 +14041,8 @@ dir = 9 }, /obj/machinery/alarm{ - pixel_x = -28; - dir = 4 + dir = 4; + pixel_x = -28 }, /turf/simulated/floor/tiled, /area/hangar/operations) @@ -14085,8 +14082,8 @@ /area/engineering/atmos/air) "lnQ" = ( /obj/effect/map_effect/airlock/w_to_e/long/square{ - radio_frequency = 1004; - name = "Deck 1 Fore Maintenance Airlock (1004)" + name = "Deck 1 Fore Maintenance Airlock (1004)"; + radio_frequency = 1004 }, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/hangar/starboard) @@ -14269,11 +14266,11 @@ dir = 4 }, /obj/machinery/button/remote/blast_door{ + dir = 1; id = "miningbay"; name = "Mining Bay Entrance"; - req_access = list(48); - dir = 1; - pixel_y = -32 + pixel_y = -32; + req_access = list(48) }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) @@ -14751,9 +14748,9 @@ dir = 4 }, /obj/machinery/camera/network/engineering{ + alarm_on = 1; c_tag = "Engineering - Deck 1 - Operations Substation"; - dir = 4; - alarm_on = 1 + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/substation/supply) @@ -15391,8 +15388,8 @@ }, /obj/structure/table/rack, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "msv" = ( @@ -15563,7 +15560,7 @@ "mBc" = ( /obj/machinery/atmospherics/pipe/zpipe/up/black, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "mBx" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; @@ -15734,8 +15731,8 @@ dir = 5 }, /obj/machinery/power/apc{ - pixel_y = 24; - dir = 1 + dir = 1; + pixel_y = 24 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -15825,9 +15822,9 @@ dir = 1 }, /obj/machinery/atmospherics/binary/pump/on{ + dir = 8; name = "Distro to Airlock"; - target_pressure = 200; - dir = 8 + target_pressure = 200 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -16116,8 +16113,8 @@ dir = 9 }, /obj/machinery/alarm{ - pixel_x = -28; - dir = 4 + dir = 4; + pixel_x = -28 }, /turf/simulated/floor/tiled, /area/hangar/intrepid) @@ -16734,7 +16731,7 @@ }, /obj/structure/lattice, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "ntJ" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 9 @@ -16984,11 +16981,11 @@ dir = 10 }, /obj/machinery/button/remote/blast_door{ + dir = 1; id = "miningmechbay"; name = "Mining Shuttle Bay"; pixel_y = -25; - req_access = list(48); - dir = 1 + req_access = list(48) }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -17210,8 +17207,8 @@ }, /obj/structure/cable, /obj/machinery/camera/network/engineering{ - c_tag = "Engineering - Deck 1 - Hangar Substation"; alarm_on = 1; + c_tag = "Engineering - Deck 1 - Hangar Substation"; dir = 4 }, /turf/simulated/floor/plating, @@ -17426,8 +17423,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ - req_access = list(26, 31, 48, 67); - name = "Cargo Bay Maintenance" + name = "Cargo Bay Maintenance"; + req_access = list(26, 31, 48, 67) }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, @@ -17483,12 +17480,12 @@ }, /obj/structure/lattice, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "oap" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "oaZ" = ( /obj/machinery/door/window/westright, /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -17542,8 +17539,8 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance_hatch{ - req_access = list(31); - name = "Delivery Chute Maintenance" + name = "Delivery Chute Maintenance"; + req_access = list(31) }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, @@ -17729,7 +17726,7 @@ /obj/machinery/atmospherics/pipe/zpipe/up/black, /obj/structure/lattice, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "oos" = ( /obj/machinery/door/blast/regular/open{ id = "hangarlockdown"; @@ -17739,8 +17736,8 @@ /area/hangar/intrepid) "ooy" = ( /obj/machinery/door/airlock/maintenance{ - req_one_access = list(31, 48, 67); - name = "Mining Shuttle Bay Maintenance" + name = "Mining Shuttle Bay Maintenance"; + req_one_access = list(31, 48, 67) }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, @@ -18145,7 +18142,7 @@ dir = 8 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "oPL" = ( /obj/structure/table/steel, /obj/item/device/flash/synthetic{ @@ -18398,8 +18395,8 @@ /area/turret_protected/ai_upload) "pdL" = ( /obj/structure/sink/kitchen{ - name = "sink"; dir = 8; + name = "sink"; pixel_x = 20 }, /obj/effect/floor_decal/corner/green{ @@ -18448,8 +18445,8 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning, /obj/structure/sign/fire{ - name = "\improper DANGER: THRUSTERS"; - desc = "A warning sign which reads 'DANGER: SHUTTLE THRUSTERS IN USE' and 'MIND THE DISTANCE'." + desc = "A warning sign which reads 'DANGER: SHUTTLE THRUSTERS IN USE' and 'MIND THE DISTANCE'."; + name = "\improper DANGER: THRUSTERS" }, /turf/simulated/floor/tiled, /area/hangar/operations) @@ -19103,8 +19100,8 @@ }, /obj/machinery/power/apc/super{ dir = 8; - pixel_x = -24; - name = "west bump" + name = "west bump"; + pixel_x = -24 }, /turf/simulated/floor/tiled/white, /area/operations/lower/machinist) @@ -19363,8 +19360,8 @@ /obj/item/storage/box/bodybags, /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "pQv" = ( @@ -19384,8 +19381,8 @@ dir = 8 }, /obj/machinery/alarm{ - pixel_x = 28; - dir = 8 + dir = 8; + pixel_x = 28 }, /turf/simulated/floor/tiled, /area/hangar/operations) @@ -19846,7 +19843,7 @@ "qgu" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "qhz" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/black, /obj/machinery/meter, @@ -20129,7 +20126,7 @@ dir = 4 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "qsq" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/effect/decal/fake_object{ @@ -20154,7 +20151,7 @@ }, /obj/structure/lattice, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "qtm" = ( /obj/machinery/papershredder, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -20483,15 +20480,15 @@ icon_state = "0-4" }, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "qEq" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, /obj/structure/lattice, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "qEK" = ( /obj/effect/floor_decal/corner/brown{ dir = 9 @@ -20913,7 +20910,7 @@ dir = 4 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "qZj" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -21573,7 +21570,7 @@ dir = 4 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "rEl" = ( /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; @@ -21814,9 +21811,9 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/blast/regular/open{ + dir = 4; id = "hangarlockdown"; - name = "Hangar Lockdown"; - dir = 4 + name = "Hangar Lockdown" }, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) @@ -21870,8 +21867,8 @@ dir = 8 }, /obj/machinery/door/window/eastleft{ - req_access = list(48); - name = "Tools Access" + name = "Tools Access"; + req_access = list(48) }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) @@ -21892,8 +21889,8 @@ }, /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "rSw" = ( @@ -21956,8 +21953,8 @@ dir = 4 }, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "rVm" = ( @@ -22149,8 +22146,8 @@ dir = 4 }, /obj/machinery/door/window/westleft{ - req_access = list(48); - name = "Mining Voidsuit" + name = "Mining Voidsuit"; + req_access = list(48) }, /obj/effect/floor_decal/industrial/outline, /obj/item/stack/flag/yellow, @@ -22188,7 +22185,7 @@ dir = 4 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "sfh" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -22204,8 +22201,8 @@ dir = 5 }, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "sfr" = ( @@ -22233,8 +22230,8 @@ sortType = "Deck 1 Warehouse - Operations Shuttle" }, /obj/machinery/computer/shuttle_control/lift/wall{ - shuttle_tag = "Operations Lift"; - pixel_y = 32 + pixel_y = 32; + shuttle_tag = "Operations Lift" }, /obj/effect/floor_decal/corner/brown{ dir = 5 @@ -22995,12 +22992,12 @@ dir = 4 }, /obj/machinery/button/remote/blast_door{ + dir = 8; id = "shutters_evarecharging"; name = "E.V.A. Recharging Shutters"; pixel_x = 25; pixel_y = 7; - req_access = list(18); - dir = 8 + req_access = list(18) }, /turf/simulated/floor/tiled, /area/hangar/intrepid) @@ -23068,7 +23065,7 @@ /obj/structure/lattice, /obj/structure/grille, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "sPQ" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ @@ -23393,8 +23390,8 @@ dir = 4 }, /obj/machinery/door/airlock/glass_service{ - req_access = list(26); - name = "Custodial Closet Storage" + name = "Custodial Closet Storage"; + req_access = list(26) }, /turf/simulated/floor/tiled, /area/janitor) @@ -24009,7 +24006,7 @@ }, /obj/structure/lattice/catwalk/indoor, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "tFO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -24213,10 +24210,10 @@ dir = 4 }, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Warehouse Elevator"; - req_one_access = list(26, 31, 48, 67); autoclose = 0; - dir = 1 + dir = 1; + name = "Warehouse Elevator"; + req_one_access = list(26, 31, 48, 67) }, /obj/machinery/door/firedoor/multi_tile{ dir = 1 @@ -24711,8 +24708,8 @@ /area/engineering/storage/lower) "ugW" = ( /obj/machinery/door/airlock/maintenance{ - req_one_access = list(31, 48, 67); - name = "Mining Shuttle Bay Maintenance" + name = "Mining Shuttle Bay Maintenance"; + req_one_access = list(31, 48, 67) }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, @@ -24818,9 +24815,9 @@ dir = 1 }, /obj/machinery/door/airlock/multi_tile/glass{ + autoclose = 0; name = "Warehouse Elevator"; - req_one_access = list(26, 31, 48, 67); - autoclose = 0 + req_one_access = list(26, 31, 48, 67) }, /obj/machinery/door/firedoor/multi_tile, /turf/simulated/floor/tiled/dark, @@ -25208,8 +25205,8 @@ /area/outpost/mining_main/refinery) "uBL" = ( /obj/structure/sign/securearea{ - name = "\improper DANGER: AUTOMATIC EQUIPMENT - CRUSH HAZARD sign"; - desc = "A warning sign which reads 'DANGER: AUTOMATIC EQUIPMENT STARTS AND STOPS AUTOMATICALLY' and 'CRUSH HAZARD'." + desc = "A warning sign which reads 'DANGER: AUTOMATIC EQUIPMENT STARTS AND STOPS AUTOMATICALLY' and 'CRUSH HAZARD'."; + name = "\improper DANGER: AUTOMATIC EQUIPMENT - CRUSH HAZARD sign" }, /turf/simulated/wall, /area/operations/loading) @@ -25335,8 +25332,8 @@ dir = 10 }, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "uHA" = ( @@ -25581,8 +25578,8 @@ dir = 8 }, /obj/machinery/camera/network/engineering{ - c_tag = "Engineering - Deck 1 - Second Deck Civilian Substation"; alarm_on = 1; + c_tag = "Engineering - Deck 1 - Second Deck Civilian Substation"; dir = 8 }, /obj/structure/cable, @@ -25617,7 +25614,7 @@ }, /obj/structure/lattice, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "uVF" = ( /obj/structure/shuttle_part{ icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; @@ -25813,9 +25810,9 @@ dir = 10 }, /obj/machinery/requests_console{ - pixel_y = -32; department = "Deck 1 - Pilots' Room"; - name = "Pilots' Room Requests Console" + name = "Pilots' Room Requests Console"; + pixel_y = -32 }, /turf/simulated/floor/tiled/dark, /area/hangar/control) @@ -26450,8 +26447,8 @@ dir = 10 }, /obj/structure/sign/fire{ - name = "\improper DANGER: THRUSTERS"; - desc = "A warning sign which reads 'DANGER: SHUTTLE THRUSTERS IN USE' and 'MIND THE DISTANCE'." + desc = "A warning sign which reads 'DANGER: SHUTTLE THRUSTERS IN USE' and 'MIND THE DISTANCE'."; + name = "\improper DANGER: THRUSTERS" }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning, @@ -26481,7 +26478,7 @@ }, /obj/item/hullbeacon/red, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "vHR" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -26927,14 +26924,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/janitor) -"wbm" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/alarm{ - pixel_x = 28; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/research_port) "wbO" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -27191,8 +27180,8 @@ layer = 2.9 }, /obj/machinery/alarm{ - pixel_y = -28; - dir = 1 + dir = 1; + pixel_y = -28 }, /turf/simulated/floor/tiled, /area/operations/loading) @@ -27272,9 +27261,9 @@ name = "Hangar Access" }, /obj/machinery/door/blast/regular/open{ + dir = 4; id = "hangarlockdown"; - name = "Hangar Lockdown"; - dir = 4 + name = "Hangar Lockdown" }, /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/black{ @@ -27461,7 +27450,7 @@ dir = 4 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "wuD" = ( /turf/simulated/wall, /area/hangar/intrepid) @@ -27515,7 +27504,7 @@ }, /obj/structure/lattice, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "wxs" = ( /obj/structure/railing/mapped{ dir = 4 @@ -27676,7 +27665,7 @@ "wJv" = ( /obj/structure/sign/securearea, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/horizon/exterior) +/area/template_noop) "wJK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/indoor/grate, @@ -27763,8 +27752,8 @@ dir = 1 }, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "wPo" = ( @@ -27775,8 +27764,8 @@ dir = 4 }, /obj/machinery/door/window/westleft{ - req_access = list(48); - name = "Oxygen Supplies Access" + name = "Oxygen Supplies Access"; + req_access = list(48) }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) @@ -27878,7 +27867,7 @@ dir = 6 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "wUz" = ( /obj/effect/floor_decal/corner_wide/purple/diagonal, /obj/machinery/door/window/westright{ @@ -28030,8 +28019,8 @@ "wYE" = ( /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "wYU" = ( @@ -28280,7 +28269,7 @@ /obj/structure/lattice/catwalk, /obj/item/hullbeacon/red, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "xjq" = ( /obj/structure/railing/mapped{ dir = 4 @@ -28407,8 +28396,8 @@ icon_state = "2-8" }, /turf/simulated/floor/tiled/white{ - temperature = 278.15; - name = "cooled white floor" + name = "cooled white floor"; + temperature = 278.15 }, /area/medical/morgue/lower) "xlr" = ( @@ -28523,9 +28512,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) -"xoq" = ( -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/horizon/exterior) "xoH" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 @@ -28723,10 +28709,10 @@ /obj/machinery/button/remote/airlock{ id = "port_combustion"; name = "Door Bolt Control"; + pixel_x = 39; pixel_y = 8; req_access = list(10); - specialfunctions = 4; - pixel_x = 39 + specialfunctions = 4 }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) @@ -28793,8 +28779,8 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/small, /obj/machinery/alarm{ - pixel_x = -28; - dir = 4 + dir = 4; + pixel_x = -28 }, /obj/machinery/door/window/eastright{ name = "Auxiliary Freezer Access"; @@ -28804,8 +28790,8 @@ /area/horizon/hydroponics/lower) "xzd" = ( /obj/machinery/alarm{ - pixel_x = -28; - dir = 4 + dir = 4; + pixel_x = -28 }, /obj/effect/floor_decal/corner/green/diagonal, /obj/effect/floor_decal/spline/plain{ @@ -28962,11 +28948,11 @@ pixel_y = 32 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "xGQ" = ( /obj/machinery/alarm{ - pixel_y = -28; - dir = 1 + dir = 1; + pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -29433,9 +29419,9 @@ dir = 4 }, /obj/machinery/camera/network/engineering{ + alarm_on = 1; c_tag = "Engineering - Deck 1 - Atmospherics Substation"; - dir = 8; - alarm_on = 1 + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering/lower) @@ -29483,8 +29469,8 @@ /area/maintenance/engineering) "xXO" = ( /obj/effect/map_effect/airlock/w_to_e/long/square/wide{ - radio_frequency = 1003; - name = "Deck 1 Port Maintenance Airlock (1003)" + name = "Deck 1 Port Maintenance Airlock (1003)"; + radio_frequency = 1003 }, /turf/simulated/wall/r_wall, /area/turret_protected/ai) @@ -37281,11 +37267,11 @@ hTk kVe kVe kVe -xoq +hob kVe kVe kVe -xoq +hob kVe kVe kVe @@ -55239,7 +55225,7 @@ tFd grP wJK iSc -wbm +xgm hgR eGG pom @@ -59498,17 +59484,17 @@ wcU oRg oFI ozE -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV hTk tGA qBU @@ -59700,17 +59686,17 @@ oAS oRg oFI ozE -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV xst suT gIr @@ -59902,17 +59888,17 @@ elM oRg eKs ozE -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV xst eVE gIr @@ -60104,17 +60090,17 @@ oAS oRg oFI ozE -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV xst dob ezh @@ -60306,17 +60292,17 @@ oAS sys oFI ozE -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV xst ckY qBU @@ -60508,17 +60494,17 @@ oVl oVl oVl ozE -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV hoV -bQu -bQu -bQu +eSV +eSV +eSV hTk sBx qBU @@ -60713,11 +60699,11 @@ ozE hoV hoV hoV -xoq +hob hoV hoV hoV -xoq +hob hoV hoV hoV diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index fb169eed701..bea13af698e 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -164,11 +164,11 @@ /obj/structure/lattice/catwalk, /obj/machinery/shield_diffuser, /obj/structure/sign/drop{ - name = "\improper DANGER: MASS EJECTOR PATH sign"; - desc = "A warning sign which reads 'DANGER: MASS EJECTOR PATH ON THIS SIGN'." + desc = "A warning sign which reads 'DANGER: MASS EJECTOR PATH ON THIS SIGN'."; + name = "\improper DANGER: MASS EJECTOR PATH sign" }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "adw" = ( /obj/effect/floor_decal/spline/fancy{ dir = 10 @@ -310,7 +310,7 @@ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "aic" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/iv_drip, @@ -929,7 +929,7 @@ /obj/structure/lattice, /obj/structure/grille, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "avy" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/light{ @@ -1191,8 +1191,8 @@ pixel_y = 16 }, /obj/item/reagent_containers/food/condiment/shaker/peppermill{ - pixel_y = 16; - pixel_x = 4 + pixel_x = 4; + pixel_y = 16 }, /turf/simulated/floor/wood, /area/horizon/bar) @@ -2420,7 +2420,7 @@ "beY" = ( /obj/structure/grille, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "bff" = ( /obj/machinery/camera/network/command{ c_tag = "AI Core - External"; @@ -2667,7 +2667,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/structure/sign/emerg_exitZ, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "bmM" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4946,9 +4946,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) -"cEG" = ( -/turf/template_noop, -/area/horizon/exterior) "cGd" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/window/reinforced, @@ -5308,7 +5305,7 @@ /obj/structure/lattice/catwalk, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "cQd" = ( /obj/structure/flora/pottedplant/random, /turf/simulated/floor/tiled, @@ -6072,7 +6069,7 @@ }, /obj/structure/lattice/catwalk, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "dlG" = ( /obj/structure/sink/kitchen{ dir = 8; @@ -6232,7 +6229,7 @@ /obj/structure/lattice, /obj/structure/grille, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "dpE" = ( /obj/structure/cable{ icon_state = "1-8" @@ -7184,8 +7181,8 @@ id = "engine_electrical_maintenance"; name = "Door Bolt Control"; pixel_y = -25; - specialfunctions = 4; - req_one_access = list(11, 24) + req_one_access = list(11, 24); + specialfunctions = 4 }, /turf/simulated/floor/tiled, /area/engineering/smes) @@ -7220,7 +7217,7 @@ "dUw" = ( /obj/structure/lattice, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "dVc" = ( /obj/machinery/light{ dir = 1 @@ -7256,8 +7253,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 8; - name = "Kitchen Desk Shutter"; - id = "shutters_deck2_kitchendesk" + id = "shutters_deck2_kitchendesk"; + name = "Kitchen Desk Shutter" }, /turf/simulated/floor/tiled/dark, /area/horizon/kitchen) @@ -7278,14 +7275,14 @@ dir = 1 }, /obj/structure/sign/securearea{ - pixel_y = 32; + desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'."; name = "\improper BRIG COMMUNAL AREA sign"; - desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'." + pixel_y = 32 }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "dVN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7729,7 +7726,7 @@ }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "elh" = ( /obj/structure/stairs/north, /turf/simulated/floor/tiled/ramp, @@ -8770,7 +8767,7 @@ dir = 10 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "eUa" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -9203,7 +9200,7 @@ dir = 1 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "fdE" = ( /obj/structure/closet/walllocker/medical/secure{ name = "Medication Closet"; @@ -9310,8 +9307,8 @@ pixel_y = 24 }, /obj/machinery/reagentgrinder{ - pixel_y = 18; - pixel_x = 4 + pixel_x = 4; + pixel_y = 18 }, /obj/structure/cable/green{ icon_state = "0-2" @@ -9893,7 +9890,7 @@ }, /obj/structure/lattice/catwalk/indoor, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "fxe" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 10 @@ -10080,7 +10077,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark/airless, -/area/horizon/exterior) +/area/template_noop) "fDV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -10294,7 +10291,7 @@ }, /obj/structure/lattice/catwalk/indoor, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "fJX" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 10 @@ -10680,7 +10677,7 @@ dir = 9 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "fRi" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -11373,7 +11370,7 @@ pixel_y = 16 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "ghX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11524,7 +11521,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /obj/structure/lattice, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "gmt" = ( /obj/structure/table/standard, /obj/machinery/light_switch{ @@ -12870,7 +12867,7 @@ /obj/structure/lattice/catwalk, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "gUn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -13582,7 +13579,7 @@ dir = 4 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "hoe" = ( /obj/structure/foamedmetal, /turf/simulated/floor/plating, @@ -13800,7 +13797,7 @@ dir = 5 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "htd" = ( /turf/simulated/floor/holofloor/tiled/ramp/bottom, /area/horizon/stairwell/bridge) @@ -13887,7 +13884,7 @@ }, /obj/structure/lattice, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "hww" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -14081,7 +14078,7 @@ "hBN" = ( /obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "hBQ" = ( /obj/machinery/alarm{ pixel_y = 28 @@ -14202,7 +14199,7 @@ dir = 5 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "hEd" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 @@ -14800,7 +14797,7 @@ }, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "hUP" = ( /obj/structure/railing/mapped{ dir = 4 @@ -16983,9 +16980,9 @@ "jki" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/sign/securearea{ - pixel_y = 32; + desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'."; name = "\improper BRIG COMMUNAL AREA sign"; - desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'." + pixel_y = 32 }, /obj/machinery/light/small/emergency{ dir = 1 @@ -16994,7 +16991,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "jko" = ( /obj/machinery/light{ dir = 4 @@ -17067,7 +17064,7 @@ /obj/structure/lattice, /obj/structure/lattice, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "jmp" = ( /obj/structure/table/standard, /obj/item/storage/box/snack{ @@ -18080,7 +18077,7 @@ }, /obj/structure/lattice/catwalk, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "jPb" = ( /obj/effect/floor_decal/corner_wide/paleblue{ dir = 9 @@ -18098,7 +18095,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "jPj" = ( /obj/machinery/atm{ pixel_x = 32 @@ -18693,12 +18690,12 @@ /area/crew_quarters/heads/hos) "kgp" = ( /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "kgH" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/vending/dinnerware{ - pixel_y = 24; - density = 0 + density = 0; + pixel_y = 24 }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) @@ -18728,8 +18725,8 @@ pixel_y = 18 }, /obj/structure/sign/double/barsign{ - pixel_y = 32; - pixel_x = -32 + pixel_x = -32; + pixel_y = 32 }, /turf/simulated/floor/tiled/dark, /area/horizon/bar) @@ -18814,16 +18811,16 @@ /obj/machinery/button/remote/blast_door{ id = "shutters_deck2_barwindows"; name = "Bar Viewing Shutters"; - req_access = list(25); + pixel_x = 7; pixel_y = 35; - pixel_x = 7 + req_access = list(25) }, /obj/machinery/button/remote/blast_door{ id = "shutters_deck2_bardesk"; name = "Bar Desk Shutter"; - req_access = list(25); + pixel_x = -4; pixel_y = 35; - pixel_x = -4 + req_access = list(25) }, /turf/simulated/floor/lino/grey, /area/horizon/bar) @@ -19037,7 +19034,7 @@ /area/engineering/engine_room) "kuh" = ( /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "kur" = ( /obj/machinery/door/airlock/maintenance{ req_access = list(47) @@ -19464,7 +19461,7 @@ /obj/structure/lattice, /obj/structure/lattice, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "kIp" = ( /turf/simulated/floor/tiled, /area/operations/break_room) @@ -19762,8 +19759,8 @@ pixel_y = 16 }, /obj/item/reagent_containers/food/condiment/shaker/peppermill{ - pixel_y = 16; - pixel_x = 4 + pixel_x = 4; + pixel_y = 16 }, /turf/simulated/floor/wood, /area/horizon/bar) @@ -19825,7 +19822,7 @@ "kUf" = ( /obj/structure/lattice/catwalk, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "kUp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ @@ -20134,11 +20131,11 @@ "lcu" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/sign/drop{ - name = "\improper DANGER: MASS EJECTOR PATH sign"; - desc = "A warning sign which reads 'DANGER: MASS EJECTOR PATH ON THIS SIGN'." + desc = "A warning sign which reads 'DANGER: MASS EJECTOR PATH ON THIS SIGN'."; + name = "\improper DANGER: MASS EJECTOR PATH sign" }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "lcy" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -20573,7 +20570,7 @@ }, /obj/structure/lattice, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "lqJ" = ( /obj/effect/floor_decal/corner/lime/full{ dir = 8 @@ -20895,7 +20892,7 @@ "lBV" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "lBW" = ( /obj/effect/decal/cleanable/dirt, /obj/random/junk, @@ -21191,7 +21188,7 @@ "lJE" = ( /obj/structure/lattice/catwalk, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "lJP" = ( /obj/structure/cable{ icon_state = "2-4" @@ -21573,16 +21570,16 @@ "lSo" = ( /obj/structure/table/wood, /obj/item/flame/candle{ - pixel_y = 8; - pixel_x = -9 + pixel_x = -9; + pixel_y = 8 }, /obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = 8; pixel_y = 7 }, /obj/item/reagent_containers/food/condiment/shaker/peppermill{ - pixel_y = 4; - pixel_x = 8 + pixel_x = 8; + pixel_y = 4 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -21665,7 +21662,7 @@ }, /obj/structure/lattice, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "lVe" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/machinery/hologram/holopad, @@ -22194,8 +22191,8 @@ /obj/effect/floor_decal/corner/grey/full, /obj/structure/table/stone/marble, /obj/machinery/alarm{ - pixel_x = -28; - dir = 4 + dir = 4; + pixel_x = -28 }, /turf/simulated/floor/lino/grey, /area/horizon/bar) @@ -22328,7 +22325,7 @@ dir = 8 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "mpD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22341,7 +22338,7 @@ "mpN" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "mpV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22885,7 +22882,7 @@ /obj/structure/lattice, /obj/structure/lattice, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "mFD" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -23179,7 +23176,7 @@ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "mMf" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/corner/brown/diagonal, @@ -24133,8 +24130,8 @@ /area/horizon/kitchen) "nhS" = ( /obj/machinery/power/apc{ - pixel_x = 24; - dir = 4 + dir = 4; + pixel_x = 24 }, /obj/structure/cable/green{ icon_state = "0-8" @@ -25059,7 +25056,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "nJq" = ( /obj/machinery/door/airlock/multi_tile/glass, /obj/machinery/door/firedoor/multi_tile, @@ -25090,7 +25087,7 @@ dir = 4 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "nKc" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 4 @@ -25209,7 +25206,7 @@ dir = 1 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "nNv" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 6 @@ -25259,7 +25256,7 @@ "nPG" = ( /obj/structure/lattice/catwalk/indoor, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "nQm" = ( /turf/simulated/wall, /area/maintenance/substation/medical) @@ -26678,7 +26675,7 @@ dir = 4 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "oGm" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -26819,8 +26816,8 @@ /obj/structure/table/stone/marble, /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ - name = "Kitchen Desk Shutter"; - id = "shutters_deck2_kitchendesk" + id = "shutters_deck2_kitchendesk"; + name = "Kitchen Desk Shutter" }, /turf/simulated/floor/tiled/dark, /area/horizon/kitchen) @@ -26877,7 +26874,7 @@ /area/maintenance/wing/port/far) "oKP" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/horizon/exterior) +/area/template_noop) "oKR" = ( /obj/machinery/light/small/emergency, /obj/effect/floor_decal/industrial/warning{ @@ -27139,7 +27136,7 @@ }, /obj/structure/lattice, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "oTa" = ( /turf/simulated/floor/tiled, /area/maintenance/aux_atmospherics/deck_2/starboard/wing) @@ -27156,8 +27153,8 @@ dir = 6 }, /obj/machinery/power/apc{ - pixel_x = 24; - dir = 4 + dir = 4; + pixel_x = 24 }, /obj/structure/cable/green, /obj/effect/floor_decal/industrial/outline/yellow, @@ -27207,8 +27204,8 @@ }, /obj/machinery/door/firedoor, /obj/item/flame/candle{ - pixel_y = 16; - pixel_x = -11 + pixel_x = -11; + pixel_y = 16 }, /turf/simulated/floor/tiled/dark, /area/horizon/bar) @@ -27310,8 +27307,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters/open{ dir = 2; - name = "Viewing Shutter"; - id = "shutters_deck2_kitchenwindows" + id = "shutters_deck2_kitchenwindows"; + name = "Viewing Shutter" }, /turf/simulated/floor/plating, /area/horizon/kitchen/hallway) @@ -27571,7 +27568,7 @@ "pep" = ( /obj/effect/floor_decal/industrial/warning/cee, /turf/simulated/floor/tiled/dark/airless, -/area/horizon/exterior) +/area/template_noop) "pev" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 1 @@ -28028,7 +28025,7 @@ dir = 1 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "pqE" = ( /obj/structure/closet/toolcloset, /obj/machinery/power/apc{ @@ -28574,8 +28571,8 @@ pixel_y = -8 }, /obj/machinery/door/blast/shutters{ - name = "Kitchen Desk Shutter"; - id = "shutters_deck2_kitchendesk" + id = "shutters_deck2_kitchendesk"; + name = "Kitchen Desk Shutter" }, /turf/simulated/floor/tiled/dark, /area/horizon/kitchen) @@ -28585,15 +28582,15 @@ dir = 1 }, /obj/structure/sign/securearea{ - pixel_y = 32; + desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'."; name = "\improper BRIG COMMUNAL AREA sign"; - desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'." + pixel_y = 32 }, /obj/structure/railing/mapped{ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "pGX" = ( /obj/structure/disposalpipe/segment, /obj/structure/railing/mapped{ @@ -28964,7 +28961,7 @@ /obj/structure/lattice, /obj/structure/lattice, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "pQj" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29364,7 +29361,7 @@ dir = 1 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "qav" = ( /turf/simulated/wall, /area/assembly/chargebay) @@ -29498,7 +29495,7 @@ /obj/structure/lattice, /obj/machinery/shield_diffuser, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "qff" = ( /obj/machinery/light{ dir = 4 @@ -30197,8 +30194,8 @@ }, /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/closet/walllocker{ - pixel_y = 32; - name = "wall cabinet" + name = "wall cabinet"; + pixel_y = 32 }, /obj/random/arcade, /obj/random/arcade, @@ -31036,7 +31033,7 @@ dir = 1 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "qXx" = ( /obj/effect/floor_decal/corner/brown{ dir = 1 @@ -31638,8 +31635,8 @@ "rmG" = ( /obj/machinery/door/window/brigdoor/eastleft{ dir = 1; - req_one_access = list(11, 24); - req_access = null + req_access = null; + req_one_access = list(11, 24) }, /turf/simulated/floor/plating, /area/engineering/engine_room) @@ -31737,7 +31734,7 @@ dir = 10 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "roP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -31916,7 +31913,7 @@ }, /obj/structure/lattice, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "rsp" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -32177,7 +32174,7 @@ /obj/structure/railing/mapped, /obj/item/hullbeacon/red, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "rzm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32232,7 +32229,7 @@ dir = 6 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "rBi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32422,14 +32419,14 @@ "rGj" = ( /obj/structure/table/stone/marble, /obj/machinery/chemical_dispenser/bar_soft/full{ - pixel_y = 4; dir = 8; - pixel_x = -4 + pixel_x = -4; + pixel_y = 4 }, /obj/machinery/door/blast/shutters{ - name = "Kitchen Desk Shutter"; + dir = 8; id = "shutters_deck2_kitchendesk"; - dir = 8 + name = "Kitchen Desk Shutter" }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, @@ -32649,7 +32646,7 @@ }, /obj/structure/lattice, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "rNe" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d2-1-f" @@ -32897,8 +32894,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 8; - name = "SmartHeater Shutter"; - id = "shutters_deck2_kitchenheater" + id = "shutters_deck2_kitchenheater"; + name = "SmartHeater Shutter" }, /turf/simulated/floor/tiled/dark, /area/horizon/kitchen) @@ -33052,7 +33049,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "rVL" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/dark, @@ -33078,7 +33075,7 @@ }, /obj/structure/lattice/catwalk/indoor, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "rWp" = ( /obj/structure/foamedmetal, /obj/structure/shuttle_part/scc_space_ship{ @@ -33223,7 +33220,7 @@ /obj/structure/lattice, /obj/structure/grille, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "saJ" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, @@ -33564,11 +33561,11 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/shield_diffuser, /obj/structure/sign/drop{ - name = "\improper DANGER: MASS EJECTOR PATH sign"; - desc = "A warning sign which reads 'DANGER: MASS EJECTOR PATH ON THIS SIGN'." + desc = "A warning sign which reads 'DANGER: MASS EJECTOR PATH ON THIS SIGN'."; + name = "\improper DANGER: MASS EJECTOR PATH sign" }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "slm" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -33961,9 +33958,9 @@ "swH" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /obj/machinery/door/blast/shutters/open{ - name = "Viewing Shutter"; dir = 4; - id = "shutters_deck2_barwindows" + id = "shutters_deck2_barwindows"; + name = "Viewing Shutter" }, /turf/simulated/floor/tiled/dark, /area/horizon/bar) @@ -34561,9 +34558,9 @@ /area/engineering/engine_room) "sSZ" = ( /obj/machinery/light_switch{ + dir = 4; pixel_x = -24; - pixel_y = 9; - dir = 4 + pixel_y = 9 }, /obj/machinery/camera/network/service{ c_tag = "Dinner - Kitchen Freezer"; @@ -34673,7 +34670,7 @@ }, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "sVB" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/railing/mapped, @@ -34717,7 +34714,7 @@ dir = 1 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "sXb" = ( /obj/structure/railing/mapped{ dir = 4 @@ -34824,7 +34821,7 @@ /obj/machinery/door/window/westright, /obj/structure/lattice/catwalk, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "tae" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -35434,7 +35431,7 @@ "tqC" = ( /obj/effect/shuttle_landmark/ccia/dock, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "tqF" = ( /obj/structure/table/standard, /obj/item/reagent_containers/glass/beaker/large, @@ -35474,7 +35471,7 @@ dir = 1 }, /turf/simulated/floor/tiled/dark/airless, -/area/horizon/exterior) +/area/template_noop) "tsA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -35583,7 +35580,7 @@ dir = 1 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "tvX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -36106,8 +36103,8 @@ /area/medical/pharmacy) "tJB" = ( /obj/machinery/door/airlock/maintenance{ - req_access = list(24); - name = "Atmospherics Locker Room Maintenance" + name = "Atmospherics Locker Room Maintenance"; + req_access = list(24) }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) @@ -36219,7 +36216,7 @@ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "tME" = ( /obj/effect/floor_decal/corner/mauve{ dir = 9 @@ -36972,7 +36969,7 @@ dir = 6 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "uiq" = ( /obj/structure/sign/nosmoking_1{ pixel_y = 32 @@ -37019,12 +37016,12 @@ /obj/machinery/light, /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/button/remote/airlock{ + dir = 4; id = "dinerbolt"; name = "Entrance Door Bolt Control"; pixel_x = -35; - specialfunctions = 4; - dir = 4; - pixel_y = 2 + pixel_y = 2; + specialfunctions = 4 }, /obj/machinery/button/remote/blast_door{ dir = 4; @@ -37037,20 +37034,20 @@ dir = 4; id = "shutters_deck2_kitchendesk"; name = "Desk Shutters"; - pixel_y = -9; - pixel_x = -25 + pixel_x = -25; + pixel_y = -9 }, /obj/machinery/button/remote/blast_door{ dir = 4; id = "shutters_deck2_kitchenheater"; name = "SmartHeater Shutter"; - pixel_y = 2; - pixel_x = -25 + pixel_x = -25; + pixel_y = 2 }, /obj/machinery/light_switch{ + dir = 4; pixel_x = -29; - pixel_y = 11; - dir = 4 + pixel_y = 11 }, /obj/machinery/firealarm/south, /turf/simulated/floor/tiled/white, @@ -37127,8 +37124,8 @@ dir = 4 }, /obj/machinery/chemical_dispenser/coffeemaster/full{ - pixel_y = 4; - pixel_x = -3 + pixel_x = -3; + pixel_y = 4 }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, @@ -37317,7 +37314,7 @@ }, /obj/structure/lattice, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "upl" = ( /obj/structure/railing/mapped{ dir = 4 @@ -37646,8 +37643,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 8; - name = "Kitchen Desk Shutter"; - id = "shutters_deck2_kitchendesk" + id = "shutters_deck2_kitchendesk"; + name = "Kitchen Desk Shutter" }, /turf/simulated/floor/tiled/dark, /area/horizon/kitchen) @@ -38029,7 +38026,7 @@ network = list("Command","Bunker") }, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "uHh" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -38248,8 +38245,8 @@ pixel_y = 16 }, /obj/item/reagent_containers/food/condiment/shaker/peppermill{ - pixel_y = 16; - pixel_x = 4 + pixel_x = 4; + pixel_y = 16 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -38662,7 +38659,7 @@ pixel_y = -32 }, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "uZh" = ( /obj/machinery/light{ dir = 8 @@ -38755,7 +38752,7 @@ dir = 4 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "vbe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -38802,7 +38799,7 @@ /area/maintenance/substation/wing_starboard) "vcM" = ( /turf/simulated/floor/airless, -/area/horizon/exterior) +/area/template_noop) "vdy" = ( /obj/machinery/door/firedoor, /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ @@ -38853,7 +38850,7 @@ pixel_y = 16 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "veO" = ( /obj/structure/bed/stool/chair/padded/black{ dir = 1 @@ -38899,8 +38896,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters/open{ dir = 2; - name = "Viewing Shutter"; - id = "shutters_deck2_kitchenwindows" + id = "shutters_deck2_kitchenwindows"; + name = "Viewing Shutter" }, /turf/simulated/floor/plating, /area/horizon/kitchen) @@ -39213,7 +39210,7 @@ /obj/structure/grille, /obj/structure/grille, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "vrC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -39409,9 +39406,9 @@ /obj/machinery/door/firedoor, /obj/machinery/vending/dinnerware/plastic, /obj/machinery/door/blast/shutters{ - name = "Kitchen Desk Shutter"; + dir = 8; id = "shutters_deck2_kitchendesk"; - dir = 8 + name = "Kitchen Desk Shutter" }, /turf/simulated/floor/tiled/dark, /area/horizon/kitchen) @@ -41099,7 +41096,7 @@ /obj/structure/lattice, /obj/structure/grille/broken, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "wkN" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, /obj/effect/floor_decal/industrial/warning/corner{ @@ -41284,7 +41281,7 @@ }, /obj/structure/lattice/catwalk, /turf/space/dynamic, -/area/horizon/exterior) +/area/template_noop) "wpb" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -41637,7 +41634,7 @@ "wzs" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "wzD" = ( /obj/structure/flora/pottedplant/random, /obj/machinery/camera/network/engineering{ @@ -42954,7 +42951,7 @@ "xer" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "xeF" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/mauve/diagonal, @@ -43397,9 +43394,9 @@ icon_state = "plant-21" }, /obj/item/device/radio/intercom{ + dir = 1; name = "Station Intercom (General)"; - pixel_y = -24; - dir = 1 + pixel_y = -24 }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) @@ -43412,7 +43409,7 @@ dir = 9 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "xsY" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/industrial/outline/red, @@ -43738,8 +43735,8 @@ pixel_y = 7 }, /obj/item/reagent_containers/food/condiment/shaker/peppermill{ - pixel_y = 4; - pixel_x = -9 + pixel_x = -9; + pixel_y = 4 }, /obj/item/flame/candle{ pixel_x = -9 @@ -44150,7 +44147,7 @@ }, /obj/structure/lattice, /turf/template_noop, -/area/horizon/exterior) +/area/template_noop) "xPm" = ( /turf/simulated/wall, /area/maintenance/substation/wing_port) @@ -44795,7 +44792,7 @@ dir = 4 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "ydL" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -60918,7 +60915,7 @@ qeZ lJE oSQ oSQ -cEG +qgN vcM gWf dAN diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 5e8532e8e15..8fe6d8f458f 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -208,7 +208,7 @@ /area/crew_quarters/lounge/secondary) "at" = ( /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "au" = ( /obj/random/junk, /obj/effect/floor_decal/industrial/warning{ @@ -555,16 +555,9 @@ /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) "bb" = ( -/obj/machinery/door/airlock/external{ - frequency = 1337; - icon_state = "door_locked"; - id_tag = "green_dock_aft_exterior"; - locked = 1; - name = "Emergency Services Dock"; - req_access = list(13) - }, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry/emergency) +/obj/effect/shuttle_landmark/legion/green, +/turf/simulated/floor/reinforced/airless, +/area/template_noop) "bc" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -1052,7 +1045,7 @@ dir = 1 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "bV" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -1240,7 +1233,7 @@ "cq" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "cr" = ( /obj/structure/bookcase, /obj/item/book/manual/robotics_cyborgs, @@ -2216,7 +2209,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/mop, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "dX" = ( /obj/structure/table/reinforced/wood, /obj/machinery/computer/guestpass{ @@ -2265,7 +2258,7 @@ dir = 8 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "eb" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, /obj/structure/lattice/catwalk/indoor/grate, @@ -2691,7 +2684,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, -/obj/machinery/light{ +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/tiled, @@ -2799,7 +2792,7 @@ "fh" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "fi" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/paleblue{ @@ -2856,7 +2849,7 @@ }, /obj/structure/lattice, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "fn" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 4 @@ -3002,6 +2995,18 @@ /obj/machinery/telecomms/server/presets/command, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) +"fE" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/structure/bed/stool/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/emergency) "fF" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4208,11 +4213,16 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/camera/network/third_deck{ c_tag = "Third Deck - Emergency Service Dock Port"; dir = 1 }, +/obj/structure/bed/stool/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "hX" = ( @@ -5505,7 +5515,7 @@ "kh" = ( /obj/effect/shuttle_landmark/merc_ship/dock, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "ki" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -5792,9 +5802,13 @@ /turf/simulated/floor/tiled, /area/bridge) "kI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "kJ" = ( @@ -7054,12 +7068,7 @@ dir = 1; pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/structure/bed/stool/chair{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "nc" = ( @@ -7994,7 +8003,7 @@ }, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "oL" = ( /obj/structure/railing/mapped{ dir = 8 @@ -8379,7 +8388,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "px" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8444,7 +8453,7 @@ "pE" = ( /obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "pF" = ( /obj/structure/filingcabinet{ pixel_x = -8 @@ -8560,7 +8569,7 @@ dir = 4 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "pQ" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -8607,23 +8616,22 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "pU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/external{ frequency = 1337; icon_state = "door_locked"; - id_tag = "green_dock_aft_interior"; + id_tag = "green_dock_aft_exterior"; locked = 1; name = "Emergency Services Dock"; req_access = list(13) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_exterior"; frequency = 1337; layer = 3.4; master_tag = "green_dock_aft_airlock"; - name = "interior access button"; - pixel_x = 26; - pixel_y = -7; + name = "exterior access button"; + pixel_x = -27; + pixel_y = 7; req_access = list(13) }, /turf/simulated/floor/plating, @@ -9136,7 +9144,7 @@ dir = 8 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "qY" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -10116,7 +10124,7 @@ "sP" = ( /obj/structure/lattice, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "sQ" = ( /obj/structure/filingcabinet/filingcabinet{ pixel_x = -9; @@ -10804,9 +10812,16 @@ /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/showers) "tW" = ( -/obj/effect/shuttle_landmark/legion/green, -/turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/obj/machinery/door/airlock/external{ + frequency = 1337; + icon_state = "door_locked"; + id_tag = "green_dock_aft_exterior"; + locked = 1; + name = "Emergency Services Dock"; + req_access = list(13) + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry/emergency) "tX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11204,7 +11219,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "uN" = ( /turf/simulated/floor, /area/maintenance/bridge) @@ -12002,7 +12017,7 @@ /obj/item/hullbeacon/red, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "wl" = ( /obj/structure/railing/mapped{ dir = 1 @@ -12590,7 +12605,7 @@ "xo" = ( /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "xp" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/crew_quarters/fitness/lounge) @@ -13308,7 +13323,7 @@ pixel_y = 16 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "yG" = ( /obj/structure/table/wood, /obj/machinery/chemical_dispenser/coffee, @@ -13332,7 +13347,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "yJ" = ( /obj/machinery/light{ dir = 8 @@ -13369,7 +13384,7 @@ "yM" = ( /obj/structure/lattice/catwalk, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "yN" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -13768,7 +13783,7 @@ dir = 1 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "zz" = ( /obj/structure/railing/mapped{ dir = 8 @@ -14057,9 +14072,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/structure/bed/stool/chair{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "Ab" = ( @@ -15169,7 +15181,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/toy/figure/janitor, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Co" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -15904,7 +15916,7 @@ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "DM" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 8 @@ -16101,15 +16113,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) -"Eg" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/entry/emergency) "Eh" = ( /turf/simulated/wall/r_wall, /area/medical/ward/isolation) @@ -16184,7 +16187,7 @@ /obj/effect/floor_decal/industrial/warning/full, /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Eo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning{ @@ -18126,7 +18129,7 @@ dir = 1 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "HO" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18747,23 +18750,18 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "IR" = ( -/obj/machinery/door/airlock/external{ +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ frequency = 1337; - icon_state = "door_locked"; - id_tag = "green_dock_aft_exterior"; - locked = 1; - name = "Emergency Services Dock"; - req_access = list(13) + id_tag = "green_dock_aft_pump" }, -/obj/machinery/access_button{ - command = "cycle_exterior"; +/obj/machinery/airlock_sensor{ frequency = 1337; + id_tag = "green_dock_aft_sensor"; layer = 3.4; - master_tag = "green_dock_aft_airlock"; - name = "exterior access button"; - pixel_x = -27; - pixel_y = 7; - req_access = list(13) + pixel_x = -28 + }, +/obj/machinery/light/small/emergency{ + dir = 8 }, /turf/simulated/floor/plating, /area/hallway/secondary/entry/emergency) @@ -19090,7 +19088,7 @@ /obj/structure/lattice/catwalk, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "Jw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -19426,11 +19424,11 @@ }, /obj/item/hullbeacon/red, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "JZ" = ( /obj/structure/railing/mapped, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Ka" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 @@ -19811,7 +19809,7 @@ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "KO" = ( /obj/structure/railing/mapped, /obj/structure/railing/mapped{ @@ -20049,7 +20047,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Ll" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /turf/simulated/floor, @@ -20646,14 +20644,14 @@ dir = 10 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Mp" = ( /obj/structure/railing/mapped{ dir = 8 }, /obj/structure/lattice/catwalk, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "Mq" = ( /obj/machinery/alarm{ pixel_y = 28 @@ -20972,7 +20970,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "MR" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ id = "Recovery1" @@ -21108,12 +21106,12 @@ "Ne" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/sign/securearea{ - name = "\improper BRIG COMMUNAL AREA sign"; - desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'." + desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'."; + name = "\improper BRIG COMMUNAL AREA sign" }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Nf" = ( /obj/structure/railing/mapped{ dir = 4 @@ -21223,7 +21221,7 @@ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Nq" = ( /turf/simulated/wall, /area/crew_quarters/lounge/secondary) @@ -21652,7 +21650,7 @@ dir = 8 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "Oc" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22542,7 +22540,7 @@ dir = 6 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "PG" = ( /obj/structure/railing/mapped{ dir = 1 @@ -22658,7 +22656,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "PQ" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -23435,7 +23433,7 @@ "Rh" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Ri" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -23896,13 +23894,13 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Sb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Sc" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -24245,7 +24243,7 @@ dir = 4 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "SM" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -24541,7 +24539,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Ts" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -24663,7 +24661,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "TD" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/item/bedsheet/medical{ @@ -24678,7 +24676,7 @@ dir = 1 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "TF" = ( /obj/structure/bed/stool/chair{ dir = 1 @@ -24911,6 +24909,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/structure/bed/stool/chair{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "Ug" = ( @@ -24957,7 +24958,7 @@ dir = 9 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Uk" = ( /obj/effect/floor_decal/spline/fancy{ dir = 1 @@ -25398,7 +25399,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/template_noop) "UZ" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -25830,7 +25831,7 @@ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "VN" = ( /obj/effect/floor_decal/corner/blue/diagonal, /obj/structure/closet/emcloset, @@ -25977,7 +25978,7 @@ "Wb" = ( /obj/effect/shuttle_landmark/ert/dock, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Wc" = ( /obj/structure/table/wood, /obj/item/material/ashtray/bronze, @@ -26137,7 +26138,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/template_noop) "Wv" = ( /obj/machinery/shieldwallgen, /obj/effect/floor_decal/corner/yellow/diagonal, @@ -26157,13 +26158,9 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "Wx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "Wy" = ( @@ -27093,18 +27090,24 @@ /turf/simulated/floor/tiled/dark, /area/horizon/hallway/deck_three/primary/starboard) "Yc" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/external{ frequency = 1337; - id_tag = "green_dock_aft_pump" + icon_state = "door_locked"; + id_tag = "green_dock_aft_interior"; + locked = 1; + name = "Emergency Services Dock"; + req_access = list(13) }, -/obj/machinery/airlock_sensor{ +/obj/machinery/access_button{ + command = "cycle_interior"; frequency = 1337; - id_tag = "green_dock_aft_sensor"; layer = 3.4; - pixel_x = -28 - }, -/obj/machinery/light/small/emergency{ - dir = 8 + master_tag = "green_dock_aft_airlock"; + name = "interior access button"; + pixel_x = 26; + pixel_y = -7; + req_access = list(13) }, /turf/simulated/floor/plating, /area/hallway/secondary/entry/emergency) @@ -54549,10 +54552,10 @@ at at at at -yP -yP -yP -Eg +at +at +Cu +Wx sa Gr if @@ -54747,15 +54750,15 @@ at at at at -tW at at at -IR -Yc -KE +at +at +at +Cu Wx -IY +fE Gr Lo Fo @@ -54953,9 +54956,9 @@ at at at at -bb -Kv -pU +at +at +Cu Wx hW Gr @@ -55155,10 +55158,10 @@ at at at at -yP -yP -yP -Eg +at +at +Cu +Wx Uf Gr Lo @@ -55357,9 +55360,9 @@ at at at at -at -at -Cu +yP +yP +yP eS iJ Gr @@ -55555,15 +55558,15 @@ at at at at +bb at at at -at -at -at -Cu +pU +IR +KE kI -Aa +IY Gr Lo Fj @@ -55761,9 +55764,9 @@ at at at at -at -at -yP +tW +Kv +Yc kI nb Gr @@ -55963,10 +55966,10 @@ at at at at -at -at yP -kI +yP +yP +eS Aa Gr Lo @@ -56167,7 +56170,7 @@ at at at at -yP +Cu LI IY Gr diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index e5debacf7bf..0226b04bb6c 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -34108,13 +34108,13 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/distress) "bCB" = ( -/obj/item/modular_computer/console/preset/command/teleporter, +/obj/item/modular_computer/console/preset/command/teleporter/ninja, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, /area/antag/ninja) "bCC" = ( -/obj/machinery/teleport/pad, +/obj/machinery/teleport/pad/ninja, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, diff --git a/vueui/src/components/view/vehicles/droppod.vue b/vueui/src/components/view/vehicles/droppod.vue index 6f32bdd710d..e29a9b28dfb 100644 --- a/vueui/src/components/view/vehicles/droppod.vue +++ b/vueui/src/components/view/vehicles/droppod.vue @@ -6,9 +6,9 @@
Pod status: Operational.
-
Departures
-
Cargo Surface
-
Command Surface
+
Recreational Areas
+
Operations
+
Starboard Wing Frame Interior
Pod status: Non-operational.