From 443b842ec029f707cee434f64ca38db6f4317f3e Mon Sep 17 00:00:00 2001 From: Avery Marie <98699252+Eyeveri@users.noreply.github.com> Date: Sat, 18 Mar 2023 23:25:46 -0400 Subject: [PATCH] Tweaks the Vault as needed (#16054) * Tweaks the Vault as needed * Connects the proper disposals * Oopsies I messed up the Changelog * f * For some reason the piping wasn't showing up? * makes the decals match * Update html/changelogs/Eyeveri_VaultTweaks.yml Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Corrects the Camera tags --------- Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --- code/game/objects/random/random.dm | 25 +- html/changelogs/Eyeveri_VaultTweaks.yml | 43 ++ maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 28 +- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 640 +++++++++----------- 4 files changed, 365 insertions(+), 371 deletions(-) create mode 100644 html/changelogs/Eyeveri_VaultTweaks.yml diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 0e2c42a4847..9232cb26252 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1233,14 +1233,16 @@ icon = 'icons/obj/coins.dmi' icon_state = "coin_diamond_heads" problist = list( - /obj/random/telecrystals = 0.2, - /obj/item/gun/projectile/automatic/rifle/shotgun = 0.2, - /obj/random/melee = 0.5, - /obj/item/gun/energy/lawgiver = 0.2, - /obj/item/gun/projectile/automatic/terminator = 0.2, + /obj/random/telecrystals = 0.1, + /obj/item/gun/projectile/automatic/rifle/shotgun = 0.1, + /obj/random/melee = 0.3, + /obj/item/gun/energy/lawgiver = 0.1, + /obj/item/gun/projectile/automatic/terminator = 0.1, /obj/item/device/personal_shield = 0.4, - /obj/random/safe_rig = 0.5, - /obj/item/gun/projectile/shotgun/pump/combat = 0.3 + /obj/random/safe_rig = 0.4, + /obj/item/gun/energy/disruptorpistol/magnum = 0.3, + /obj/item/gun/projectile/shotgun/pump/combat = 0.2, + /obj/item/clothing/glasses/thermal = 0.5 ) /obj/random/highvalue/no_crystal @@ -1546,11 +1548,12 @@ icon = 'icons/obj/rig_modules.dmi' icon_state = "breacher_rig" spawnlist = list( - /obj/item/rig/combat/equipped = 1, - /obj/item/rig/military = 0.4, - /obj/item/rig/hazard/equipped = 1, + /obj/item/rig/combat/equipped = 0.8, + /obj/item/rig/military = 0.3, + /obj/item/rig/hazard/equipped = 0.8, /obj/item/rig/retro/equipped = 0.8, - /obj/item/rig/ert/security = 0.2 + /obj/item/rig/ert/security = 0.3, + /obj/item/rig/unathi = 0.4 ) /obj/random/telecrystals name = "random telecrystals" diff --git a/html/changelogs/Eyeveri_VaultTweaks.yml b/html/changelogs/Eyeveri_VaultTweaks.yml new file mode 100644 index 00000000000..558ac5d34c3 --- /dev/null +++ b/html/changelogs/Eyeveri_VaultTweaks.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: ReadThisNamePlz + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed the cameras in the vault not having a motion alarm." + - maptweak: "Tweaked the vault to have two-thick walls instead of one. Added two additional turrets. Added a emergency O2 wall locker instead of the standing locker to ops." + - balance: "Readjusted some of the loot and adds less valuable loot possibilities for the safe." diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index aaab42c20bb..65547e0185e 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -7348,15 +7348,8 @@ /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "fFj" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/railing/mapped, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "fFm" = ( @@ -13158,8 +13151,15 @@ /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) "kho" = ( -/obj/structure/railing/mapped, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/railing/mapped{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "kid" = ( @@ -30898,11 +30898,11 @@ /turf/simulated/floor/tiled/full, /area/assembly/chargebay) "xSt" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/railing/mapped{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "xSR" = ( @@ -40698,13 +40698,13 @@ hTk hTk acn fif -fif -kho +fFj diR xSt kTJ kTJ kTJ +kTJ exX sqs bFd @@ -40901,8 +40901,8 @@ nua gBl gBl gBl +kho gBl -fFj gzW gBl gBl diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index d16515b7ccb..ce7f80f17f2 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -356,23 +356,6 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/secure_ammunition_storage) -"ajt" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/random/junk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/maintenance/wing/starboard) "ajI" = ( /obj/structure/cable{ icon_state = "1-2" @@ -565,13 +548,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/brown{ - dir = 10 - }, /obj/machinery/camera/network/supply{ c_tag = "Operations - Upper Warehouse Starboard"; dir = 1 }, +/obj/effect/floor_decal/corner/brown/full, /turf/simulated/floor/tiled, /area/operations/office) "aoD" = ( @@ -652,10 +633,10 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_monitoring/tesla) "aqR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/maintenance/aux_atmospherics/deck_2/starboard/wing) "aqT" = ( @@ -2040,25 +2021,6 @@ }, /turf/simulated/floor/tiled/full, /area/hallway/engineering) -"aSB" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access = list(26,29,31,48,67) - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/operations/office) "aSO" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -2432,11 +2394,11 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/reinforced, /area/storage/secure) @@ -2594,12 +2556,27 @@ /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "bee" = ( -/obj/structure/closet/toolcloset, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/wing/starboard/far) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "bem" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/effect/decal/cleanable/dirt, @@ -3830,21 +3807,13 @@ /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "bHG" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/brown/full{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/closet/walllocker/emerglocker/west, +/turf/simulated/floor/tiled, +/area/operations/office) "bHL" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency, @@ -4004,6 +3973,7 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/smes) "bNd" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/reinforced, /area/storage/secure) "bNF" = ( @@ -5026,14 +4996,11 @@ /turf/simulated/floor/tiled/dark, /area/horizon/grauwolf) "ckc" = ( -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small/emergency{ + dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/structure/trash_pile, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "cks" = ( @@ -6738,12 +6705,11 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 6 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/light/colored/red{ dir = 4 }, +/obj/machinery/porta_turret, +/obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/reinforced, /area/storage/secure) "dki" = ( @@ -7471,6 +7437,11 @@ pixel_x = -24 }, /obj/structure/cable/green, +/obj/machinery/camera/motion/security{ + dir = 4; + network = list("Command","Security","Operations"); + c_tag = "Operations - Vault 2" + }, /turf/simulated/floor/reinforced, /area/storage/secure) "dCa" = ( @@ -7900,34 +7871,17 @@ /turf/simulated/floor/tiled/dark, /area/horizon/bar) "dLX" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/maintenance{ + req_one_access = list(12,26,31,48,67) }, -/obj/machinery/alarm{ - pixel_y = 28 - }, -/obj/effect/floor_decal/corner/green/full{ - dir = 8 - }, -/obj/machinery/button/remote/airlock/screamer{ - channel = "Command"; - dir = 4; - id = "airlocks_deck2_ammostorage"; - message = "The secure ammunition storage aft door bolts have been activated or deactivated."; - name = "Door Bolt Control"; - pixel_x = -40; - pixel_y = -7; - req_one_access = list(75); - specialfunctions = 4 - }, -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "shutters_deck1_ammostorage"; - name = "Blast Door Control"; - pixel_x = -40; - pixel_y = 7; - req_one_access = list(75) +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/operations/lobby) "dMf" = ( @@ -7947,12 +7901,11 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "dMG" = ( -/obj/structure/lattice/catwalk, -/obj/structure/disposalpipe/down{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 }, -/turf/simulated/open, -/area/maintenance/wing/starboard) +/turf/simulated/floor/tiled, +/area/maintenance/aux_atmospherics/deck_2/starboard/wing) "dMK" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -8874,19 +8827,6 @@ /obj/machinery/light/small/emergency, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) -"eoK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/green{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/operations/lobby) "epe" = ( /obj/machinery/light/small/emergency{ dir = 1 @@ -10791,22 +10731,6 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/security/office) -"fli" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/full, -/turf/simulated/floor/tiled, -/area/operations/office) "fln" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/grey{ @@ -11894,9 +11818,6 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "fMp" = ( -/obj/machinery/light/small/red{ - dir = 8 - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -11914,6 +11835,7 @@ req_one_access = list(75); specialfunctions = 4 }, +/obj/machinery/light/small/red, /turf/simulated/floor/tiled, /area/storage/secure) "fME" = ( @@ -12627,22 +12549,24 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "gdQ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/door/airlock/maintenance{ + req_one_access = list(26,29,31,48,67) }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/effect/floor_decal/corner/brown{ - dir = 10 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/operations/office) "gdT" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -12787,16 +12711,32 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/turretid{ - dir = 4; - name = "\improper Secure Ammunition Storage Turret Control Console"; - pixel_x = 6; - pixel_y = 32; - req_access = list(19) - }, /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/machinery/turretid{ + name = "\improper Secure Ammunition Storage Turret Control Console"; + pixel_x = -5; + pixel_y = 26; + req_access = list(19) + }, +/obj/machinery/button/remote/airlock/screamer{ + channel = "Command"; + id = "airlocks_deck2_ammostorage"; + message = "The secure ammunition storage aft door bolts have been activated or deactivated."; + name = "Door Bolt Control"; + pixel_x = 8; + pixel_y = 35; + req_one_access = list(75); + specialfunctions = 4 + }, +/obj/machinery/button/remote/blast_door{ + id = "shutters_deck1_ammostorage"; + name = "Blast Door Control"; + pixel_x = -6; + pixel_y = 35; + req_one_access = list(75) + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/secure_ammunition_storage) "ggA" = ( @@ -13127,11 +13067,11 @@ /turf/simulated/floor/plating, /area/medical/reception) "gnm" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/maintenance/aux_atmospherics/deck_2/starboard/wing) +/obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "gny" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -13261,16 +13201,17 @@ /turf/simulated/floor/tiled, /area/turret_protected/ai_upload) "gqd" = ( -/obj/item/material/shard{ - icon_state = "small" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/reinforced, +/area/storage/secure) "gqo" = ( /obj/effect/floor_decal/corner/yellow{ dir = 5 @@ -14253,17 +14194,22 @@ /turf/simulated/floor/tiled, /area/maintenance/wing/starboard) "gJM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 - }, /obj/structure/cable/green{ - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/corner_wide/blue/full{ + dir = 8 }, /turf/simulated/floor/tiled, /area/operations/lobby) @@ -14637,7 +14583,12 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "gSh" = ( -/obj/effect/floor_decal/industrial/warning/corner, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) @@ -18063,13 +18014,8 @@ /obj/machinery/alarm{ pixel_y = 28 }, -/obj/effect/floor_decal/corner/brown{ - dir = 5 - }, -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled, -/area/operations/office) +/turf/simulated/wall/r_wall, +/area/storage/secure) "iDt" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18518,20 +18464,6 @@ }, /turf/simulated/floor/tiled, /area/maintenance/wing/starboard) -"iMo" = ( -/obj/structure/sign/nosmoking_1{ - pixel_y = 32 - }, -/obj/effect/floor_decal/corner/green/full{ - dir = 1 - }, -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/operations/lobby) "iMG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -19055,17 +18987,14 @@ /turf/simulated/open/airless, /area/template_noop) "jaD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/structure/sign/nosmoking_1{ + pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/light{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, /turf/simulated/floor/tiled, /area/operations/lobby) @@ -20708,10 +20637,16 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 6 }, -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light/colored/red{ dir = 4 }, +/obj/machinery/porta_turret, +/obj/effect/floor_decal/industrial/warning/full, +/obj/machinery/camera/motion/security{ + dir = 8; + network = list("Command","Security","Operations"); + c_tag = "Operations - Vault 1" + }, /turf/simulated/floor/reinforced, /area/storage/secure) "jNY" = ( @@ -23047,15 +22982,16 @@ /turf/simulated/floor/tiled, /area/maintenance/aux_atmospherics/deck_2/starboard/wing) "lbs" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/machinery/alarm{ alarm_id = 1601; dir = 8; pixel_x = 28; req_one_access = list(11,24,52) }, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "lbv" = ( @@ -25186,9 +25122,11 @@ /turf/simulated/floor/reinforced/airless, /area/engineering/engine_room) "mep" = ( -/obj/effect/floor_decal/corner/green{ - dir = 6 +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/corner_wide/blue/full{ + dir = 1 }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/operations/lobby) "meG" = ( @@ -25741,6 +25679,9 @@ /obj/machinery/alarm{ pixel_y = 28 }, +/obj/structure/railing/mapped{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "mte" = ( @@ -26313,7 +26254,10 @@ /obj/structure/flora/pottedplant{ icon_state = "plant-33" }, -/obj/effect/floor_decal/corner/green/full{ +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/corner_wide/blue/full{ dir = 4 }, /turf/simulated/floor/tiled, @@ -26569,11 +26513,6 @@ /turf/simulated/floor/reinforced/airless, /area/template_noop) "mMf" = ( -/obj/machinery/camera/motion{ - c_tag = "Operations - Secure Storage"; - dir = 4; - network = list("Command","Security","Operations") - }, /obj/effect/floor_decal/corner_wide/blue{ dir = 9 }, @@ -27928,11 +27867,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"nnu" = ( -/obj/structure/closet/crate, -/obj/random/loot, -/turf/simulated/floor/tiled, -/area/maintenance/aux_atmospherics/deck_2/starboard/wing) "noi" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29343,7 +29277,11 @@ /obj/machinery/turretid/lethal{ dir = 4; pixel_x = -26; - name = "Vault Turret Control" + name = "Vault Turret Control"; + check_synth = 1 + }, +/obj/machinery/light/small/red{ + dir = 1 }, /turf/simulated/floor/tiled, /area/storage/secure) @@ -32442,8 +32380,22 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "pGX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/disposalpipe/segment, +/obj/structure/sign/nosmoking_1{ + pixel_y = 32 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "pHp" = ( @@ -33252,11 +33204,11 @@ /turf/simulated/open/airless, /area/horizon/exterior) "qaI" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +/obj/structure/disposalpipe/down{ + dir = 8 }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk, +/turf/simulated/open, /area/maintenance/wing/starboard) "qaK" = ( /obj/effect/floor_decal/industrial/warning{ @@ -33672,17 +33624,21 @@ /turf/simulated/floor/tiled/dark, /area/horizon/zta) "qlm" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - req_one_access = list(12,26,31,48,67) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/operations/lobby) +/area/maintenance/wing/starboard) "qlp" = ( /obj/effect/floor_decal/corner/blue{ dir = 9 @@ -34207,6 +34163,13 @@ /obj/effect/floor_decal/corner/blue{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/operations/lobby) "qxK" = ( @@ -34874,11 +34837,11 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/brig) "qPY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/maintenance/aux_atmospherics/deck_2/starboard/wing) +/turf/simulated/floor/reinforced, +/area/storage/secure) "qQs" = ( /obj/random/junk, /turf/simulated/floor/plating, @@ -35594,9 +35557,11 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/strongroom) "rgU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/operations/lobby) @@ -35621,17 +35586,17 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry) "rhT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ - dir = 1; + dir = 2; icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor/grate, @@ -36893,17 +36858,9 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "rNZ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/item/material/shard{ - icon_state = "small" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -39159,22 +39116,20 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "sYy" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8; + icon_state = "pipe-c" }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "sYA" = ( @@ -40153,11 +40108,15 @@ /turf/simulated/floor/tiled, /area/turret_protected/ai_upload_foyer) "tyq" = ( -/obj/random/junk, -/obj/structure/disposalpipe/segment, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/obj/machinery/alarm{ + dir = 8; + pixel_x = 28 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/operations/lobby) "tyZ" = ( /obj/machinery/light/small/emergency{ dir = 1 @@ -40257,10 +40216,13 @@ name = "\improper WARNING: SECURE AMMUNITION STORAGE sign"; pixel_x = -32 }, -/obj/effect/floor_decal/corner/green/full, /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/floor_decal/corner_wide/blue/full, /turf/simulated/floor/tiled, /area/operations/lobby) "tBf" = ( @@ -43305,20 +43267,19 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, -/area/operations/office) +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "uSj" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -44328,12 +44289,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/operations/lobby) "vyE" = ( @@ -49315,21 +49276,8 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/far) "xHZ" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/light/small/emergency{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, +/turf/simulated/wall/r_wall, /area/maintenance/wing/starboard) "xIo" = ( /obj/structure/disposalpipe/segment, @@ -59309,9 +59257,9 @@ naD dFi sQj sky -cMk -oTa -oTa +dMG +vOr +lXt aqR sQj sqc @@ -59508,16 +59456,16 @@ uOq vyE pTY tGP -bee +dEz +sQj +sQj +sQj +sQj +sQj sQj -nnu -gnm -vOr -lXt -qPY sQj msP -rNZ +dsl wRu wRu gUB @@ -59710,16 +59658,16 @@ lXo dEz dEz dEz -dEz -sQj -sQj -sQj -sQj -sQj -sQj -sQj +rNZ ckc -dsl +gnm +lBw +lBw +lBw +lBw +soZ +lBw +uRJ wRu wRu ggz @@ -59914,15 +59862,15 @@ fsf fsf gSh xHZ -gqd -pGX -lBw -lBw -tyq -soZ -lBw +xnf +xnf +xnf +xnf +xnf +xnf +xnf rhT -rCR +bee dLX gJM qxy @@ -60115,7 +60063,6 @@ aLc aLc lbs qaI -dMG xnf xnf xnf @@ -60123,9 +60070,10 @@ xnf xnf xnf xnf -sYy +xnf +xnf qlm -eoK +rCR jaD rgU vyk @@ -60325,11 +60273,11 @@ mMf dBX weh xnf -bHG +xnf +qlm rCR -iMo -mep mep +tyq mGi rCR xwo @@ -60527,8 +60475,8 @@ dlZ frS axW xnf -ajt -rCR +xnf +pGX rCR rCR rCR @@ -60725,16 +60673,16 @@ eIE xnf pfi bNd -dlZ -bNd +gqd +qPY wmz xnf -aSB +xnf +qlm rCR usr usr usr -usr rCR jRN jNd @@ -60931,12 +60879,12 @@ aZK dkh qgL xnf -fli +xnf +qlm rCR usr usr usr -usr rCR lWB jNd @@ -61133,12 +61081,12 @@ wGT xnf xnf xnf -uRJ +xnf +qlm rCR usr usr usr -usr rCR vSd eZN @@ -61336,7 +61284,7 @@ fMp xnf iDj gdQ -rCR +sYy rCR rCR rCR @@ -61536,7 +61484,7 @@ bpY rju qNo qvZ -kRZ +bHG aoC kmc epw