From 7294cec55f27ad51b17089e4641c8643dcaaea10 Mon Sep 17 00:00:00 2001 From: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com> Date: Sat, 29 Aug 2020 01:11:50 -0400 Subject: [PATCH 01/28] Emergency Talon Fixs Fixed the Robco machine from locking out Talon crew, preventing them from accessing critical supplies. Moved a few fire lockers around to prevent certain items initializing within them. --- maps/offmap_vr/talon/talon1.dmm | 25 ++++++++++++------------- maps/offmap_vr/talon/talon2.dmm | 30 +++++++++++++++--------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/maps/offmap_vr/talon/talon1.dmm b/maps/offmap_vr/talon/talon1.dmm index 7f51d46c22..1bb3cc871f 100644 --- a/maps/offmap_vr/talon/talon1.dmm +++ b/maps/offmap_vr/talon/talon1.dmm @@ -742,7 +742,8 @@ "bE" = ( /obj/machinery/vending/engineering{ products = list(/obj/item/clothing/under/rank/chief_engineer = 4, /obj/item/clothing/under/rank/engineer = 4, /obj/item/clothing/shoes/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/weapon/storage/belt/utility = 4, /obj/item/clothing/glasses/meson = 4, /obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/tool/screwdriver = 12, /obj/item/weapon/tool/crowbar = 12, /obj/item/weapon/tool/wirecutters = 12, /obj/item/device/multitool = 12, /obj/item/weapon/tool/wrench = 12, /obj/item/device/t_scanner = 12, /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/weapon/light/tube = 10, /obj/item/clothing/head/hardhat/red = 4, /obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5, /obj/item/weapon/stock_parts/micro_laser = 5, /obj/item/weapon/stock_parts/matter_bin = 5, /obj/item/weapon/stock_parts/manipulator = 5, /obj/item/weapon/stock_parts/console_screen = 5); - req_log_access = 301; + req_access = list(301); + req_log_access = list(301); req_one_access = list(301) }, /turf/simulated/floor/tiled/eris/dark/brown_platform, @@ -752,8 +753,8 @@ /obj/item/weapon/storage/toolbox/electrical, /obj/item/stack/marker_beacon/thirty, /obj/item/weapon/pipe_dispenser, -/obj/structure/closet/hydrant{ - pixel_y = 32 +/obj/machinery/alarm/talon{ + pixel_y = 28 }, /turf/simulated/floor/tiled/eris/dark/brown_platform, /area/talon/deckone/port_eng_store) @@ -1170,6 +1171,13 @@ /obj/structure/vehiclecage/spacebike, /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) +"cs" = ( +/obj/structure/closet/hydrant{ + pixel_x = -32; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/eris/dark/brown_platform, +/area/talon/deckone/port_eng_store) "cv" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/tiled/steel_ridged, @@ -4947,15 +4955,6 @@ /obj/item/weapon/pen, /turf/simulated/floor/tiled/eris/steel/cargo, /area/talon/deckone/workroom) -"Nt" = ( -/obj/machinery/alarm/talon{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/eris/dark/brown_platform, -/area/talon/deckone/port_eng_store) "Nu" = ( /obj/structure/table/standard, /obj/fiftyspawner/glass, @@ -14496,7 +14495,7 @@ dH am gU dR -Nt +cs gU NP ho diff --git a/maps/offmap_vr/talon/talon2.dmm b/maps/offmap_vr/talon/talon2.dmm index a54d134496..14a3234ed6 100644 --- a/maps/offmap_vr/talon/talon2.dmm +++ b/maps/offmap_vr/talon/talon2.dmm @@ -379,7 +379,6 @@ pixel_y = 0 }, /obj/structure/table/standard, -/obj/item/weapon/paper/talon_shields, /obj/structure/closet/hydrant{ pixel_x = 0; pixel_y = 32; @@ -667,6 +666,20 @@ }, /turf/simulated/floor/wood, /area/talon/decktwo/sec_room) +"bA" = ( +/obj/machinery/power/apc/talon{ + cell_type = /obj/item/weapon/cell/apc; + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/table/standard, +/obj/item/weapon/paper/talon_shields, +/turf/simulated/floor/tiled/eris/dark/violetcorener, +/area/talon/decktwo/tech) "bB" = ( /obj/machinery/alarm/talon{ dir = 4; @@ -2253,19 +2266,6 @@ "pi" = ( /turf/simulated/floor/hull/airless, /area/talon/maintenance/decktwo_solars) -"pp" = ( -/obj/machinery/power/apc/talon{ - cell_type = /obj/item/weapon/cell/apc; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/table/standard, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/talon/decktwo/tech) "pt" = ( /obj/effect/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ @@ -14326,7 +14326,7 @@ NT bF ds aZ -pp +bA Db iV ds From 9360642f4a6f36f02a3b795e42509da653d47133 Mon Sep 17 00:00:00 2001 From: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com> Date: Sat, 29 Aug 2020 02:12:42 -0400 Subject: [PATCH 02/28] Added Jumpkit and Robotanalyser to medbay --- maps/offmap_vr/talon/talon1.dmm | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/maps/offmap_vr/talon/talon1.dmm b/maps/offmap_vr/talon/talon1.dmm index 1bb3cc871f..48e6f5c45a 100644 --- a/maps/offmap_vr/talon/talon1.dmm +++ b/maps/offmap_vr/talon/talon1.dmm @@ -511,10 +511,14 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/brig) "bh" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/device/sleevemate, +/obj/item/weapon/storage/firstaid/surgery, +/obj/item/device/robotanalyzer{ + pixel_y = -8 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/talon/deckone/medical) "bi" = ( @@ -1178,6 +1182,14 @@ }, /turf/simulated/floor/tiled/eris/dark/brown_platform, /area/talon/deckone/port_eng_store) +"ct" = ( +/obj/structure/table/standard, +/obj/item/device/defib_kit/jumper_kit/loaded, +/obj/item/device/defib_kit/loaded, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/device/sleevemate, +/turf/simulated/floor/tiled/eris/white/bluecorner, +/area/talon/deckone/medical) "cv" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/tiled/steel_ridged, @@ -1527,14 +1539,6 @@ }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/deckone/brig) -"eV" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/turf/simulated/floor/tiled/eris/white/bluecorner, -/area/talon/deckone/medical) "fi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; @@ -17183,7 +17187,7 @@ xH aw Xd be -eV +bh dO uN SI @@ -17609,7 +17613,7 @@ dz Rk Gb bC -bh +ct dO Gt SI From 4401ff3018159ef71a85422762f6400977d66919 Mon Sep 17 00:00:00 2001 From: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com> Date: Sat, 29 Aug 2020 02:19:46 -0400 Subject: [PATCH 03/28] ... And Nanopaste. You can tell I'm doing this on the fly, huh? --- maps/offmap_vr/talon/talon1.dmm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maps/offmap_vr/talon/talon1.dmm b/maps/offmap_vr/talon/talon1.dmm index 48e6f5c45a..6ba84708aa 100644 --- a/maps/offmap_vr/talon/talon1.dmm +++ b/maps/offmap_vr/talon/talon1.dmm @@ -516,6 +516,14 @@ }, /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/surgery, +/obj/item/stack/nanopaste{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/item/stack/nanopaste{ + pixel_x = 9; + pixel_y = -4 + }, /obj/item/device/robotanalyzer{ pixel_y = -8 }, From 9841414da6d6eec349acaa0cc8aaf44add875ec5 Mon Sep 17 00:00:00 2001 From: Rykka Date: Sat, 29 Aug 2020 03:04:34 -0400 Subject: [PATCH 04/28] Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors Self-explanatory. Adds toggle to go back to the old-school SS13 legacy airlock sounds, including the glass windoor airlock sounds, and a toggle to disable the per-department door sounds, which some found jarring/unrealistic. If Per-Department sounds are disabled, the department doors will use hall1o/c for open/close respectively, following maintainer-requested behavior for these doors. This also relocates the following sounds to be inside machines/door for more consistency: - airlock.ogg - airlockclose.ogg - airlockforced.ogg - airlock_creaking.ogg - boltsup.ogg - boltsdown.ogg - blastdoorclose.ogg - blastdooropen.ogg - windowdoor.ogg --- .../technomancer/spells/audible_deception.dm | 4 +- code/game/machinery/doors/airlock.dm | 205 +++++++++++++----- code/game/machinery/doors/blast_door.dm | 10 +- code/game/machinery/doors/firedoor.dm | 4 +- code/game/machinery/doors/windowdoor.dm | 4 +- code/game/mecha/equipment/tools/clamp.dm | 6 +- code/game/mecha/mecha.dm | 2 +- code/global.dm | 2 +- .../preference_setup/global/setting_datums.dm | 12 + .../client/preferences_toggle_procs.dm | 30 +++ code/modules/flufftext/Hallucination.dm | 4 +- .../station/station_special_abilities_vr.dm | 4 +- .../machines/{ => door}/airlock_creaking.ogg | Bin sound/machines/{ => door}/airlockcycle.ogg | Bin sound/machines/{ => door}/airlockforced.ogg | Bin sound/machines/{ => door}/blastdoorclose.ogg | Bin sound/machines/{ => door}/blastdooropen.ogg | Bin sound/machines/{ => door}/boltsdown.ogg | Bin sound/machines/{ => door}/boltsup.ogg | Bin .../{airlock.ogg => door/old_airlock.ogg} | Bin .../old_airlockclose.ogg} | Bin sound/machines/{ => door}/windowdoor.ogg | Bin 22 files changed, 216 insertions(+), 71 deletions(-) rename sound/machines/{ => door}/airlock_creaking.ogg (100%) rename sound/machines/{ => door}/airlockcycle.ogg (100%) rename sound/machines/{ => door}/airlockforced.ogg (100%) rename sound/machines/{ => door}/blastdoorclose.ogg (100%) rename sound/machines/{ => door}/blastdooropen.ogg (100%) rename sound/machines/{ => door}/boltsdown.ogg (100%) rename sound/machines/{ => door}/boltsup.ogg (100%) rename sound/machines/{airlock.ogg => door/old_airlock.ogg} (100%) rename sound/machines/{airlockclose.ogg => door/old_airlockclose.ogg} (100%) rename sound/machines/{ => door}/windowdoor.ogg (100%) diff --git a/code/game/gamemodes/technomancer/spells/audible_deception.dm b/code/game/gamemodes/technomancer/spells/audible_deception.dm index 8faff2b4e6..fc67ba1ee3 100644 --- a/code/game/gamemodes/technomancer/spells/audible_deception.dm +++ b/code/game/gamemodes/technomancer/spells/audible_deception.dm @@ -25,8 +25,8 @@ "Glass Shattering" = "shatter", "Grille Damage" = 'sound/effects/grillehit.ogg', "Energy Pulse" = 'sound/effects/EMPulse.ogg', - "Airlock" = 'sound/machines/airlock.ogg', - "Airlock Creak" = 'sound/machines/airlock_creaking.ogg', + "Airlock" = 'sound/machines/door/old_airlock.ogg', + "Airlock Creak" = 'sound/machines/door/airlock_creaking.ogg', "Shotgun Pumping" = 'sound/weapons/shotgunpump.ogg', "Flash" = 'sound/weapons/flash.ogg', diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 03822a6c6d..3da717ef49 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -40,11 +40,15 @@ var/datum/wires/airlock/wires = null var/open_sound_powered = 'sound/machines/door/covert1o.ogg' - var/open_sound_unpowered = 'sound/machines/airlockforced.ogg' + var/open_sound_unpowered = 'sound/machines/door/airlockforced.ogg' var/close_sound_powered = 'sound/machines/door/covert1c.ogg' + var/legacy_open_powered = 'sound/machines/door/old_airlock.ogg' + var/legacy_close_powered = 'sound/machines/door/old_airlockclose.ogg' + var/department_open_powered = null + var/department_close_powered = null var/denied_sound = 'sound/machines/deniedbeep.ogg' - var/bolt_up_sound = 'sound/machines/boltsup.ogg' - var/bolt_down_sound = 'sound/machines/boltsdown.ogg' + var/bolt_up_sound = 'sound/machines/door/boltsup.ogg' + var/bolt_down_sound = 'sound/machines/door/boltsdown.ogg' /obj/machinery/door/airlock/attack_generic(var/mob/living/user, var/damage) if(stat & (BROKEN|NOPOWER)) @@ -81,7 +85,7 @@ if(do_after(user,5 SECONDS,src)) visible_message("\The [user] forces \the [src] open, sparks flying from its electronics!") src.do_animate("spark") - playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1, volume_channel = VOLUME_CHANNEL_DOORS) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1, volume_channel = VOLUME_CHANNEL_DOORS) src.locked = 0 src.welded = 0 update_icon() @@ -90,7 +94,7 @@ else if(src.density) visible_message("\The [user] begins forcing \the [src] open!") if(do_after(user, 5 SECONDS,src)) - playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1, volume_channel = VOLUME_CHANNEL_DOORS) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1, volume_channel = VOLUME_CHANNEL_DOORS) visible_message("\The [user] forces \the [src] open!") open(1) else @@ -112,40 +116,50 @@ icon = 'icons/obj/doors/Doorcom.dmi' req_one_access = list(access_heads) assembly_type = /obj/structure/door_assembly/door_assembly_com - open_sound_powered = 'sound/machines/door/cmd3o.ogg' - close_sound_powered = 'sound/machines/door/cmd3c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/cmd3o.ogg' + department_close_powered = 'sound/machines/door/cmd3c.ogg' /obj/machinery/door/airlock/security name = "Security Airlock" icon = 'icons/obj/doors/Doorsec.dmi' req_one_access = list(access_security) assembly_type = /obj/structure/door_assembly/door_assembly_sec - open_sound_powered = 'sound/machines/door/sec1o.ogg' - close_sound_powered = 'sound/machines/door/sec1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/sec1o.ogg' + department_close_powered = 'sound/machines/door/sec1c.ogg' /obj/machinery/door/airlock/engineering name = "Engineering Airlock" icon = 'icons/obj/doors/Dooreng.dmi' req_one_access = list(access_engine) assembly_type = /obj/structure/door_assembly/door_assembly_eng - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/engineeringatmos name = "Atmospherics Airlock" icon = 'icons/obj/doors/Doorengatmos.dmi' req_one_access = list(access_atmospherics) assembly_type = /obj/structure/door_assembly/door_assembly_eat - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/medical name = "Medical Airlock" icon = 'icons/obj/doors/Doormed.dmi' req_one_access = list(access_medical) assembly_type = /obj/structure/door_assembly/door_assembly_med - open_sound_powered = 'sound/machines/door/med1o.ogg' - close_sound_powered = 'sound/machines/door/med1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/med1o.ogg' + department_close_powered = 'sound/machines/door/med1c.ogg' /obj/machinery/door/airlock/maintenance name = "Maintenance Access" @@ -158,8 +172,10 @@ /obj/machinery/door/airlock/maintenance/cargo icon = 'icons/obj/doors/Doormaint_cargo.dmi' req_one_access = list(access_cargo) - open_sound_powered = 'sound/machines/door/door2o.ogg' - close_sound_powered = 'sound/machines/door/door2c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/door2o.ogg' + department_close_powered = 'sound/machines/door/door2c.ogg' /obj/machinery/door/airlock/maintenance/command icon = 'icons/obj/doors/Doormaint_command.dmi' @@ -220,6 +236,7 @@ hitsound = 'sound/effects/Glasshit.ogg' open_sound_powered = 'sound/machines/door/hall1o.ogg' close_sound_powered = 'sound/machines/door/hall1c.ogg' + legacy_open_powered = 'sound/machines/door/windowdoor.ogg' maxhealth = 300 explosion_resistance = 5 opacity = 0 @@ -294,8 +311,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_com glass = 1 req_one_access = list(access_heads) - open_sound_powered = 'sound/machines/door/cmd1o.ogg' - close_sound_powered = 'sound/machines/door/cmd1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/cmd1o.ogg' + department_close_powered = 'sound/machines/door/cmd1c.ogg' /obj/machinery/door/airlock/glass_engineering name = "Engineering Airlock" @@ -307,8 +326,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_eng glass = 1 req_one_access = list(access_engine) - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/glass_engineeringatmos name = "Atmospherics Airlock" @@ -320,8 +339,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_eat glass = 1 req_one_access = list(access_atmospherics) - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/glass_security name = "Security Airlock" @@ -333,8 +354,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_sec glass = 1 req_one_access = list(access_security) - open_sound_powered = 'sound/machines/door/sec1o.ogg' - close_sound_powered = 'sound/machines/door/sec1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/sec1o.ogg' + department_close_powered = 'sound/machines/door/sec1c.ogg' /obj/machinery/door/airlock/glass_medical name = "Medical Airlock" @@ -346,31 +369,39 @@ assembly_type = /obj/structure/door_assembly/door_assembly_med glass = 1 req_one_access = list(access_medical) - open_sound_powered = 'sound/machines/door/med1o.ogg' - close_sound_powered = 'sound/machines/door/med1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/med1o.ogg' + department_close_powered = 'sound/machines/door/med1c.ogg' /obj/machinery/door/airlock/mining name = "Mining Airlock" icon = 'icons/obj/doors/Doormining.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_min req_one_access = list(access_mining) - open_sound_powered = 'sound/machines/door/cgo1o.ogg' - close_sound_powered = 'sound/machines/door/cgo1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/cgo1o.ogg' + department_close_powered = 'sound/machines/door/cgo1c.ogg' /obj/machinery/door/airlock/atmos name = "Atmospherics Airlock" icon = 'icons/obj/doors/Dooratmo.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_atmo req_one_access = list(access_atmospherics) - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/research name = "Research Airlock" icon = 'icons/obj/doors/Doorresearch.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_research - open_sound_powered = 'sound/machines/door/sci1o.ogg' - close_sound_powered = 'sound/machines/door/sci1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/sci1o.ogg' + department_close_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/glass_research name = "Research Airlock" @@ -382,8 +413,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_research glass = 1 req_one_access = list(access_research) - open_sound_powered = 'sound/machines/door/sci1o.ogg' - close_sound_powered = 'sound/machines/door/sci1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/sci1o.ogg' + department_close_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/glass_mining name = "Mining Airlock" @@ -395,8 +428,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_min glass = 1 req_one_access = list(access_mining) - open_sound_powered = 'sound/machines/door/cgo1o.ogg' - close_sound_powered = 'sound/machines/door/cgo1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/cgo1o.ogg' + department_close_powered = 'sound/machines/door/cgo1c.ogg' /obj/machinery/door/airlock/glass_atmos name = "Atmospherics Airlock" @@ -408,8 +443,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_atmo glass = 1 req_one_access = list(access_atmospherics) - open_sound_powered = 'sound/machines/door/eng1o.ogg' - close_sound_powered = 'sound/machines/door/eng1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/eng1o.ogg' + department_close_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/gold name = "Gold Airlock" @@ -490,8 +527,10 @@ icon = 'icons/obj/doors/Doorsci.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_science req_one_access = list(access_research) - open_sound_powered = 'sound/machines/door/sci1o.ogg' - close_sound_powered = 'sound/machines/door/sci1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/sci1o.ogg' + department_close_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/glass_science name = "Glass Airlocks" @@ -500,8 +539,10 @@ assembly_type = /obj/structure/door_assembly/door_assembly_science glass = 1 req_one_access = list(access_research) - open_sound_powered = 'sound/machines/door/sci1o.ogg' - close_sound_powered = 'sound/machines/door/sci1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' + department_open_powered = 'sound/machines/door/sci1o.ogg' + department_close_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/highsecurity name = "Secure Airlock" @@ -1172,10 +1213,41 @@ About the new airlock wires panel: use_power(360) //360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people //if the door is unpowered then it doesn't make sense to hear the woosh of a pneumatic actuator - if(arePowerSystemsOn()) - playsound(src, open_sound_powered, 50, 1, volume_channel = VOLUME_CHANNEL_DOORS) - else - playsound(src, open_sound_unpowered, 75, 1, volume_channel = VOLUME_CHANNEL_DOORS) + for(var/P in player_list) + var/mob/M = P + if(!M || !M.client) + continue + var/old_sounds = M.client.is_preference_enabled(/datum/client_preference/old_door_sounds) + var/department_door_sounds = M.client.is_preference_enabled(/datum/client_preference/department_door_sounds) + var/sound + var/volume + if(old_sounds) // Do we have old sounds enabled? Play these even if we have department door sounds enabled. + if(arePowerSystemsOn()) + sound = legacy_open_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + else if(!old_sounds && department_door_sounds && src.department_open_powered) // Else, we have old sounds disabled, the door has per-department door sounds, and we have chosen to play department door sounds, use these. + if(arePowerSystemsOn()) + sound = department_open_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + else // Else, play these. + if(arePowerSystemsOn()) + sound = open_sound_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + + var/turf/T = get_turf(M) + var/distance = get_dist(T, get_turf(src)) + if(distance <= world.view * 2) + if(T && T.z == get_z(src)) + M.playsound_local(get_turf(src), sound, volume, 1, null, 0, TRUE, sound(sound), volume_channel = VOLUME_CHANNEL_DOORS) if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density) src.closeOther.close() @@ -1270,10 +1342,41 @@ About the new airlock wires panel: use_power(360) //360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people has_beeped = 0 - if(arePowerSystemsOn()) - playsound(src, close_sound_powered, 50, 1, volume_channel = VOLUME_CHANNEL_DOORS) - else - playsound(src, open_sound_unpowered, 75, 1, volume_channel = VOLUME_CHANNEL_DOORS) + for(var/P in player_list) + var/mob/M = P + if(!M || !M.client) + continue + var/old_sounds = M.client.is_preference_enabled(/datum/client_preference/old_door_sounds) + var/department_door_sounds = M.client.is_preference_enabled(/datum/client_preference/department_door_sounds) + var/sound + var/volume + if(old_sounds) + if(arePowerSystemsOn()) + sound = legacy_close_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + else if(!old_sounds && department_door_sounds && src.department_close_powered) // Else, we have old sounds disabled, the door has per-department door sounds, and we have chosen to play department door sounds, use these. + if(arePowerSystemsOn()) + sound = department_close_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + else + if(arePowerSystemsOn()) + sound = close_sound_powered + volume = 50 + else + sound = open_sound_unpowered + volume = 75 + + var/turf/T = get_turf(M) + var/distance = get_dist(T, get_turf(src)) + if(distance <= world.view * 2) + if(T && T.z == get_z(src)) + M.playsound_local(get_turf(src), sound, volume, 1, null, 0, TRUE, sound(sound), volume_channel = VOLUME_CHANNEL_DOORS) for(var/turf/turf in locs) var/obj/structure/window/killthis = (locate(/obj/structure/window) in turf) if(killthis) diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index 06a4527f7e..dcbcce7fbd 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -25,8 +25,8 @@ var/icon_state_opening = null var/icon_state_closed = null var/icon_state_closing = null - var/open_sound = 'sound/machines/blastdooropen.ogg' - var/close_sound = 'sound/machines/blastdoorclose.ogg' + var/open_sound = 'sound/machines/door/blastdooropen.ogg' + var/close_sound = 'sound/machines/door/blastdoorclose.ogg' var/damage = BLAST_DOOR_CRUSH_DAMAGE var/multiplier = 1 // The multiplier for how powerful our YEET is. @@ -125,7 +125,7 @@ // Description: Opens or closes the door, depending on current state. No checks are done inside this proc. /obj/machinery/door/blast/proc/force_toggle(var/forced = 0, mob/user as mob) if (forced) - playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) if(src.density) src.force_open() @@ -219,13 +219,13 @@ if(src.density) visible_message("\The [user] begins forcing \the [src] open!") if(do_after(user, 15 SECONDS,src)) - playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) visible_message("\The [user] forces \the [src] open!") force_open(1) else visible_message("\The [user] begins forcing \the [src] closed!") if(do_after(user, 5 SECONDS,src)) - playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) visible_message("\The [user] forces \the [src] closed!") force_close(1) else diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index e31465168f..6cae2617fd 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -200,14 +200,14 @@ if(src.blocked) visible_message("\The [user] begins digging into \the [src] internals!") if(do_after(user,5 SECONDS,src)) - playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) src.blocked = 0 update_icon() open(1) else if(src.density) visible_message("\The [user] begins forcing \the [src] open!") if(do_after(user, 2 SECONDS,src)) - playsound(src, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) visible_message("\The [user] forces \the [src] open!") open(1) else diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 98fb1c75d8..cfd0b3706c 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -115,7 +115,7 @@ if (!operating) //in case of emag operating = 1 flick(text("[src.base_state]opening"), src) - playsound(src, 'sound/machines/windowdoor.ogg', 100, 1) + playsound(src, 'sound/machines/door/windowdoor.ogg', 100, 1) sleep(10) explosion_resistance = 0 @@ -132,7 +132,7 @@ return FALSE operating = TRUE flick(text("[]closing", src.base_state), src) - playsound(src, 'sound/machines/windowdoor.ogg', 100, 1) + playsound(src, 'sound/machines/door/windowdoor.ogg', 100, 1) density = TRUE update_icon() diff --git a/code/game/mecha/equipment/tools/clamp.dm b/code/game/mecha/equipment/tools/clamp.dm index 6091764c2b..0580134f33 100644 --- a/code/game/mecha/equipment/tools/clamp.dm +++ b/code/game/mecha/equipment/tools/clamp.dm @@ -33,7 +33,7 @@ if(FD.blocked) FD.visible_message("\The [chassis] begins prying on \the [FD]!") if(do_after(chassis.occupant,10 SECONDS,FD)) - playsound(FD, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(FD, 'sound/machines/door/airlock_creaking.ogg', 100, 1) FD.blocked = 0 FD.update_icon() FD.open(1) @@ -41,7 +41,7 @@ else if(FD.density) FD.visible_message("\The [chassis] begins forcing \the [FD] open!") if(do_after(chassis.occupant, 5 SECONDS,FD)) - playsound(FD, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(FD, 'sound/machines/door/airlock_creaking.ogg', 100, 1) FD.visible_message("\The [chassis] forces \the [FD] open!") FD.open(1) else @@ -57,7 +57,7 @@ if(do_after(chassis.occupant, 15 SECONDS,AD) && chassis.Adjacent(AD)) AD.welded = FALSE AD.update_icon() - playsound(AD, 'sound/machines/airlock_creaking.ogg', 100, 1) + playsound(AD, 'sound/machines/door/airlock_creaking.ogg', 100, 1) AD.visible_message("\The [chassis] tears \the [AD] open!") if(!AD.welded) if(density) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 055016908c..9baabe8f9b 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1891,7 +1891,7 @@ update_cell_alerts() update_damage_alerts() set_dir(dir_in) - playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) + playsound(src, 'sound/machines/door/windowdoor.ogg', 50, 1) if(occupant.client && cloaked_selfimage) occupant.client.images += cloaked_selfimage play_entered_noise(occupant) diff --git a/code/global.dm b/code/global.dm index 48628c5e02..1fde7aca07 100644 --- a/code/global.dm +++ b/code/global.dm @@ -157,7 +157,7 @@ var/static/list/scarySounds = list( 'sound/effects/Glassbr3.ogg', 'sound/items/Welder.ogg', 'sound/items/Welder2.ogg', - 'sound/machines/airlock.ogg', + 'sound/machines/door/old_airlock.ogg', 'sound/effects/clownstep1.ogg', 'sound/effects/clownstep2.ogg' ) diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm index 0560f3008b..24cca9ca18 100644 --- a/code/modules/client/preference_setup/global/setting_datums.dm +++ b/code/modules/client/preference_setup/global/setting_datums.dm @@ -152,6 +152,18 @@ var/list/_client_preferences_by_type key = "SOUND_AIRPUMP" enabled_description = "Audible" disabled_description = "Silent" + +/datum/client_preference/old_door_sounds + description ="Old Door Sounds" + key = "SOUND_OLDDOORS" + enabled_description = "Old" + disabled_description = "New" + +/datum/client_preference/department_door_sounds + description ="Department-Specific Door Sounds" + key = "SOUND_DEPARTMENTDOORS" + enabled_description = "Enabled" + disabled_description = "Disabled" /datum/client_preference/pickup_sounds description = "Picked Up Item Sounds" diff --git a/code/modules/client/preferences_toggle_procs.dm b/code/modules/client/preferences_toggle_procs.dm index ddd768a076..bf3d7a3ca7 100644 --- a/code/modules/client/preferences_toggle_procs.dm +++ b/code/modules/client/preferences_toggle_procs.dm @@ -253,6 +253,36 @@ SScharacter_setup.queue_preferences_save(prefs) feedback_add_details("admin_verb","TAirPumpNoise") + +/client/verb/toggle_old_door_sounds() + set name = "Toggle Old Door Sounds" + set category = "Preferences" + set desc = "Toggles New/Old Door Sounds" + + var/pref_path = /datum/client_preference/old_door_sounds + + toggle_preference(pref_path) + + to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear the legacy door sounds.") + + SScharacter_setup.queue_preferences_save(prefs) + + feedback_add_details("admin_verb","TOldDoorSounds") + +/client/verb/toggle_department_door_sounds() + set name = "Toggle Department Door Sounds" + set category = "Preferences" + set desc = "Toggles Department-Specific Door Sounds" + + var/pref_path = /datum/client_preference/department_door_sounds + + toggle_preference(pref_path) + + to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear per-department door sounds.") + + SScharacter_setup.queue_preferences_save(prefs) + + feedback_add_details("admin_verb","TDepartmentDoorSounds") /client/verb/toggle_pickup_sounds() set name = "Toggle Picked Up Item Sounds" diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index cca6838836..51cf85b6a2 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -112,7 +112,7 @@ mob/living/carbon/proc/handle_hallucinations() //Strange audio //to_chat(src, "Strange Audio") switch(rand(1,12)) - if(1) src << 'sound/machines/airlock.ogg' + if(1) src << 'sound/machines/door/old_airlock.ogg' if(2) if(prob(50))src << 'sound/effects/Explosion1.ogg' else src << 'sound/effects/Explosion2.ogg' @@ -121,7 +121,7 @@ mob/living/carbon/proc/handle_hallucinations() if(5) src << 'sound/effects/Glassbr2.ogg' if(6) src << 'sound/effects/Glassbr3.ogg' if(7) src << 'sound/machines/twobeep.ogg' - if(8) src << 'sound/machines/windowdoor.ogg' + if(8) src << 'sound/machines/door/windowdoor.ogg' if(9) //To make it more realistic, I added two gunshots (enough to kill) src << 'sound/weapons/Gunshot1.ogg' diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index fa6bed5c10..63158f9cba 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -250,7 +250,7 @@ //Strange audio //to_chat(src, "Strange Audio") switch(rand(1,12)) - if(1) src << 'sound/machines/airlock.ogg' + if(1) src << 'sound/machines/door/old_airlock.ogg' if(2) if(prob(50))src << 'sound/effects/Explosion1.ogg' else src << 'sound/effects/Explosion2.ogg' @@ -259,7 +259,7 @@ if(5) src << 'sound/effects/Glassbr2.ogg' if(6) src << 'sound/effects/Glassbr3.ogg' if(7) src << 'sound/machines/twobeep.ogg' - if(8) src << 'sound/machines/windowdoor.ogg' + if(8) src << 'sound/machines/door/windowdoor.ogg' if(9) //To make it more realistic, I added two gunshots (enough to kill) src << 'sound/weapons/Gunshot1.ogg' diff --git a/sound/machines/airlock_creaking.ogg b/sound/machines/door/airlock_creaking.ogg similarity index 100% rename from sound/machines/airlock_creaking.ogg rename to sound/machines/door/airlock_creaking.ogg diff --git a/sound/machines/airlockcycle.ogg b/sound/machines/door/airlockcycle.ogg similarity index 100% rename from sound/machines/airlockcycle.ogg rename to sound/machines/door/airlockcycle.ogg diff --git a/sound/machines/airlockforced.ogg b/sound/machines/door/airlockforced.ogg similarity index 100% rename from sound/machines/airlockforced.ogg rename to sound/machines/door/airlockforced.ogg diff --git a/sound/machines/blastdoorclose.ogg b/sound/machines/door/blastdoorclose.ogg similarity index 100% rename from sound/machines/blastdoorclose.ogg rename to sound/machines/door/blastdoorclose.ogg diff --git a/sound/machines/blastdooropen.ogg b/sound/machines/door/blastdooropen.ogg similarity index 100% rename from sound/machines/blastdooropen.ogg rename to sound/machines/door/blastdooropen.ogg diff --git a/sound/machines/boltsdown.ogg b/sound/machines/door/boltsdown.ogg similarity index 100% rename from sound/machines/boltsdown.ogg rename to sound/machines/door/boltsdown.ogg diff --git a/sound/machines/boltsup.ogg b/sound/machines/door/boltsup.ogg similarity index 100% rename from sound/machines/boltsup.ogg rename to sound/machines/door/boltsup.ogg diff --git a/sound/machines/airlock.ogg b/sound/machines/door/old_airlock.ogg similarity index 100% rename from sound/machines/airlock.ogg rename to sound/machines/door/old_airlock.ogg diff --git a/sound/machines/airlockclose.ogg b/sound/machines/door/old_airlockclose.ogg similarity index 100% rename from sound/machines/airlockclose.ogg rename to sound/machines/door/old_airlockclose.ogg diff --git a/sound/machines/windowdoor.ogg b/sound/machines/door/windowdoor.ogg similarity index 100% rename from sound/machines/windowdoor.ogg rename to sound/machines/door/windowdoor.ogg From 6be59695a9aaf1d51e1d3449b615961792506bf5 Mon Sep 17 00:00:00 2001 From: Rykka Date: Sat, 29 Aug 2020 03:26:37 -0400 Subject: [PATCH 05/28] Adds // VOREStation Edit where applicable --- code/game/machinery/doors/airlock.dm | 72 ++++++++++++++-------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 3da717ef49..7eb9e4a342 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -116,8 +116,8 @@ icon = 'icons/obj/doors/Doorcom.dmi' req_one_access = list(access_heads) assembly_type = /obj/structure/door_assembly/door_assembly_com - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/cmd3o.ogg' department_close_powered = 'sound/machines/door/cmd3c.ogg' @@ -126,8 +126,8 @@ icon = 'icons/obj/doors/Doorsec.dmi' req_one_access = list(access_security) assembly_type = /obj/structure/door_assembly/door_assembly_sec - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/sec1o.ogg' department_close_powered = 'sound/machines/door/sec1c.ogg' @@ -136,8 +136,8 @@ icon = 'icons/obj/doors/Dooreng.dmi' req_one_access = list(access_engine) assembly_type = /obj/structure/door_assembly/door_assembly_eng - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/eng1o.ogg' department_close_powered = 'sound/machines/door/eng1c.ogg' @@ -146,8 +146,8 @@ icon = 'icons/obj/doors/Doorengatmos.dmi' req_one_access = list(access_atmospherics) assembly_type = /obj/structure/door_assembly/door_assembly_eat - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/eng1o.ogg' department_close_powered = 'sound/machines/door/eng1c.ogg' @@ -156,8 +156,8 @@ icon = 'icons/obj/doors/Doormed.dmi' req_one_access = list(access_medical) assembly_type = /obj/structure/door_assembly/door_assembly_med - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/med1o.ogg' department_close_powered = 'sound/machines/door/med1c.ogg' @@ -172,8 +172,8 @@ /obj/machinery/door/airlock/maintenance/cargo icon = 'icons/obj/doors/Doormaint_cargo.dmi' req_one_access = list(access_cargo) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/door2o.ogg' department_close_powered = 'sound/machines/door/door2c.ogg' @@ -311,8 +311,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_com glass = 1 req_one_access = list(access_heads) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/cmd1o.ogg' department_close_powered = 'sound/machines/door/cmd1c.ogg' @@ -339,8 +339,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_eat glass = 1 req_one_access = list(access_atmospherics) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/eng1o.ogg' department_close_powered = 'sound/machines/door/eng1c.ogg' @@ -354,8 +354,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_sec glass = 1 req_one_access = list(access_security) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/sec1o.ogg' department_close_powered = 'sound/machines/door/sec1c.ogg' @@ -369,8 +369,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_med glass = 1 req_one_access = list(access_medical) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/med1o.ogg' department_close_powered = 'sound/machines/door/med1c.ogg' @@ -379,8 +379,8 @@ icon = 'icons/obj/doors/Doormining.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_min req_one_access = list(access_mining) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/cgo1o.ogg' department_close_powered = 'sound/machines/door/cgo1c.ogg' @@ -389,8 +389,8 @@ icon = 'icons/obj/doors/Dooratmo.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_atmo req_one_access = list(access_atmospherics) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/eng1o.ogg' department_close_powered = 'sound/machines/door/eng1c.ogg' @@ -398,8 +398,8 @@ name = "Research Airlock" icon = 'icons/obj/doors/Doorresearch.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_research - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/sci1o.ogg' department_close_powered = 'sound/machines/door/sci1c.ogg' @@ -413,8 +413,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_research glass = 1 req_one_access = list(access_research) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/sci1o.ogg' department_close_powered = 'sound/machines/door/sci1c.ogg' @@ -428,8 +428,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_min glass = 1 req_one_access = list(access_mining) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/cgo1o.ogg' department_close_powered = 'sound/machines/door/cgo1c.ogg' @@ -443,8 +443,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_atmo glass = 1 req_one_access = list(access_atmospherics) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/eng1o.ogg' department_close_powered = 'sound/machines/door/eng1c.ogg' @@ -527,8 +527,8 @@ icon = 'icons/obj/doors/Doorsci.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_science req_one_access = list(access_research) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/sci1o.ogg' department_close_powered = 'sound/machines/door/sci1c.ogg' @@ -539,8 +539,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_science glass = 1 req_one_access = list(access_research) - open_sound_powered = 'sound/machines/door/hall1o.ogg' - close_sound_powered = 'sound/machines/door/hall1c.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. + close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off. department_open_powered = 'sound/machines/door/sci1o.ogg' department_close_powered = 'sound/machines/door/sci1c.ogg' From 06232510c1fe70baf7dcadbece28f875ecaf8d11 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 29 Aug 2020 17:58:20 +1000 Subject: [PATCH 06/28] Tidies up decals in service blocl --- maps/tether/tether-03-surface3.dmm | 2069 +++++++++++++++++----------- 1 file changed, 1247 insertions(+), 822 deletions(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 7561fe8f9c..77d17e2dbd 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -3118,6 +3118,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "afJ" = ( @@ -3473,23 +3479,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "agr" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora_storage) "ags" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4700,35 +4699,21 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ain" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 }, +/obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora_storage) "aio" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/panic_shelter) @@ -5808,21 +5793,21 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "akd" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora_storage) "ake" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7484,8 +7469,15 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora_storage) "anm" = ( -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/light, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ann" = ( @@ -8017,12 +8009,19 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aoj" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 9 + dir = 1 }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aok" = ( @@ -8051,9 +8050,17 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "aoo" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 +/obj/machinery/camera/network/tether, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aop" = ( @@ -8197,15 +8204,23 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aoD" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/firealarm{ + layer = 3.3; + pixel_x = 4; + pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/surface_three_hall) "aoE" = ( /obj/structure/sign/directions/evac{ dir = 1 @@ -8213,14 +8228,20 @@ /turf/simulated/wall/r_wall, /area/vacant/vacant_shop) "aoF" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 +/obj/effect/floor_decal/borderfloor{ + dir = 5 }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 5 }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) @@ -8442,14 +8463,23 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "apa" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/structure/closet/secure_closet/hydroponics/sci{ + req_access = list(77) }, -/obj/machinery/alarm{ - pixel_y = 22 +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "apb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -8888,6 +8918,10 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "apH" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, @@ -9269,26 +9303,41 @@ /turf/simulated/floor/tiled/techfloor, /area/vacant/vacant_shop) "aql" = ( +/obj/structure/closet/l3closet/scientist, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "aqm" = ( /obj/machinery/beehive, /turf/simulated/floor/grass, /area/hydroponics) "aqn" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -9668,45 +9717,39 @@ /turf/simulated/wall, /area/tether/surfacebase/surface_three_hall) "aqU" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 }, -/obj/machinery/newscaster{ - pixel_x = 25 - }, -/obj/effect/floor_decal/borderfloor/corner{ +/obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ +/obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "aqV" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/grass, /area/hydroponics) "aqW" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/structure/closet/secure_closet/hydroponics/sci{ - req_access = list(77) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "aqX" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/alarm{ + pixel_y = 25 }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 @@ -9721,15 +9764,20 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aqZ" = ( -/obj/structure/closet/firecloset, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ara" = ( -/obj/structure/closet/l3closet/scientist, -/obj/machinery/light{ +/obj/machinery/camera/network/research, +/obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ @@ -9868,33 +9916,34 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) "aro" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arp" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, /obj/item/device/radio/intercom{ dir = 1; pixel_y = 24 }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arq" = ( @@ -9933,41 +9982,33 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ars" = ( -/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/vending/hydronutrients, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) +"art" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) -"art" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "aru" = ( /turf/simulated/wall, /area/crew_quarters/kitchen) @@ -10096,12 +10137,25 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "arH" = ( -/obj/machinery/vending/hydronutrients, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "arI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10144,16 +10198,26 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "arM" = ( -/obj/structure/table/woodentable, -/obj/effect/floor_decal/corner/lime/border, -/obj/machinery/light, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ - pixel_x = 4; - pixel_y = 3 +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/surface_three_hall) "arN" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -10161,21 +10225,43 @@ /turf/simulated/floor/tiled/techfloor, /area/hydroponics) "arO" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/effect/floor_decal/corner/mauve/border{ +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arP" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -10195,15 +10281,31 @@ /area/hydroponics) "arS" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arT" = ( -/obj/machinery/seed_extractor, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -10228,17 +10330,20 @@ /turf/simulated/wall, /area/tether/surfacebase/public_garden_three) "arX" = ( -/obj/effect/floor_decal/corner/mauve/border{ +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/corner/mauve{ dir = 10 }, -/obj/structure/closet/secure_closet/hydroponics/sci{ - req_access = list(77) - }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arY" = ( -/obj/structure/closet/firecloset, -/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/seed_extractor, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arZ" = ( @@ -10375,18 +10480,25 @@ /turf/simulated/floor/tiled/steel_grid, /area/assembly/chargebay) "asm" = ( -/obj/structure/closet/l3closet/scientist, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) -"asn" = ( -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) +"asn" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aso" = ( /obj/structure/cable/green{ d1 = 4; @@ -10419,24 +10531,12 @@ /turf/simulated/floor/grass, /area/hydroponics) "asr" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, /turf/simulated/floor/tiled, @@ -10476,11 +10576,17 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "asv" = ( -/obj/effect/floor_decal/corner/mauve/bordercorner{ +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "asw" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/alarm{ @@ -10577,20 +10683,41 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "asE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, /obj/effect/floor_decal/corner/mauve/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"asF" = ( +/obj/structure/closet/secure_closet/hydroponics/sci{ + req_access = list(77) + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"asF" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "asG" = ( /obj/machinery/door/airlock/glass{ name = "Hydroponics Break Room"; @@ -10625,9 +10752,9 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "asJ" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "asK" = ( @@ -10757,16 +10884,9 @@ /turf/simulated/floor/grass, /area/hydroponics) "asW" = ( -/obj/structure/table/standard{ - name = "plastic table frame" - }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/storage/box/botanydisk, -/obj/item/weapon/storage/box/botanydisk, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, +/obj/structure/closet/l3closet/scientist, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "asX" = ( @@ -10853,10 +10973,12 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "atj" = ( -/obj/machinery/botany/editor, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atk" = ( @@ -10879,9 +11001,11 @@ /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "atm" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -10957,8 +11081,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "atv" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/corner/mauve{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atw" = ( @@ -10972,10 +11097,9 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atx" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/mauve{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "aty" = ( @@ -10990,9 +11114,18 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "atz" = ( -/obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/table/standard{ + name = "plastic table frame" + }, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/material/minihoe, +/obj/item/weapon/storage/box/botanydisk, +/obj/item/weapon/storage/box/botanydisk, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 6 + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -11075,10 +11208,12 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atK" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/botany/editor, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 4 + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -11156,10 +11291,8 @@ /turf/simulated/floor/grass, /area/hydroponics) "atS" = ( -/obj/machinery/botany/extractor, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/corner/mauve/full, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atT" = ( @@ -11306,13 +11439,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "auh" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "aui" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -11320,12 +11454,12 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "auj" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/corner/mauve/full{ + dir = 4 }, -/obj/machinery/camera/network/tether, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "auk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11368,7 +11502,7 @@ "aup" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/weapon/reagent_containers/glass/bucket, -/obj/machinery/light{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/mauve/border{ @@ -11485,10 +11619,13 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) "auy" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/machinery/botany/extractor, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 }, -/obj/machinery/camera/network/research, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "auz" = ( @@ -11633,23 +11770,27 @@ /turf/simulated/open, /area/tether/surfacebase/surface_three_hall) "auK" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/reagent_dispensers/watertank, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/light{ + dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/beige/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/rnd/xenobiology/xenoflora) "auL" = ( /obj/structure/sink{ dir = 4; pixel_x = 11 }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, @@ -11660,6 +11801,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, @@ -11804,11 +11948,15 @@ pixel_x = 4; pixel_y = 4 }, +/obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/mauve/bordercorner, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "avc" = ( -/obj/machinery/smartfridge/drying_rack, +/obj/machinery/seed_storage/xenobotany{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -11822,22 +11970,15 @@ /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "ave" = ( -/obj/machinery/biogenerator, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 6 - }, +/obj/machinery/smartfridge/drying_rack, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "avf" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/obj/machinery/camera/network/research{ - dir = 5 +/obj/machinery/biogenerator, +/obj/effect/floor_decal/borderfloor{ + dir = 6 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -11853,27 +11994,27 @@ /turf/simulated/floor/grass, /area/hydroponics) "avh" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 }, -/obj/machinery/alarm{ - alarm_id = "pen_nine"; - breach_detection = 0; - dir = 1; - pixel_y = -22 +/obj/machinery/camera/network/research{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 }, -/obj/structure/table/woodentable, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora) "avi" = ( -/obj/effect/floor_decal/corner/lime/border, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/item/weapon/stool/padded, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/mauve/bordercorner, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora) "avj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12060,8 +12201,10 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "avB" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/structure/table/glass, +/obj/machinery/reagentgrinder, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "avC" = ( @@ -12082,8 +12225,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "avE" = ( -/obj/structure/table/glass, -/obj/machinery/reagentgrinder, +/obj/machinery/chem_master, +/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -12127,7 +12270,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "avI" = ( -/obj/machinery/chem_master, +/obj/structure/table/glass, +/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -12475,8 +12619,14 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "awu" = ( +/obj/machinery/reagentgrinder, /obj/structure/table/glass, -/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "awv" = ( @@ -12724,10 +12874,18 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/security/lobby) "awJ" = ( -/obj/machinery/reagentgrinder, -/obj/structure/table/glass, +/obj/machinery/smartfridge, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 6 + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 9 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -13111,17 +13269,27 @@ /turf/simulated/floor/grass, /area/maintenance/lower/xenoflora) "axr" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 }, -/obj/machinery/smartfridge, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "axs" = ( -/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/mauve/bordercorner2, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "axt" = ( @@ -13448,14 +13616,21 @@ /area/rnd/outpost/xenobiology/outpost_north_airlock) "axQ" = ( /obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/structure/disposalpipe/trunk, +/obj/effect/floor_decal/borderfloor{ + dir = 9 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 6 +/obj/effect/floor_decal/corner/lime/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/botanystorage) "axR" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -15094,41 +15269,51 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aAH" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 9 - }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) -"aAI" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) -"aAJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) +"aAI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) -"aAK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) +"aAJ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) +"aAK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aAL" = ( @@ -15172,14 +15357,30 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) "aAP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, /obj/effect/floor_decal/corner/lime/border{ - dir = 1 + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aAQ" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -15590,18 +15791,12 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aBl" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/item/weapon/stool/padded, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -15752,9 +15947,24 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aBC" = ( -/obj/item/weapon/stool/padded, +/obj/machinery/alarm{ + alarm_id = "pen_nine"; + breach_detection = 0; + dir = 1; + pixel_y = -22 + }, +/obj/structure/table/woodentable, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, /obj/effect/floor_decal/corner/lime/border{ - dir = 4 + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -15882,17 +16092,15 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aBM" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/item/weapon/stool/padded, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/botanystorage) "aBN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16057,6 +16265,7 @@ /area/hallway/lower/third_south) "aBZ" = ( /obj/machinery/smartfridge/drying_rack, +/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -16151,7 +16360,13 @@ /area/crew_quarters/kitchen) "aCg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/sinpockets, +/obj/machinery/light, +/obj/item/weapon/packageWrap, +/obj/item/device/destTagger{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -16194,12 +16409,9 @@ /area/hydroponics) "aCk" = ( /obj/structure/table/woodentable, -/obj/item/clothing/mask/smokable/pipe/cobpipe, -/obj/item/clothing/mask/smokable/cigarette/joint, -/obj/item/weapon/flame/lighter/random, -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 - }, +/obj/item/weapon/storage/box/sinpockets, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aCl" = ( @@ -16397,51 +16609,42 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aCC" = ( -/obj/machinery/vending/hydronutrients, +/obj/structure/table/woodentable, +/obj/item/clothing/mask/smokable/pipe/cobpipe, +/obj/item/clothing/mask/smokable/cigarette/joint, +/obj/item/weapon/flame/lighter/random, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, /obj/effect/floor_decal/corner/lime/border{ - dir = 9 + dir = 6 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aCD" = ( -/obj/machinery/seed_storage/garden, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/surface_three_hall) "aCE" = ( -/obj/item/bee_pack, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/weapon/tool/crowbar, -/obj/item/bee_smoker, -/obj/item/beehive_assembly, -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 }, -/obj/structure/closet/crate/hydroponics{ - desc = "All you need to start your own honey farm."; - name = "beekeeping crate" +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/item/beehive_assembly, -/obj/item/beehive_assembly, -/obj/item/beehive_assembly, -/obj/item/beehive_assembly, -/obj/item/bee_pack, -/obj/item/bee_pack, -/obj/item/bee_pack, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/effect/floor_decal/corner/lime/border{ +/obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/surface_three_hall) "aCF" = ( /obj/machinery/light/small{ dir = 4 @@ -16633,21 +16836,31 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aCW" = ( -/obj/machinery/seed_extractor, +/obj/machinery/vending/hydronutrients, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) +"aCX" = ( +/obj/machinery/seed_storage/garden, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"aCX" = ( -/obj/effect/floor_decal/corner/beige{ - dir = 9 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "aCY" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -16946,10 +17159,35 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDC" = ( +/obj/item/bee_pack, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/weapon/tool/crowbar, +/obj/item/bee_smoker, +/obj/item/beehive_assembly, +/obj/structure/closet/crate/hydroponics{ + desc = "All you need to start your own honey farm."; + name = "beekeeping crate" + }, +/obj/item/beehive_assembly, +/obj/item/beehive_assembly, +/obj/item/beehive_assembly, +/obj/item/beehive_assembly, +/obj/item/bee_pack, +/obj/item/bee_pack, +/obj/item/bee_pack, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, -/obj/machinery/smartfridge, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aDD" = ( @@ -17044,11 +17282,13 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDM" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/effect/floor_decal/corner/lime/border{ - dir = 5 +/obj/machinery/seed_extractor, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 }, -/obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aDN" = ( @@ -17148,13 +17388,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aDX" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/machinery/smartfridge, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -17289,8 +17528,13 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "aEk" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, /obj/effect/floor_decal/corner/lime/border{ - dir = 8 + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -17312,9 +17556,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aEn" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -17546,30 +17792,43 @@ /turf/simulated/floor/wood, /area/library) "aEL" = ( -/obj/structure/table/standard{ - name = "plastic table frame" +/obj/structure/closet/secure_closet/hydroponics, +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/effect/floor_decal/borderfloor, -/obj/item/weapon/tool/wrench, /obj/effect/floor_decal/corner/lime/border{ - dir = 9 + dir = 4 }, -/obj/item/weapon/tool/wrench, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aEM" = ( -/obj/structure/table/standard{ - name = "plastic table frame" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/item/weapon/material/knife, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/knife, -/obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border{ - dir = 5 + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 10 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -17720,20 +17979,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFb" = ( -/obj/effect/floor_decal/corner/lime/border{ +/obj/structure/table/standard{ + name = "plastic table frame" + }, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/tool/wrench, +/obj/item/weapon/tool/wrench, +/obj/effect/floor_decal/corner/lime/full{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFc" = ( @@ -17828,32 +18083,24 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aFk" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/structure/table/standard{ + name = "plastic table frame" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/item/weapon/material/knife, +/obj/item/weapon/material/minihoe, +/obj/item/weapon/material/minihoe, +/obj/item/weapon/material/knife, +/obj/effect/floor_decal/corner/lime/full{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFl" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -18072,24 +18319,35 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "aFD" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/alarm{ - alarm_id = "pen_nine"; - breach_detection = 0; - dir = 1; - pixel_y = -22 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFE" = ( -/obj/effect/floor_decal/corner/lime/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 +/obj/structure/reagent_dispensers/watertank, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/cable/green, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/full, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFF" = ( @@ -18102,9 +18360,17 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aFG" = ( -/obj/effect/floor_decal/corner/lime/bordercorner{ +/obj/structure/reagent_dispensers/watertank, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/floor_decal/corner/lime/full{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFH" = ( @@ -18114,11 +18380,29 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFI" = ( -/obj/effect/floor_decal/corner/lime/border{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/newscaster{ + pixel_x = 25 + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/surface_three_hall) "aFJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18240,10 +18524,24 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "aFR" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/machinery/alarm{ + alarm_id = "pen_nine"; + breach_detection = 0; + dir = 1; + pixel_y = -22 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 8 }, -/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFS" = ( @@ -18361,10 +18659,13 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "aGa" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24 }, -/obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/cable/green, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aGb" = ( @@ -18374,10 +18675,12 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aGc" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, /obj/effect/floor_decal/corner/lime/bordercorner{ dir = 8 }, -/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aGd" = ( @@ -18396,17 +18699,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aGe" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/area/tether/surfacebase/botanystorage) "aGf" = ( /obj/machinery/status_display{ pixel_x = 32 @@ -18462,22 +18763,19 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aGj" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/borderfloor{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/lime/border{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/area/tether/surfacebase/botanystorage) "aGk" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -19179,18 +19477,15 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aHo" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/light, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/camera/network/civilian{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass/hidden/steel, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/area/tether/surfacebase/botanystorage) "aHp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -19746,18 +20041,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aIk" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/effect/floor_decal/corner/lime/bordercorner{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/botanystorage) "aIl" = ( /obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, @@ -20405,12 +20697,23 @@ /turf/simulated/wall, /area/tether/surfacebase/bar_backroom) "aJu" = ( -/obj/effect/floor_decal/corner/lime/border{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "aJv" = ( /obj/structure/table/gamblingtable, /obj/item/weapon/storage/pill_bottle/dice_nerd, @@ -20535,10 +20838,20 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "aJJ" = ( -/obj/effect/floor_decal/corner/lime/border, -/obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "aJK" = ( /obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain{ @@ -20831,12 +21144,28 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) "aKl" = ( -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 }, -/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "aKm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20861,14 +21190,15 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aKp" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/weapon/paper{ - desc = ""; - info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; - name = "Important notice from Rancher Jim" +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) "aKq" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -22722,14 +23052,14 @@ /turf/simulated/wall/r_wall, /area/rnd/outpost/xenobiology/outpost_south_airlock) "aOg" = ( -/obj/effect/floor_decal/corner/lime/border, -/obj/machinery/light, -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/camera/network/civilian{ +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "aOh" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -27665,12 +27995,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aXi" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 10 }, -/obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/area/tether/surfacebase/botanystorage) "aXj" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -28179,25 +28512,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aXV" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/botanystorage) "aXW" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -28630,9 +28949,15 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "aYN" = ( -/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 6 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/botanystorage) "aYO" = ( /turf/simulated/wall/r_wall, /area/maintenance/commandmaint) @@ -29324,10 +29649,34 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "aZW" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether) +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/camera/network/tether{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aZX" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/foodcart, @@ -29640,18 +29989,25 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "baw" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/green{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "bax" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -29866,12 +30222,24 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "baM" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/button/remote/blast_door{ + id = "kitchen2"; + name = "Kitchen shutters"; + pixel_x = -24 }, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tourbus/engines) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "baN" = ( /obj/machinery/papershredder, /obj/machinery/alarm{ @@ -30072,16 +30440,18 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bbm" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/weapon/paper{ + desc = ""; + info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; + name = "Important notice from Rancher Jim" }, -/obj/machinery/camera/network/tether{ - dir = 9 +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bbn" = ( /obj/structure/sign/directions/evac{ dir = 1 @@ -30605,11 +30975,18 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bch" = ( -/obj/effect/floor_decal/corner/mauve/border{ - dir = 6 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bci" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -31246,14 +31623,19 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment) "bdc" = ( -/obj/effect/floor_decal/corner/mauve/border{ +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, -/obj/machinery/alarm{ - pixel_y = 25 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/freezer) "bdd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -31666,15 +32048,16 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/freezer) "bdT" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/freezer) "bdU" = ( /obj/machinery/firealarm{ layer = 3.3; @@ -31823,12 +32206,18 @@ /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bej" = ( -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/seed_storage/xenobotany{ - dir = 1 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bek" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/requests_console{ @@ -31904,18 +32293,16 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "bes" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/button/remote/blast_door{ - id = "kitchen2"; - name = "Kitchen shutters"; - pixel_x = -24 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/servicebackroom) "bet" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -32292,13 +32679,17 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "beZ" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/freezer) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/servicebackroom) "bfa" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -32472,26 +32863,37 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bfl" = ( -/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"bfm" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 9 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) -"bfm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bfn" = ( @@ -32526,13 +32928,17 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bfq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/door/firedoor/glass/hidden/steel, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bfr" = ( @@ -32837,10 +33243,20 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "bfZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/freezer) +/obj/effect/floor_decal/corner/beige{ + dir = 9 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bga" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -32890,21 +33306,14 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bgh" = ( -/obj/effect/floor_decal/corner/lime/border{ +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "bgi" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -33069,17 +33478,21 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgy" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass/hidden/steel, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "bgz" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -33522,6 +33935,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) +"bhg" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether) +"bhh" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tourbus/engines) "bhu" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -47696,7 +48121,7 @@ jML jHw jpB qWU -baM +bhh aKU aOI aPb @@ -48548,7 +48973,7 @@ caw jHw gHh qWU -baM +bhh aKU aOI aPb @@ -50533,7 +50958,7 @@ aNk uSA aNJ aNP -aZW +bhg aKU abg aOk @@ -50675,7 +51100,7 @@ aNl aNl aNK aNP -aZW +bhg aKU abg aOk @@ -50777,16 +51202,16 @@ bEd apC aqf aOT -aqU +aFI avP avP avP apS apS ajX -bbm -auh -auK +aZW +baw +baw avn avn aKx @@ -50817,7 +51242,7 @@ aNm aNl aNK aNP -aZW +bhg aKU abg aOk @@ -50914,8 +51339,8 @@ aio ank aio aoE -aoF -aoF +aCD +aCE agw aqg aqT @@ -51069,15 +51494,15 @@ ate ayG aZg bda -bes +baM api atf atw atP avD -awc +bej bfO -aCX +bfZ aHy bee aCT @@ -51327,9 +51752,9 @@ aci aeh aeQ afG -agr -ain -akd +apr +art +asm akI akJ akK @@ -51469,9 +51894,9 @@ aeg aTM aeR abe -aoj -asr -asF +anm +arH +asn aio aio aio @@ -51516,7 +51941,7 @@ bcl aAF bcb bgS -bdT +bgy bdY aGK aGK @@ -51611,9 +52036,9 @@ adD aeh aeS abe -apa +aoj aXU -aYN +asr aio ajl aof @@ -51753,9 +52178,9 @@ adE aei aeT abe -auj +aoo aXU -anm +asv aio ajm akf @@ -51895,9 +52320,9 @@ aeg aTN adC abe -aql +aoD aXU -aYN +asr aio ajn akg @@ -52037,9 +52462,9 @@ adF aek aeV abe -aoo -aXV -bch +aoF +arM +asE aio ajo akf @@ -52321,9 +52746,9 @@ amS anP apj afS -aqW -aro -arX +apa +arO +asF aio ajq akh @@ -52463,9 +52888,9 @@ amV aoe apk afS -aqZ +apH arq -arY +asJ aio ajr aki @@ -52496,7 +52921,7 @@ aGr anj bew bfp -baw +bfl baX amY asB @@ -52605,9 +53030,9 @@ amX afq afq afS -ara +aql arq -asm +asW aio ajs akj @@ -52740,16 +53165,16 @@ ait aeE afI ags -agB +agr agB anC -aBM +ain amU -aoD +akd arb -aIk +aqn bdf -asn +atj acf acf acf @@ -52773,14 +53198,14 @@ atn awQ aru bgt -aKp +bbm baX anj -baq +bch anj aru bge -bcB +bfm bgA aJt aJt @@ -52889,15 +53314,15 @@ alz afS afS afS -apH +aqU arq -asv -atj -atS -atj +atm +atK +auy +atK auM -avf -axr +avh +awJ acf aok aok @@ -53031,7 +53456,7 @@ arI ajY amZ afS -apH +aqW arq acV acV @@ -53039,7 +53464,7 @@ acV acV acV acV -axs +axr ayK axq atg @@ -53051,7 +53476,7 @@ axX aVy aLg aFM -aGe +aJu aLb atb asu @@ -53060,12 +53485,12 @@ aFz asu aoJ aUq -beZ +bdc bfw aoJ beD bfV -aHq +bgh bgJ awm bdt @@ -53173,15 +53598,15 @@ aFZ ako and afS -apH +aqW arr asC asC asC asC asC -avB -axQ +avi +axs arL aop aUr @@ -53315,14 +53740,14 @@ ajC akW anl afS -bdc -bfl -asE -atm +aqX +arP +atv +atS acV acV auN -avE +avB awN azp aop @@ -53345,9 +53770,9 @@ asu aoJ bbJ bfr -bfZ +bdT beq -bfm +bes bcB aLF aJt @@ -53457,14 +53882,14 @@ ajD akX ann afS -aqn -ars +aqZ +arP acV -atv +arX aui acV auP -avI +avE arL avN aop @@ -53489,8 +53914,8 @@ bcv bfs bgb aoJ +beZ bfq -bgy aFM aJt aJt @@ -53599,14 +54024,14 @@ anD akX apl afS -auy -art +ara +arS aon -atx +auh aun aCa auT -awu +avI arL aqm aop @@ -53619,8 +54044,8 @@ aEh aqe aso aFM -aHo -aXi +aJJ +aOg atb asY axv @@ -53741,14 +54166,14 @@ anD akX apF acf -aqX -arO +aro +arT acV -atv +arX auo acV auP -avI +avE arL aqm aop @@ -53761,7 +54186,7 @@ ask arK bfu aCh -aGj +aKl aHw atb atb @@ -53883,14 +54308,14 @@ anE aoK apG afS -apH -arP +aqW +arX acV -atv +arX acV acV avb -awJ +awu arL aop aop @@ -54026,12 +54451,12 @@ aoO apP afS arp -arS -asJ -atz +arX +atx +auj acV acV -bej +avc awN acf aCo @@ -54167,25 +54592,25 @@ afS aoP afS afS -aqn +aqZ acV acV acV acV acV -avc +ave arL adG azY -aAH -aBl -avh +axQ +aAQ +aBC ayg -aCC -aEk -bgh -aFb +aCW +aEn +aEM aFD +aFR aFM aGI aIj @@ -54309,25 +54734,25 @@ amu apd ajG arL -arH -arT -asW -atK +ars +arY +atz aup +auK auL -ave +avf arL adG azY -aAI +aAH aBm -avi +aBM ayg -aCD +aCX aEm aEF aFg -aFE +aGa aFM aFM aIT @@ -54461,16 +54886,16 @@ aAh axm adG azY -aAJ +aAI aBz aBZ aCp -aCE +aDC aEm -aEL -aFk -aFG -aDX +aFb +aFE +aGc +aGj aFM aXS aLF @@ -54603,16 +55028,16 @@ adG adG adG azY -aAK +aAJ aBA -arM +aCg aCp -aCW +aDM aEm -aEM -aFl +aFk +aFG aEm -aOg +aHo aFM aFM aAa @@ -54745,18 +55170,18 @@ aNM aOt adG azY -aAP +aAK aBA -aCg +aCk aCp -aDC +aDX aEm aEN aFB aFH -aGc -aJu -aGa +aIk +aKp +aXi azY adG adG @@ -54887,18 +55312,18 @@ aab aOm adG azY -aAQ -aBC -aCk -aCp aAP +aBl +aCC +aCp +aAK aEm aEm aEm aEm aGJ aGJ -aJJ +aXV azY adG aOF @@ -55033,14 +55458,14 @@ aAR aAR aAR ayg -aDM -aEn -aFI -aFI -aFR -aFR -aFR -aKl +aEk +aEL +aFl +aFl +aGe +aGe +aGe +aYN azY adG aOi From 45483999763a748770bd698f316637c1fdc0cea6 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 29 Aug 2020 18:09:38 +1000 Subject: [PATCH 07/28] missed a spot --- maps/tether/tether-03-surface3.dmm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 77d17e2dbd..17cd7c8b32 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -19489,6 +19489,12 @@ "aHp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aHq" = ( From c3bf4e52201fa6f846b3141b7fcd2ac28b279351 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 30 Aug 2020 05:32:23 +1000 Subject: [PATCH 08/28] Makes rabbits not be vulpines --- .../living/simple_mob/subtypes/vore/rabbit.dm | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm index f1f13b832f..a49309e713 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm @@ -6,7 +6,7 @@ /mob/living/simple_mob/vore/rabbit name = "rabbit" desc = "It's a fluffy, smol bunny! Adorable!" - tt_desc = "Vulpes zerda" + tt_desc = "Oryctolagus cuniculus domesticus" icon_state = "rabbit_brown" icon_living = "rabbit_brown" @@ -26,12 +26,12 @@ melee_damage_lower = 1 melee_damage_upper = 3 attacktext = list("nipped") - + movement_cooldown = 3 say_list_type = /datum/say_list/rabbit ai_holder_type = /datum/ai_holder/simple_mob/passive - + // Vore vars vore_active = 1 vore_bump_chance = 10 @@ -40,16 +40,16 @@ vore_pounce_maxhealth = 100 // They won't pounce by default, as they're passive. This is just so the nom check succeeds. :u vore_default_mode = DM_HOLD vore_icons = SA_ICON_LIVING - + var/body_color //brown, black and white, leave blank for random - + var/grumpiness = 0 // This determines how grumpy we are. Pet us to increase it, leave us alone to decrease. var/last_pet // This tracks the last time someone patted us. var/grump_decay = 5 SECONDS // This is how quickly our grumpiness decays. - + /mob/living/simple_mob/vore/rabbit/New() . = ..() - + if(!body_color) body_color = pick( list("brown","black","white") ) icon_state = "rabbit_[body_color]" @@ -57,16 +57,16 @@ icon_living = "rabbit_[body_color]" icon_dead = "rabbit_[body_color]_dead" icon_rest = "rabbit_[body_color]_rest" - + /mob/living/simple_mob/vore/rabbit/Life() . = ..() - + if(grumpiness > 0 && last_pet > (world.time + grump_decay)) grumpiness = max(0, grumpiness-rand(5,10)) // Subtract grumpiness randomly in a range of 5-10 if we've not been PAT in the last 5 seconds. - + /mob/living/simple_mob/vore/rabbit/examine(mob/user) . = ..() - + switch(grumpiness) if(-INFINITY to 25) . += "They appear calm." @@ -76,14 +76,14 @@ . += "They seem very annoyed, perhaps you should stop petting them." if(75 to INFINITY) . += "They are very angry. Petting them will likely result in unpleasant things." - + /mob/living/simple_mob/vore/rabbit/attack_hand(mob/user) . = ..() - + if(user.a_intent == I_HELP) // only patpet on help. :p grumpiness = CLAMP(grumpiness + rand(5, 10), 0, 120) last_pet = world.time - + if(grumpiness > 90) // Annoyed bunbun :U var/pounce_chance = CanPounceTarget(user) if(pounce_chance) @@ -93,58 +93,60 @@ speak = list("chrrrs.") emote_hear = list("screms.") emote_see = list("earflicks","wiggles it's tail", "wiggles its nose") - + /mob/living/simple_mob/vore/rabbit/black icon_state = "rabbit_black" icon_living = "rabbit_black" icon_dead = "rabbit_black_dead" icon_rest = "rabbit_black_rest" body_color = "black" - + /mob/living/simple_mob/vore/rabbit/white icon_state = "rabbit_white" icon_living = "rabbit_white" icon_dead = "rabbit_white_dead" icon_rest = "rabbit_white_rest" body_color = "white" - + /mob/living/simple_mob/vore/rabbit/brown icon_state = "rabbit_brown" icon_living = "rabbit_brown" icon_dead = "rabbit_brown_dead" icon_rest = "rabbit_brown_rest" body_color = "brown" - + /mob/living/simple_mob/vore/rabbit/white/lennie name = "Lennie" desc = "A large but somewhat dumb-looking rabbit. Has a little collar that says 'Lennie'!" - + /mob/living/simple_mob/vore/rabbit/brown/george name = "George" desc = "A small and quick bunny with a restless expression in its eyes. Has a little collar that says 'George'!" - + /mob/living/simple_mob/vore/rabbit/killer + tt_desc = "Oryctolagus cuniculus homicidam" + icon_state = "rabbit_killer" icon_living = "rabbit_killer" icon_dead = "rabbit_killer_dead" icon_rest = "rabbit_killer_rest" - + maxHealth = 2000 health = 2000 harm_intent_damage = 5 melee_damage_lower = 1 melee_damage_upper = 3 attacktext = list("nipped") - + movement_cooldown = 0.5 // very fast bunbun. - + vore_pounce_chance = 100 vore_pounce_falloff = 0.2 - + body_color = "killer" // Set this so New() doesn't try to randomize us. say_list_type = /datum/say_list/rabbit ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive - + /mob/living/simple_mob/vore/rabbit/killer/ex_act() gib() \ No newline at end of file From 732b4a9530b10a7bccbd6c9eacef04b62fcf22a7 Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Sat, 29 Aug 2020 12:49:45 -0700 Subject: [PATCH 09/28] Fix research console showing duplicates, make pages more clear --- code/modules/research/rdconsole_tgui.dm | 3 ++ code/modules/research/research.dm | 42 +++++++-------- .../tgui/interfaces/ResearchConsole.js | 51 +++++++++++++------ tgui/packages/tgui/public/tgui.bundle.js | 2 +- 4 files changed, 57 insertions(+), 41 deletions(-) diff --git a/code/modules/research/rdconsole_tgui.dm b/code/modules/research/rdconsole_tgui.dm index 7a6d540b8d..6d7d0fb8bf 100644 --- a/code/modules/research/rdconsole_tgui.dm +++ b/code/modules/research/rdconsole_tgui.dm @@ -42,6 +42,9 @@ data["busy_msg"] = busy_msg data["search"] = search + data["builder_page"] = builder_page + data["design_page"] = design_page + data["info"] = null if(!locked && !busy_msg) data["info"] = list( diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index bb0937378d..c338fba128 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -43,6 +43,8 @@ research holder datum. ** Master Types ** ** Includes all the helper procs and basic tech processing. ** ***************************************************************/ +GLOBAL_LIST_INIT(tech_levels, list()) +GLOBAL_LIST_INIT(design_datums, list()) /datum/research //Holder for all the existing, archived, and known tech. Individual to console. var/list/known_tech = list() //List of locally known tech. Datum/tech go here. @@ -50,19 +52,26 @@ research holder datum. var/list/known_designs = list() //List of available designs. /datum/research/New() //Insert techs into possible_tech here. Known_tech automatically updated. - for(var/T in typesof(/datum/tech) - /datum/tech) - known_tech += new T(src) - for(var/D in typesof(/datum/design) - /datum/design) - possible_designs += new D(src) -// generate_integrated_circuit_designs() + if(!LAZYLEN(GLOB.tech_levels)) + for(var/T in typesof(/datum/tech) - /datum/tech) + GLOB.tech_levels += new T + if(!LAZYLEN(GLOB.design_datums)) + for(var/T in typesof(/datum/design) - /datum/design) + GLOB.design_datums += new T + + known_tech = GLOB.tech_levels + possible_designs = GLOB.design_datums RefreshResearch() /datum/research/techonly - /datum/research/techonly/New() - for(var/T in typesof(/datum/tech) - /datum/tech) - known_tech += new T(src) - RefreshResearch() + . = ..() + possible_designs = list() + known_designs = list() + +/datum/research/techonly/RefreshResearch() + . = ..() + known_designs = list() // Just in case //Checks to see if design has all the required pre-reqs. //Input: datum/design; Output: 0/1 (false/true) @@ -117,21 +126,6 @@ research holder datum. var/datum/tech/check_tech = T if(initial(check_tech.id) == ID) return initial(check_tech.name) -/* -/datum/research/proc/generate_integrated_circuit_designs() - spawn(2 SECONDS) // So the list has time to initialize. - for(var/obj/item/integrated_circuit/IC in all_integrated_circuits) - if(IC.spawn_flags & IC_SPAWN_RESEARCH) - var/datum/design/D = new /datum/design/circuit(src) - D.name = "Custom circuitry \[[IC.category_text]\] ([IC.name])" - D.id = "ic-[lowertext(IC.name)]" - if(IC.origin_tech && IC.origin_tech.len) - D.req_tech = IC.origin_tech.Copy() - else - D.req_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2) - D.build_path = IC.type - possible_designs += D -*/ /*************************************************************** ** Technology Datums ** diff --git a/tgui/packages/tgui/interfaces/ResearchConsole.js b/tgui/packages/tgui/interfaces/ResearchConsole.js index 6d797c8d47..7a7e2c021b 100644 --- a/tgui/packages/tgui/interfaces/ResearchConsole.js +++ b/tgui/packages/tgui/interfaces/ResearchConsole.js @@ -36,11 +36,26 @@ const ResearchConsoleViewResearch = (props, context) => { ); }; +const PaginationTitle = (props, context) => { + const { data } = useBackend(context); + + const { + title, + target, + } = props; + + let page = data[target]; + if (typeof page === "number") { + return title + " - Page " + (page + 1); + } + + return title; +}; + const PaginationChevrons = (props, context) => { const { act } = useBackend(context); const { - length, target, } = props; @@ -67,14 +82,14 @@ const ResearchConsoleViewDesigns = (props, context) => { } = data; return ( -
} buttons={ - { || null} + { || null} }> { if (saveDialog) { return ( -
-