From d8facb3bcebfbe1726e6d97569d12b9065f4d956 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 3 Jan 2018 22:52:38 -0500 Subject: [PATCH] initial commit - game folder + maps + dme --- .../LavaRuins/lavaland_biodome_beach.dmm | 4 +- .../lavaland_surface_animal_hospital.dmm | 2 +- .../LavaRuins/lavaland_surface_cultaltar.dmm | 2 +- .../lavaland_surface_syndicate_base1.dmm | 9838 ++++++++++---- _maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 2 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 6 +- _maps/RandomRuins/SpaceRuins/onehalf.dmm | 6 +- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 4 +- _maps/RandomZLevels/beach.dmm | 2 +- _maps/RandomZLevels/centcomAway.dmm | 4 +- _maps/RandomZLevels/moonoutpost19.dmm | 8 +- _maps/RandomZLevels/research.dmm | 6 +- _maps/RandomZLevels/snowdin.dmm | 8 +- _maps/RandomZLevels/undergroundoutpost45.dmm | 22 +- _maps/map_files/BoxStation/BoxStation.dmm | 7243 +++-------- .../map_files/Deltastation/DeltaStation2.dmm | 473 +- _maps/map_files/MetaStation/MetaStation.dmm | 724 +- _maps/map_files/Mining/Lavaland.dmm | 72 +- _maps/map_files/OmegaStation/OmegaStation.dmm | 10714 +++++++++++----- _maps/map_files/PubbyStation/PubbyStation.dmm | 170 +- _maps/map_files/debug/runtimestation.dmm | 4 +- _maps/map_files/generic/CentCom.dmm | 2 +- _maps/shuttles/emergency_asteroid.dmm | 8 +- _maps/shuttles/emergency_bar.dmm | 2 +- _maps/shuttles/emergency_birdboat.dmm | 4 +- _maps/shuttles/emergency_cere.dmm | 6 +- _maps/shuttles/emergency_delta.dmm | 8 +- _maps/shuttles/emergency_meta.dmm | 6 +- _maps/shuttles/emergency_meteor.dmm | 2 +- _maps/shuttles/emergency_mini.dmm | 6 +- _maps/shuttles/emergency_russiafightpit.dmm | 12 +- _maps/shuttles/whiteship_delta.dmm | 10 +- _maps/templates/pirate_ship.dmm | 2 +- code/game/alternate_appearance.dm | 1 + code/game/area/ai_monitored.dm | 2 +- code/game/area/areas/holodeck.dm | 2 +- code/game/area/areas/ruins/lavaland.dm | 37 +- code/game/atoms_movable.dm | 34 +- code/game/communications.dm | 196 +- code/game/gamemodes/antag_hud.dm | 4 +- code/game/gamemodes/antag_spawner.dm | 12 +- code/game/gamemodes/blob/blobs/shield.dm | 2 +- code/game/gamemodes/blob/overmind.dm | 6 +- code/game/gamemodes/blob/theblob.dm | 2 +- .../gamemodes/changeling/powers/panacea.dm | 11 - .../gamemodes/changeling/powers/tiny_prick.dm | 2 +- code/game/gamemodes/clock_cult/clock_cult.dm | 2 +- .../clock_effects/spatial_gateway.dm | 12 +- .../clock_helpers/fabrication_helpers.dm | 4 +- .../clock_items/construct_chassis.dm | 10 + .../clock_items/replica_fabricator.dm | 6 +- .../clock_items/wraith_spectacles.dm | 8 +- .../clock_cult/clock_mobs/_eminence.dm | 52 +- .../clock_mobs/clockwork_marauder.dm | 2 +- .../ark_of_the_clockwork_justicar.dm | 2 +- .../clock_structures/eminence_spire.dm | 1 - code/game/gamemodes/cult/cult_items.dm | 12 +- code/game/gamemodes/cult/cult_structures.dm | 30 +- code/game/gamemodes/cult/ritual.dm | 1 + code/game/gamemodes/cult/runes.dm | 91 +- code/game/gamemodes/cult/talisman.dm | 24 +- code/game/gamemodes/devil/imp/imp.dm | 2 +- .../gamemodes/malfunction/Malf_Modules.dm | 6 +- code/game/gamemodes/meteor/meteors.dm | 3 +- .../gamemodes/miniantags/abduction/gland.dm | 9 +- .../gamemodes/miniantags/bot_swarm/swarmer.dm | 4 - .../miniantags/bot_swarm/swarmer_event.dm | 6 +- code/game/gamemodes/miniantags/morph/morph.dm | 2 +- .../gamemodes/miniantags/revenant/revenant.dm | 2 +- .../miniantags/slaughter/slaughter.dm | 6 +- code/game/gamemodes/nuclear/nuclear.dm | 4 +- code/game/gamemodes/nuclear/nuclearbomb.dm | 2 +- code/game/gamemodes/objective.dm | 18 +- code/game/gamemodes/sandbox/h_sandbox.dm | 2 +- code/game/gamemodes/wizard/wizard.dm | 4 +- code/game/machinery/Sleeper.dm | 4 +- code/game/machinery/airlock_control.dm | 52 +- code/game/machinery/cloning.dm | 2 +- code/game/machinery/computer/arcade.dm | 9 +- code/game/machinery/computer/atmos_alert.dm | 6 +- code/game/machinery/computer/atmos_control.dm | 33 +- .../machinery/computer/camera_advanced.dm | 3 + .../game/machinery/computer/communications.dm | 17 +- code/game/machinery/computer/dna_console.dm | 72 +- .../machinery/computer/telecrystalconsoles.dm | 2 - code/game/machinery/computer/teleporter.dm | 8 +- code/game/machinery/constructable_frame.dm | 1 + code/game/machinery/doors/airlock.dm | 26 +- code/game/machinery/doors/airlock_types.dm | 42 +- code/game/machinery/doors/alarmlock.dm | 6 +- code/game/machinery/doors/brigdoors.dm | 4 +- code/game/machinery/doors/door.dm | 20 +- code/game/machinery/doors/shutters.dm | 2 +- code/game/machinery/doors/unpowered.dm | 44 +- code/game/machinery/doors/windowdoor.dm | 3 +- code/game/machinery/doppler_array.dm | 4 + .../embedded_controller/airlock_controller.dm | 93 +- .../embedded_controller_base.dm | 12 +- .../simple_vent_controller.dm | 37 +- code/game/machinery/iv_drip.dm | 2 +- code/game/machinery/magnet.dm | 26 +- code/game/machinery/navbeacon.dm | 4 +- code/game/machinery/quantum_pad.dm | 6 +- code/game/machinery/requests_console.dm | 30 +- code/game/machinery/shieldgen.dm | 30 +- code/game/machinery/status_display.dm | 2 +- code/game/machinery/telecomms/broadcasting.dm | 221 +- .../machinery/telecomms/computers/message.dm | 456 + .../telecomms/machine_interactions.dm | 21 +- .../machinery/telecomms/machines/allinone.dm | 57 +- .../telecomms/machines/broadcaster.dm | 79 +- code/game/machinery/telecomms/machines/bus.dm | 55 +- code/game/machinery/telecomms/machines/hub.dm | 23 +- .../telecomms/machines/message_server.dm | 180 + .../machinery/telecomms/machines/processor.dm | 28 +- .../machinery/telecomms/machines/receiver.dm | 49 +- .../machinery/telecomms/machines/relay.dm | 9 +- .../machinery/telecomms/machines/server.dm | 140 +- .../machinery/telecomms/telecomunications.dm | 80 +- code/game/mecha/combat/combat.dm | 2 + code/game/mecha/combat/gygax.dm | 1 + code/game/mecha/combat/honker.dm | 2 + code/game/mecha/combat/marauder.dm | 172 +- code/game/mecha/combat/reticence.dm | 54 +- code/game/mecha/mech_fabricator.dm | 14 +- code/game/mecha/mecha.dm | 2 +- code/game/mecha/mecha_topic.dm | 2 +- code/game/objects/effects/anomalies.dm | 1 + code/game/objects/effects/bump_teleporter.dm | 1 + code/game/objects/effects/decals/crayon.dm | 2 +- .../effects/effect_system/effects_foam.dm | 2 +- code/game/objects/effects/landmarks.dm | 53 +- code/game/objects/effects/misc.dm | 1 + code/game/objects/effects/portals.dm | 2 + .../objects/effects/spawners/gibspawner.dm | 12 +- .../game/objects/effects/spawners/lootdrop.dm | 3 +- .../effects/temporary_visuals/clockcult.dm | 4 +- .../objects/effects/temporary_visuals/cult.dm | 4 +- .../temporary_visuals/miscellaneous.dm | 2 +- code/game/objects/items.dm | 58 +- code/game/objects/items/AI_modules.dm | 15 +- code/game/objects/items/RCD.dm | 20 +- code/game/objects/items/RCL.dm | 9 +- code/game/objects/items/bodybag.dm | 2 +- code/game/objects/items/cards_ids.dm | 11 +- .../circuitboards/machine_circuitboards.dm | 37 +- code/game/objects/items/cosmetics.dm | 8 +- code/game/objects/items/crayons.dm | 6 +- code/game/objects/items/devices/PDA/PDA.dm | 127 +- .../objects/items/devices/PDA/PDA_types.dm | 4 +- code/game/objects/items/devices/PDA/cart.dm | 44 +- code/game/objects/items/devices/PDA/radio.dm | 53 +- code/game/objects/items/devices/camera_bug.dm | 1 + code/game/objects/items/devices/multitool.dm | 2 +- .../objects/items/devices/pressureplates.dm | 2 +- .../objects/items/devices/radio/beacon.dm | 4 - .../items/devices/radio/electropack.dm | 85 +- .../items/devices/radio/encryptionkey.dm | 6 +- .../objects/items/devices/radio/headset.dm | 48 +- .../objects/items/devices/radio/intercom.dm | 18 +- .../game/objects/items/devices/radio/radio.dm | 419 +- code/game/objects/items/devices/scanners.dm | 6 +- code/game/objects/items/extinguisher.dm | 1 - code/game/objects/items/grenades/flashbang.dm | 3 + .../game/objects/items/grenades/ghettobomb.dm | 118 +- .../objects/items/grenades/syndieminibomb.dm | 2 +- code/game/objects/items/handcuffs.dm | 19 +- code/game/objects/items/holy_weapons.dm | 7 +- code/game/objects/items/mop.dm | 2 + code/game/objects/items/paiwire.dm | 2 +- code/game/objects/items/pinpointer.dm | 4 +- code/game/objects/items/plushes.dm | 2 +- code/game/objects/items/pneumaticCannon.dm | 18 +- code/game/objects/items/robot/robot_items.dm | 5 +- code/game/objects/items/shooting_range.dm | 2 +- code/game/objects/items/signs.dm | 20 +- .../items/stacks/sheets/sheet_types.dm | 13 +- code/game/objects/items/stacks/stack.dm | 6 +- code/game/objects/items/storage/book.dm | 1 + code/game/objects/items/storage/briefcase.dm | 1 + code/game/objects/items/storage/storage.dm | 6 + code/game/objects/items/tanks/watertank.dm | 2 +- code/game/objects/items/teleportation.dm | 5 +- code/game/objects/items/theft_tools.dm | 13 +- code/game/objects/items/tools/weldingtool.dm | 2 +- code/game/objects/items/tools/wirecutters.dm | 23 +- code/game/objects/items/trash.dm | 2 +- code/game/objects/items/twohanded.dm | 4 + code/game/objects/items/weaponry.dm | 2 +- code/game/objects/structures/aliens.dm | 2 +- code/game/objects/structures/artstuff.dm | 2 +- .../objects/structures/beds_chairs/bed.dm | 6 +- .../crates_lockers/closets/gimmick.dm | 208 +- .../crates_lockers/closets/job_closets.dm | 1 + .../crates_lockers/closets/secure/bar.dm | 20 +- .../closets/secure/hydroponics.dm | 22 +- .../crates_lockers/closets/secure/medical.dm | 2 +- .../crates_lockers/closets/secure/personal.dm | 100 +- .../closets/secure/scientist.dm | 4 +- .../closets/secure/secure_closets.dm | 20 +- .../crates_lockers/closets/secure/security.dm | 8 +- .../crates_lockers/crates/critter.dm | 2 +- .../structures/crates_lockers/crates/large.dm | 66 +- code/game/objects/structures/displaycase.dm | 6 +- code/game/objects/structures/door_assembly.dm | 248 +- .../objects/structures/door_assembly_types.dm | 236 + .../objects/structures/ghost_role_spawners.dm | 55 +- code/game/objects/structures/kitchen_spike.dm | 2 +- code/game/objects/structures/lattice.dm | 2 +- code/game/objects/structures/manned_turret.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 2 +- code/game/objects/structures/mop_bucket.dm | 2 +- code/game/objects/structures/reflector.dm | 6 +- code/game/objects/structures/safe.dm | 2 +- code/game/objects/structures/signs.dm | 9 +- code/game/objects/structures/target_stake.dm | 2 +- code/game/objects/structures/watercloset.dm | 1 - .../objects/structures/windoor_assembly.dm | 2 +- code/game/objects/structures/window.dm | 2 +- code/game/say.dm | 59 +- code/game/sound.dm | 4 +- code/game/turfs/simulated/floor/misc_floor.dm | 3 + code/game/turfs/simulated/wall/misc_walls.dm | 4 + code/game/turfs/simulated/walls.dm | 2 +- code/game/turfs/turf.dm | 2 +- code/game/world.dm | 18 +- .../code/game/machinery/Sleeper.dm | 2 + .../items/devices/radio/shockcollar.dm | 76 + .../code/game/objects/items/handcuffs.dm | 4 + tgstation.dme | 30 +- 230 files changed, 20742 insertions(+), 14130 deletions(-) create mode 100644 code/game/machinery/telecomms/computers/message.dm create mode 100644 code/game/machinery/telecomms/machines/message_server.dm create mode 100644 code/game/objects/structures/door_assembly_types.dm create mode 100644 modular_citadel/code/game/machinery/Sleeper.dm create mode 100644 modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm create mode 100644 modular_citadel/code/game/objects/items/handcuffs.dm diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 2e066413f7..790e628cba 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -229,7 +229,7 @@ /area/ruin/powered/beach) "aV" = ( /obj/effect/mob_spawn/human/beach/alive{ - flavour_text = "You're, like, totally a dudebro, bruh. Ch'yea. You came here, like, on spring break, hopin' to pick up some bangin' hot chicks, y'knaw?"; + flavour_text = "You're, like, totally a dudebro, bruh. Ch'yea. You came here, like, on spring break, hopin' to pick up some bangin' hot chicks, y'knaw?"; l_pocket = /obj/item/reagent_containers/food/snacks/pizzaslice/dank; uniform = /obj/item/clothing/under/pants/youngfolksjeans }, @@ -349,7 +349,7 @@ dir = 4 }, /obj/effect/mob_spawn/human/beach/alive{ - flavour_text = "You're a spunky lifeguard! It's up to you to make sure nobody drowns or gets eaten by sharks and stuff."; + flavour_text = "You're a spunky lifeguard! It's up to you to make sure nobody drowns or gets eaten by sharks and stuff."; id = /obj/item/card/id; id_access = "Medical Doctor"; id_job = "Lifeguard"; diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index cc961656f6..fe74e5a04d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -544,7 +544,7 @@ "bN" = ( /obj/effect/mob_spawn/cow{ dir = 4; - flavour_text = "You're a cow. You've lived a pampered life as a prized show heifer, a real blue-ribbon winner. After showing signs of a minor respiratory infection, your master took you to the hospital right away. He'd better come back soon. You're getting quite impatient."; + flavour_text = "You're a cow. You've lived a pampered life as a prized show heifer, a real blue-ribbon winner. After showing signs of a minor respiratory infection, your master took you to the hospital right away. He'd better come back soon. You're getting quite impatient."; mob_name = "Flossie" }, /turf/open/floor/plasteel/white, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm index c9c983f3bb..d77a0f7ec0 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm @@ -88,7 +88,7 @@ triggerer_only = 1 }, /obj/effect/step_trigger/message{ - message = "You've made a grave mistake, haven't you?"; + message = "You've made a grave mistake, haven't you?"; name = "ohfuck" }, /turf/open/floor/engine/cult{ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 56ed4a3716..c42f18a4cc 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -9,1185 +9,5438 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "ad" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/virology{ + frequency = 1449; + id_tag = "lavaland_syndie_virology_interior"; + locked = 1; + name = "Virology Lab Interior Airlock"; + req_access_txt = "150" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/virology) "ae" = ( -/turf/closed/wall/mineral/plastitanium/explosive, -/area/ruin/powered/syndicate_lava_base) +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/testlab) "af" = ( -/obj/structure/closet/secure_closet/bar{ - req_access = null; - req_access_txt = "150" +/obj/machinery/light/small{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) "ag" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/syndicake, -/obj/item/reagent_containers/food/snacks/syndicake, -/obj/item/reagent_containers/food/snacks/syndicake, -/obj/structure/sign/barsign{ - pixel_y = 32; +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24; + req_access = 150 + }, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"ap" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"aq" = ( +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"as" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"at" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/door/poddoor{ + id = "lavalandsyndi_chemistry" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"aL" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"aM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/chem_dispenser, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"cA" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/chemistry, +/obj/item/book/manual/wiki/chemistry, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"cG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/chem_master, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"cO" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dc" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"di" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"do" = ( +/obj/structure/closet/secure_closet/medical1{ req_access = null; req_access_txt = "150" }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"ah" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/salad/validsalad, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"ai" = ( -/obj/structure/rack{ - icon = 'icons/obj/stationobjs.dmi'; - icon_state = "minibar_left"; - name = "skeletal minibar" - }, -/obj/item/reagent_containers/food/drinks/bottle/vodka, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/wood, -/area/ruin/powered/syndicate_lava_base) -"aj" = ( -/obj/structure/rack{ - icon = 'icons/obj/stationobjs.dmi'; - icon_state = "minibar_right"; - name = "skeletal minibar" - }, -/obj/item/reagent_containers/food/drinks/bottle/gin, -/turf/open/floor/wood, -/area/ruin/powered/syndicate_lava_base) -"ak" = ( -/obj/structure/dresser, -/obj/structure/mirror{ - pixel_x = -26 - }, -/turf/open/floor/plasteel/vault, -/area/ruin/powered/syndicate_lava_base) -"al" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21" - }, -/turf/open/floor/plasteel/vault, -/area/ruin/powered/syndicate_lava_base) -"am" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22" - }, -/turf/open/floor/plasteel/vault, -/area/ruin/powered/syndicate_lava_base) -"an" = ( -/obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/toy/figure/syndie, -/turf/open/floor/plasteel/vault, -/area/ruin/powered/syndicate_lava_base) -"ao" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"ap" = ( -/turf/open/floor/plasteel/dark, -/area/ruin/powered/syndicate_lava_base) -"aq" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"ar" = ( -/obj/item/stack/sheet/mineral/plastitanium{ - amount = 30 - }, -/obj/item/stack/rods/fifty, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ dir = 9 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"as" = ( -/turf/open/floor/wood, -/area/ruin/powered/syndicate_lava_base) -"at" = ( -/obj/effect/mob_spawn/human/lavaland_syndicate{ - icon_state = "sleeper_s"; - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/ruin/powered/syndicate_lava_base) -"au" = ( -/turf/open/floor/plasteel/grimy, -/area/ruin/powered/syndicate_lava_base) -"av" = ( -/obj/effect/mob_spawn/human/lavaland_syndicate{ - icon_state = "sleeper_s"; - dir = 8 - }, -/turf/open/floor/plasteel/grimy, -/area/ruin/powered/syndicate_lava_base) -"aw" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"ax" = ( -/obj/item/stack/cable_coil/white, -/obj/item/stack/cable_coil/white, -/obj/item/stack/packageWrap, -/obj/item/hand_labeler, -/obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"ay" = ( -/obj/structure/table/wood, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/ammo_box/magazine/sniper_rounds, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"du" = ( /obj/machinery/light/small{ - brightness = 3; - dir = 8 + dir = 1 }, -/turf/open/floor/plasteel/grimy, -/area/ruin/powered/syndicate_lava_base) -"az" = ( -/obj/structure/table/wood, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/button/door{ + id = "lavalandsyndi_chemistry"; + name = "Chemistry Blast Door Control"; + pixel_y = 26; + req_access_txt = "150" }, -/turf/open/floor/plasteel/grimy, -/area/ruin/powered/syndicate_lava_base) -"aA" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 1 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"aB" = ( -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/structure/table/reinforced, -/obj/item/wrench, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dv" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"aC" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/wood{ - icon_state = "wood-broken4" +/obj/machinery/chem_heater, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dw" = ( +/obj/structure/chair/office/light{ + dir = 1 }, -/area/ruin/powered/syndicate_lava_base) -"aD" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/turf/open/floor/wood, -/area/ruin/powered/syndicate_lava_base) -"aE" = ( -/obj/structure/table/wood, -/obj/item/toy/nuke, -/obj/item/book/manual/nuclear, -/turf/open/floor/wood, -/area/ruin/powered/syndicate_lava_base) -"aF" = ( -/obj/structure/table/wood, -/obj/item/lighter{ - pixel_y = 3 +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate, -/turf/open/floor/wood, -/area/ruin/powered/syndicate_lava_base) -"aG" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/donut_box, -/turf/open/floor/wood, -/area/ruin/powered/syndicate_lava_base) -"aH" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dy" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"dA" = ( +/obj/structure/closet/l3closet, +/obj/machinery/power/apc{ + dir = 8; + name = "Chemistry APC"; + pixel_x = -24; + req_access = 150 }, -/turf/open/floor/wood, -/area/ruin/powered/syndicate_lava_base) -"aI" = ( -/obj/effect/mob_spawn/human/lavaland_syndicate/comms{ - icon_state = "sleeper_s"; +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dB" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dC" = ( +/obj/effect/baseturf_helper/lava_land/surface, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dE" = ( +/obj/structure/table/glass, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5; + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5; + pixel_y = 2 + }, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5; + pixel_x = 2; + pixel_y = -2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/glass/bottle/charcoal{ + pixel_x = 6 + }, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/turf/open/floor/plasteel/white/corner{ dir = 4 }, -/turf/open/floor/plasteel/grimy, -/area/ruin/powered/syndicate_lava_base) -"aJ" = ( -/obj/structure/sign/nosmoking_2, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"aK" = ( -/obj/structure/closet/crate/bin, -/obj/item/trash/syndi_cakes, -/turf/open/floor/plasteel/dark, -/area/ruin/powered/syndicate_lava_base) -"aL" = ( -/obj/structure/chair/stool/bar, -/turf/open/floor/plasteel/vault{ +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dG" = ( +/obj/structure/lattice/catwalk, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) +"dI" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/item/reagent_containers/glass/beaker/large, +/turf/open/floor/plasteel/white/side{ dir = 5 }, -/area/ruin/powered/syndicate_lava_base) -"aM" = ( -/obj/structure/chair/stool/bar, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dK" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 4 + }, +/obj/structure/closet/crate/secure/gear{ + req_access_txt = "150" + }, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/under/syndicate/combat, +/obj/item/clothing/under/syndicate/combat, +/obj/item/storage/belt/military, +/obj/item/storage/belt/military, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, -/area/ruin/powered/syndicate_lava_base) -"aN" = ( -/obj/structure/table/wood, -/obj/item/lipstick/random{ +/area/ruin/unpowered/syndicate_lava_base/cargo) +"dL" = ( +/obj/machinery/airalarm{ + pixel_y = 24; + req_access = 150 + }, +/obj/structure/closet/crate, +/obj/item/extinguisher{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/extinguisher{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/extinguisher{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/device/flashlight{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/device/flashlight{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/device/flashlight{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/device/radio/headset/syndicate/alt{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/device/radio/headset/syndicate/alt, +/obj/item/device/radio/headset/syndicate/alt{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"dM" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/item/storage/box/donkpockets{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/storage/box/donkpockets{ + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"dP" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"dQ" = ( +/obj/structure/sign/securearea, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"dR" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + name = "Experimentation Room"; + req_access_txt = "150" + }, +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndi"; + name = "Syndicate Research Experimentation Shutters" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"dS" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndi"; + name = "Syndicate Research Experimentation Shutters" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"dT" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dY" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"dZ" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/folder/white, +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -3 + }, +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -3 + }, +/obj/item/reagent_containers/dropper, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24; + req_access = 150 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"ea" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 8 + }, +/obj/structure/closet/crate/secure/weapon{ + req_access_txt = "150" + }, +/obj/item/ammo_box/c10mm{ + pixel_y = 6 + }, +/obj/item/ammo_box/c10mm, +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eb" = ( +/obj/structure/closet/crate, +/obj/item/storage/box/monkeycubes{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/toolbox/electrical{ + pixel_y = 4 + }, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ec" = ( +/obj/effect/turf_decal/box/white/corners, +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 }, -/obj/item/lipstick/random{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, -/obj/item/lipstick/random, -/obj/item/soap/syndie, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ed" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ee" = ( +/obj/structure/rack, +/obj/item/device/flashlight{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/device/flashlight, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ef" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "Cargo Bay APC"; + pixel_y = 24; + req_access = 150 + }, +/obj/structure/closet/emcloset/anchored, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eg" = ( +/obj/structure/closet/firecloset/full{ + anchored = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eh" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/virology) +"ei" = ( +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/syndicate_lava_base/virology) +"ej" = ( +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/mob/living/carbon/monkey, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ruin/powered/syndicate_lava_base) -"aO" = ( +/area/ruin/unpowered/syndicate_lava_base/testlab) +"ek" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"el" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ruin/powered/syndicate_lava_base) -"aP" = ( -/obj/structure/dresser, -/obj/structure/mirror{ - pixel_x = 26 +/area/ruin/unpowered/syndicate_lava_base/testlab) +"em" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "lavalandsyndi"; + name = "Syndicate Experimentation Lockdown Control"; + pixel_y = 26; + req_access_txt = "150" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"eo" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/metal/fifty, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"ep" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/syndicate, +/obj/item/stack/cable_coil/yellow, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"eq" = ( +/obj/structure/table/reinforced, +/obj/item/device/assembly/timer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/device/assembly/timer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/device/assembly/timer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/device/assembly/igniter, +/obj/item/device/assembly/igniter, +/obj/item/device/assembly/igniter, +/obj/item/device/assembly/voice, +/obj/item/device/assembly/voice, +/obj/item/device/assembly/voice, +/obj/item/device/assembly/signaler, +/obj/item/device/assembly/signaler, +/obj/item/device/assembly/signaler, +/obj/item/screwdriver/nuke, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"er" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -27; + pixel_y = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"es" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/closet/crate/bin, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"et" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"eu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/chem_heater, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"ev" = ( +/turf/open/floor/plasteel/white/corner, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"ew" = ( +/obj/structure/table/glass, +/obj/item/stack/cable_coil/white{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/cable_coil/white, +/obj/item/device/assembly/igniter{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/device/assembly/igniter{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/device/assembly/igniter{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/device/assembly/timer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/device/assembly/timer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/device/assembly/timer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/screwdriver{ + pixel_y = 20 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 6 + }, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"ex" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 }, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/ruin/powered/syndicate_lava_base) -"aQ" = ( -/obj/item/target, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ey" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ez" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eA" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/mining/glass{ + name = "Warehouse"; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eB" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eC" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/storage/box/lights/bulbs, +/obj/item/wrench, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eF" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + id = "lavalandsyndi_cargo" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eG" = ( +/obj/structure/closet/secure_closet/personal/patient, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 9 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"eH" = ( +/obj/structure/bed, +/obj/item/bedsheet, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/white/side{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"eI" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/virology) +"eJ" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/virology) +"eK" = ( +/obj/machinery/light/small, +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/mob/living/carbon/monkey, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ruin/powered/syndicate_lava_base) -"aR" = ( +/area/ruin/unpowered/syndicate_lava_base/testlab) +"eL" = ( +/obj/machinery/door/airlock/hatch{ + name = "Monkey Pen"; + req_access_txt = "150" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"eM" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"eN" = ( +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -24; + req_access = null; + req_access_txt = "150" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"eO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"eP" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"eQ" = ( +/obj/machinery/light/small, +/obj/structure/table/reinforced, +/obj/item/restraints/handcuffs, +/obj/item/device/taperecorder, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"eR" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white/side{ + dir = 10 + }, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"eS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/chem_master, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"eT" = ( +/obj/effect/turf_decal/bot, +/obj/structure/chair/office/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"eU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/chem_dispenser, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"eV" = ( +/obj/structure/closet/secure_closet/chemical{ + req_access_txt = "150" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 6 + }, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"eW" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eX" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 4 + }, +/obj/structure/closet/crate/internals, +/obj/item/tank/internals/oxygen/yellow, +/obj/item/tank/internals/oxygen/yellow, +/obj/item/tank/internals/oxygen/yellow, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eY" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/item/storage/box/donkpockets{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/storage/box/donkpockets{ + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 2 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"eZ" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/stack/sheet/cardboard{ + amount = 3 + }, +/obj/item/stack/rods/twentyfive, +/obj/item/stock_parts/cell/high/plus, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fa" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/brown/corner{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high/plus, +/turf/open/floor/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ff" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 10 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"fg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white/side{ + dir = 6 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"fh" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white/side{ + dir = 10 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"fi" = ( +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/box/syringes, +/obj/machinery/power/apc{ + dir = 1; + name = "Virology APC"; + pixel_y = 24; + req_access = 150 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 9 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"fj" = ( +/obj/structure/table/glass, +/obj/structure/reagent_dispensers/virusfood{ + pixel_y = 28 + }, +/obj/item/clothing/gloves/color/latex, +/obj/item/device/healthanalyzer, +/obj/item/clothing/glasses/hud/health, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/turf/open/floor/plasteel/white/side{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"fk" = ( +/obj/machinery/power/apc{ + dir = 2; + name = "Experimentation Lab APC"; + pixel_y = -24; + req_access = 150 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"fl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 25 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"fm" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical{ + name = "Chemistry Lab"; + req_access_txt = "150" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"fn" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"fo" = ( +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/window/southleft{ + base_state = "left"; + dir = 2; + icon_state = "left"; + name = "Chemistry"; + req_access_txt = "0" + }, +/obj/machinery/door/window/southleft{ + base_state = "left"; + dir = 1; + icon_state = "left"; + name = "Chemistry"; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"fp" = ( +/obj/structure/sign/chemistry, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"fq" = ( +/obj/machinery/vending/assist, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fr" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fs" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 8 + }, +/obj/structure/closet/crate, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = 3; + pixel_y = -3 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ft" = ( +/obj/effect/turf_decal/box/white/corners, +/obj/structure/closet/crate, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fu" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24; + req_access = 150 + }, +/obj/structure/table, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/head/soft{ + pixel_x = -8 + }, +/obj/item/clothing/head/soft{ + pixel_x = -8 + }, +/obj/item/device/radio{ + pixel_x = 5 + }, +/obj/item/device/radio{ + pixel_x = 5 + }, +/turf/open/floor/plasteel/brown{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fw" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fx" = ( +/obj/structure/sign/securearea, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fy" = ( +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation B"; + req_access_txt = "150" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/virology) +"fz" = ( +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation A"; + req_access_txt = "150" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/virology) +"fA" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/infections{ + pixel_y = 7 + }, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/spray/cleaner, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"fB" = ( +/obj/structure/chair/stool, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/white/corner{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"fC" = ( +/obj/machinery/smartfridge/chemistry/virology/preloaded, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"fD" = ( +/obj/structure/sign/biohazard, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/virology) +"fE" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/l3closet, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/airalarm{ + pixel_y = 24; + req_access = 150 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) +"fF" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/shower{ + pixel_y = 14 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"fG" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/machinery/door/airlock/hatch{ + name = "Experimentation Lab"; + req_access_txt = "150" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"fH" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"fI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"fO" = ( +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"fW" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/machinery/door/airlock/mining/glass{ + name = "Warehouse"; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"fY" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -27; + pixel_y = 1 + }, +/obj/structure/table, +/obj/item/folder/yellow, +/obj/item/stack/wrapping_paper{ + pixel_y = 5 + }, +/obj/item/stack/packageWrap, +/obj/item/hand_labeler, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown{ + dir = 9 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gb" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown/corner{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 8 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gd" = ( +/obj/machinery/door/airlock/external{ + req_access_txt = "150" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gf" = ( +/obj/structure/sign/vacuum{ + pixel_y = -32 + }, +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gg" = ( +/obj/structure/sign/fire{ + pixel_y = 32 + }, +/obj/structure/sign/xeno_warning_mining{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gh" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + req_access_txt = "150" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gj" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/virology) +"go" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/medical{ + desc = "Medical drug dispenser. Looks to have been outfitted with illicit software."; + extended_inventory = 1; + name = "SyndiMed Plus"; + premium = list(/obj/item/reagent_containers/hypospray/medipen = 2, /obj/item/storage/belt/medical = 2); + products = list(/obj/item/reagent_containers/syringe = 6, /obj/item/reagent_containers/dropper = 2, /obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/pill/patch/styptic = 3, /obj/item/reagent_containers/pill/insulin = 5, /obj/item/reagent_containers/pill/patch/silver_sulf = 3, /obj/item/reagent_containers/glass/bottle/charcoal = 2, /obj/item/reagent_containers/spray/medical/sterilizer = 1, /obj/item/reagent_containers/glass/bottle/epinephrine = 2, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/salglu_solution = 2, /obj/item/reagent_containers/glass/bottle/toxin = 2, /obj/item/reagent_containers/syringe/antiviral = 3, /obj/item/reagent_containers/pill/salbutamol = 1, /obj/item/device/healthanalyzer = 2); + req_access_txt = "150" + }, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gq" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gs" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 2; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/machinery/light/small, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/baseturf_helper/lava_land/surface, +/turf/open/floor/plasteel/white/side{ + dir = 9 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gu" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gv" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) +"gz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"gA" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/virology{ + frequency = 1449; + id_tag = "lavaland_syndie_virology_exterior"; + name = "Virology Lab Exterior Airlock"; + req_access_txt = "150" + }, +/obj/machinery/doorButtons/access_button{ + idDoor = "lavaland_syndie_virology_exterior"; + idSelf = "lavaland_syndie_virology_control"; + name = "Virology Access Button"; + pixel_y = -24; + req_access_txt = "150" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"gB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"gE" = ( +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) +"gF" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) +"gG" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"gH" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 2; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"gI" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) +"gJ" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) +"gK" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/brown/corner{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"gL" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/brown{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"gM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"gN" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"gO" = ( +/obj/structure/sign/cargo, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gP" = ( +/obj/machinery/photocopier, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown/corner{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gQ" = ( +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/baseturf_helper/lava_land/surface, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gS" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "lavalandsyndi_cargo"; + name = "Cargo Bay Blast Door Control"; + pixel_x = 26; + req_access_txt = "150" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"gT" = ( +/obj/machinery/door/airlock/virology/glass{ + name = "Monkey Pen"; + req_access_txt = "150" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gU" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24; + req_access = 150 + }, +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gV" = ( +/obj/structure/chair/office/light, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gX" = ( +/obj/machinery/doorButtons/airlock_controller{ + idExterior = "lavaland_syndie_virology_exterior"; + idInterior = "lavaland_syndie_virology_interior"; + idSelf = "lavaland_syndie_virology_control"; + name = "Virology Access Console"; + pixel_x = 24; + pixel_y = -5; + req_access_txt = "150" + }, +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 8 + }, +/obj/effect/turf_decal/caution/red{ + dir = 1; + pixel_y = -6 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"gY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/doorButtons/access_button{ + idDoor = "lavaland_syndie_virology_interior"; + idSelf = "lavaland_syndie_virology_control"; + name = "Virology Access Button"; + pixel_x = -24; + pixel_y = 8; + req_access_txt = "150" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) +"gZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) +"ha" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/main) +"hb" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 10 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"hc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/corner{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"hd" = ( +/turf/open/floor/plasteel/red/corner, +/area/ruin/unpowered/syndicate_lava_base/main) +"he" = ( +/turf/open/floor/plasteel/red/side, +/area/ruin/unpowered/syndicate_lava_base/main) +"hf" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side, +/area/ruin/unpowered/syndicate_lava_base/main) +"hg" = ( +/obj/machinery/light/small, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side, +/area/ruin/unpowered/syndicate_lava_base/main) +"hh" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/red/side, +/area/ruin/unpowered/syndicate_lava_base/main) +"hi" = ( +/turf/open/floor/plasteel/red/corner{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"hj" = ( +/turf/open/floor/plasteel/brown{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"hk" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Bay"; + req_access_txt = "0" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"hl" = ( +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"hm" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"hn" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ho" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/computer/shuttle/syndicate/recall{ + desc = "Occasionally used to call in a resupply shuttle if one is in range."; + dir = 8; + name = "syndicate cargo shuttle terminal"; + possible_destinations = "syndielavaland_cargo"; + shuttleId = "syndie_cargo" + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"hp" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/carbon/monkey, +/turf/open/floor/plasteel/white/side{ + dir = 9 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"hq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"hr" = ( +/mob/living/carbon/monkey, +/turf/open/floor/plasteel/white/side{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"hs" = ( +/obj/machinery/computer/pandemic, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door{ + id = "lavalandsyndi_virology"; + name = "Virology Blast Door Control"; + pixel_x = -26; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/white/side{ + dir = 10 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"ht" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/hand_labeler, +/obj/item/pen/red, +/obj/item/restraints/handcuffs, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side, +/area/ruin/unpowered/syndicate_lava_base/virology) +"hu" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5 + }, +/obj/item/stack/sheet/mineral/uranium{ + amount = 10 + }, +/obj/item/stack/sheet/mineral/gold{ + amount = 10 + }, +/turf/open/floor/plasteel/white/side, +/area/ruin/unpowered/syndicate_lava_base/virology) +"hv" = ( +/obj/machinery/disposal/bin, +/obj/structure/sign/deathsposal{ + pixel_x = 32 + }, +/obj/effect/turf_decal/stripes/red/box, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 6 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"hw" = ( +/obj/machinery/door/airlock/external{ + req_access_txt = "150" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"hx" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24; + req_access = 150 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"hy" = ( +/turf/open/floor/plasteel/red/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"hz" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"hA" = ( +/obj/structure/closet/emcloset/anchored, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"hB" = ( +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"hC" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Bay"; + req_access_txt = "0" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"hD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/storage/belt/utility, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"hE" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/carbon/monkey, +/turf/open/floor/plasteel/white/side{ + dir = 10 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"hF" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side, +/area/ruin/unpowered/syndicate_lava_base/virology) +"hG" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/carbon/monkey, +/turf/open/floor/plasteel/white/side{ + dir = 6 + }, +/area/ruin/unpowered/syndicate_lava_base/virology) +"hH" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndi_virology" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/virology) +"hI" = ( +/obj/structure/sign/vacuum{ + pixel_x = -32 + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"hJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"hK" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/sign/fire{ + pixel_x = 32 + }, /obj/structure/closet/emcloset/anchored, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/device/flashlight/seclite, /obj/item/clothing/mask/gas, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"aS" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21" - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"aT" = ( -/obj/machinery/door/airlock/hatch{ - name = "Dormitories"; - req_access_txt = "150" - }, -/turf/open/floor/plasteel/vault{ +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"hL" = ( +/obj/machinery/light/small{ dir = 8 }, -/area/ruin/powered/syndicate_lava_base) -"aU" = ( -/obj/structure/closet/emcloset, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/device/flashlight/seclite, -/obj/item/clothing/mask/gas, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ +/area/ruin/unpowered/syndicate_lava_base/main) +"hM" = ( +/obj/structure/table/wood, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/machinery/airalarm{ + pixel_y = 24; + req_access = 150 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"hN" = ( +/obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"aV" = ( -/obj/machinery/door/airlock/hatch{ - name = "Storage Closet"; - req_access_txt = "150" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"hO" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"hP" = ( +/obj/machinery/light/small{ dir = 8 }, -/area/ruin/powered/syndicate_lava_base) -"aW" = ( -/obj/machinery/door/airlock/hatch{ - name = "Restroom"; +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"hQ" = ( +/obj/structure/table/wood, +/obj/item/ammo_box/magazine/m10mm, +/obj/machinery/airalarm{ + pixel_y = 24; + req_access = 150 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"hR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown/corner{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"hS" = ( +/obj/structure/table/reinforced, +/obj/item/folder, +/obj/item/suppressor, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/ears/earmuffs, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"hT" = ( +/obj/machinery/vending/toyliberationstation{ req_access_txt = "150" }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/brown, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"hU" = ( +/obj/machinery/light/small, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"hV" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"hW" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 10 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/main) +"hX" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + req_access_txt = "150" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"hY" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + req_access_txt = "150" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"hZ" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/red/side{ dir = 8 }, -/area/ruin/powered/syndicate_lava_base) -"aX" = ( -/obj/structure/mirror{ - pixel_x = 28 +/area/ruin/unpowered/syndicate_lava_base/main) +"ia" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/red/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"ib" = ( +/obj/effect/mob_spawn/human/lavaland_syndicate{ + icon_state = "sleeper_s"; + dir = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"ic" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"id" = ( +/obj/structure/toilet{ + pixel_y = 18 }, /obj/structure/sink{ dir = 4; pixel_x = 11 }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/ruin/powered/syndicate_lava_base) -"aY" = ( +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"ie" = ( +/obj/effect/mob_spawn/human/lavaland_syndicate/comms{ + dir = 8; + icon_state = "sleeper_s" + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"if" = ( +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) +"ig" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"aZ" = ( +/turf/open/floor/plating{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"ih" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"ii" = ( +/obj/structure/table, +/obj/item/storage/toolbox/emergency, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 9 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"ij" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/corner{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"ik" = ( +/turf/open/floor/plasteel/red/corner{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"il" = ( +/obj/machinery/door/airlock{ + name = "Cabin 2"; + req_access_txt = "0" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"im" = ( +/obj/machinery/door/airlock{ + name = "Unisex Restrooms"; + req_access_txt = "0" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"in" = ( +/obj/machinery/door/airlock{ + name = "Cabin 4"; + req_access_txt = "0" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"ip" = ( +/obj/effect/turf_decal/stripes/red/corner, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"iq" = ( +/obj/structure/sign/securearea, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/main) +"ir" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line{ + dir = 9 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"is" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/circuit/red, +/area/ruin/unpowered/syndicate_lava_base/main) +"it" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line{ + dir = 5 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"iu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"iv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"iw" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -27; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"ix" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) +"iy" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Dormitories" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iz" = ( +/turf/open/floor/plasteel/neutral/corner{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/neutral/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iB" = ( +/obj/machinery/airalarm{ + pixel_y = 24; + req_access = 150 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/neutral/corner{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iC" = ( +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iD" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 2; + pixel_y = 24 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/neutral/corner{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/neutral/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iF" = ( +/obj/machinery/washing_machine, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iG" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"iH" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/caution/red{ + dir = 8; + pixel_x = 6 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"iI" = ( +/obj/machinery/door/airlock/vault{ + id_tag = "syndie_lavaland_vault"; + locked = 1; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"iJ" = ( +/turf/open/floor/circuit/red, +/area/ruin/unpowered/syndicate_lava_base/main) +"iK" = ( +/obj/machinery/syndicatebomb/self_destruct{ + anchored = 1 + }, +/turf/open/floor/circuit/red, +/area/ruin/unpowered/syndicate_lava_base/main) +"iL" = ( +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24; + req_access = 150 + }, +/turf/open/floor/circuit/red, +/area/ruin/unpowered/syndicate_lava_base/main) +"iM" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"iN" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/main) +"iO" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"iP" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"iQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/main) +"iR" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Dormitories" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iS" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/neutral/side, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iT" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 2; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/neutral/corner{ + dir = 8; + heat_capacity = 1e+006 + }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iU" = ( +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/machinery/power/apc{ + dir = 2; + name = "Dormitories APC"; + pixel_y = -24; + req_access = 150 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/neutral/corner, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iW" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/neutral/side, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/baseturf_helper/lava_land/surface, +/turf/open/floor/plasteel/neutral/corner{ + dir = 8; + heat_capacity = 1e+006 + }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iY" = ( +/obj/structure/table, +/obj/structure/bedsheetbin, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"iZ" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -27; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"ja" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "syndie_lavaland_vault"; + name = "Vault Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "150"; + specialfunctions = 4 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"jb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line{ + dir = 10 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"jc" = ( +/obj/machinery/light/small, +/turf/open/floor/circuit/red, +/area/ruin/unpowered/syndicate_lava_base/main) +"jd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"je" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"jf" = ( +/obj/machinery/door/airlock{ + name = "Cabin 1"; + req_access_txt = "0" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"jg" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"jh" = ( +/obj/machinery/door/airlock{ + name = "Cabin 3"; + req_access_txt = "0" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"ji" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 8; + name = "Primary Hallway APC"; + pixel_x = -24; + req_access = 150 + }, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"jj" = ( +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"jk" = ( +/turf/open/floor/plating{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"jl" = ( +/turf/open/floor/plasteel/red/side{ + dir = 10 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"jm" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 6 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"jn" = ( +/obj/effect/mob_spawn/human/lavaland_syndicate{ + icon_state = "sleeper_s"; + dir = 4 + }, +/obj/machinery/airalarm{ + pixel_y = 24; + req_access = 150 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"jo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"jp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"jq" = ( +/obj/effect/mob_spawn/human/lavaland_syndicate{ + dir = 8; + icon_state = "sleeper_s" + }, +/obj/machinery/airalarm{ + pixel_y = 24; + req_access = 150 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"jr" = ( +/obj/machinery/vending/snack/random{ + extended_inventory = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 9 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"js" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel/red/corner{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"jt" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/yellow/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"ju" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jv" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/toolcloset, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jw" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/firecloset/full{ + anchored = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jx" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndi_bar" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/bar) +"jy" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/bar) +"jz" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Bar" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/bar) +"jA" = ( +/obj/structure/table/wood, +/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/sniper_rounds, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"jB" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"jC" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"jD" = ( +/obj/machinery/vending/cola/random{ + extended_inventory = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"jE" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"jF" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/yellow/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"jG" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/machinery/door/airlock/engineering{ + name = "Engineering"; + req_access_txt = "150" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jI" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"ba" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24; + req_access = 150 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 6; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jK" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 8; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jL" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/lighter{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ + pixel_x = -3 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"jM" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/button/door{ + id = "lavalandsyndi_bar"; + name = "Bar Blast Door Control"; + pixel_y = 26; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"jN" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"jO" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 25 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"jP" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/bar) +"jQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"jR" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/red/corner{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"jS" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"jT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/yellow/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/main) +"jU" = ( +/obj/structure/sign/engineering, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/rack{ + dir = 8 + }, +/obj/item/clothing/gloves/combat, +/obj/item/crowbar, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"jY" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"jZ" = ( +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"ka" = ( +/obj/structure/closet/crate/bin, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kb" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/storage/box/lights/bulbs, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/item/clothing/head/welding, +/obj/item/stock_parts/cell/high/plus, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"kc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"kd" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 2; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"ke" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"kf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"kg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"kh" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"ki" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 2; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"kj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"kk" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/machinery/door/airlock/engineering{ + name = "Engineering"; + req_access_txt = "150" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"km" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/computer/monitor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kn" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"ko" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kq" = ( +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24; + req_access = 150 + }, +/obj/machinery/vending/coffee{ + extended_inventory = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kr" = ( +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "150" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/bar) +"ks" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"kt" = ( +/obj/structure/grille, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"ku" = ( +/turf/open/floor/plasteel/white/side, +/area/ruin/unpowered/syndicate_lava_base/main) +"kv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side, +/area/ruin/unpowered/syndicate_lava_base/main) +"kw" = ( +/obj/structure/table, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side, +/area/ruin/unpowered/syndicate_lava_base/main) +"kx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"ky" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kz" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ + dir = 8; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kA" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/power/apc{ + dir = 1; + name = "Engineering APC"; + pixel_y = 24; + req_access = 150 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 9; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kB" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kC" = ( +/obj/machinery/computer/atmos_control/tank{ + dir = 8; + frequency = 1442; + name = "Nitrogen Supply Control"; + output_tag = "syndie_lavaland_n2_out"; + sensors = list("syndie_lavaland_n2_sensor" = "Tank") + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kD" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kE" = ( +/obj/machinery/air_sensor{ + frequency = 1442; + id_tag = "syndie_lavaland_n2_sensor" + }, +/turf/open/floor/plating/airless, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kF" = ( +/obj/machinery/atmospherics/miner/nitrogen, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kG" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/beer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kH" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kJ" = ( +/obj/structure/chair/stool/bar, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kK" = ( +/obj/structure/chair/stool/bar, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kL" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kM" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/obj/machinery/vending/cigarette{ + extended_inventory = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kN" = ( +/obj/structure/reagent_dispensers/beerkeg, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"kP" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"kQ" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"kR" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" + }, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"kS" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" + }, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"kT" = ( +/obj/structure/sign/bluecross_2, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"kU" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/smes/engineering, +/obj/structure/cable/yellow, +/obj/structure/sign/electricshock{ + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/power/smes/engineering, +/obj/structure/cable/yellow, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kY" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/visible{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"kZ" = ( +/obj/machinery/atmospherics/components/trinary/mixer/flipped{ + dir = 4; + node1_concentration = 0.2; + node2_concentration = 0.8; + on = 1 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"la" = ( +/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lb" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 8; + frequency = 1442; + id_tag = "syndie_lavaland_n2_out"; + name = "nitrogen out" + }, +/turf/open/floor/plating/airless, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"ld" = ( +/turf/open/floor/plating/airless, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"le" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"lf" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lg" = ( +/obj/structure/chair/stool/bar, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lh" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"li" = ( +/obj/structure/table/wood, +/obj/item/toy/cards/deck/syndicate{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken4" + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lj" = ( +/obj/machinery/door/window/southleft{ + base_state = "right"; + dir = 1; + icon_state = "right"; + name = "Bar"; + req_access_txt = "0" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lk" = ( +/obj/structure/table/wood, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 30 + }, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/food/drinks/shaker, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"ll" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lm" = ( +/obj/structure/closet/secure_closet/medical1{ + req_access = null; + req_access_txt = "150" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 9 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"ln" = ( +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"lo" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/firstaid/fire, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"lp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"ls" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lt" = ( +/obj/machinery/atmospherics/pipe/simple/supplymain/visible, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lu" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"lw" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"lx" = ( +/obj/structure/bookcase/random, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"ly" = ( +/obj/structure/chair/stool/bar, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lz" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/glass/rag{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lA" = ( +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lC" = ( +/obj/structure/table/wood, +/obj/machinery/reagentgrinder, +/obj/item/kitchen/rollingpin, +/obj/item/kitchen/knife{ + pixel_x = 6 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lD" = ( +/obj/machinery/vending/boozeomat{ + req_access_txt = "0" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lE" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lF" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/closet/crate, +/obj/item/vending_refill/snack{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/vending_refill/snack{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/vending_refill/coffee, +/obj/item/vending_refill/cola, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lG" = ( +/obj/structure/table, +/obj/item/storage/box/syringes, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/gun/syringe/syndicate, +/turf/open/floor/plasteel/white/side{ + dir = 9 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"lH" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"lI" = ( +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"lJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"lK" = ( +/obj/structure/table, +/obj/item/storage/firstaid/regular, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"lL" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24; + req_access = 150 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/table, +/obj/item/stack/sheet/metal/fifty{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/item/stack/sheet/mineral/plastitanium{ + amount = 30 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lM" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lN" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 9; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lO" = ( +/obj/effect/baseturf_helper/lava_land/surface, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lP" = ( +/obj/machinery/computer/atmos_control/tank{ + dir = 8; + frequency = 1442; + name = "Oxygen Supply Control"; + output_tag = "syndie_lavaland_o2_out"; + sensors = list("syndie_lavaland_o2_sensor" = "Tank") + }, +/turf/open/floor/plasteel/blue/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lQ" = ( +/obj/machinery/air_sensor{ + frequency = 1442; + id_tag = "Syndicate_Construction_o2_sensor" + }, +/turf/open/floor/plating/airless, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lR" = ( +/obj/machinery/atmospherics/miner/oxygen, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"lS" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 9 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"lT" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + req_access_txt = "150" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"lU" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24; + req_access = 150 + }, +/obj/structure/chair/stool, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lV" = ( +/obj/structure/chair/stool/bar, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lW" = ( +/obj/structure/table/wood, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lX" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"lZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"ma" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/machinery/door/airlock{ + name = "Bar Storage"; + req_access_txt = "150" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"mb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"mc" = ( +/obj/structure/closet/crate, +/obj/item/storage/box/donkpockets{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/storage/box/donkpockets{ + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 2 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"md" = ( +/obj/machinery/sleeper/syndie{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"me" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"mf" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24; + req_access = 150 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"mg" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high/plus, +/obj/effect/decal/cleanable/dirt, +/obj/item/pipe_dispenser{ + pixel_y = 12 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mh" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mi" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 6 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mj" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "O2 to Incinerator"; + target_pressure = 4500 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mk" = ( +/obj/machinery/atmospherics/pipe/manifold/supplymain/visible, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"ml" = ( +/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/blue/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 8; + frequency = 1442; + id_tag = "syndie_lavaland_o2_out"; + name = "oxygen out" + }, +/turf/open/floor/plating/airless, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mn" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"mo" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"mp" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndi_telecomms" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"mq" = ( +/obj/structure/sign/vacuum{ + pixel_x = -32 + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"mr" = ( +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"ms" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/sign/fire{ + pixel_x = 32 + }, /obj/structure/closet/emcloset/anchored, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/device/flashlight/seclite, /obj/item/clothing/mask/gas, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bb" = ( +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"mt" = ( +/obj/machinery/computer/arcade/orion_trail, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"mu" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"bc" = ( -/obj/structure/bookcase/random, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"bd" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21" - }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"mv" = ( +/obj/structure/table/wood, /obj/machinery/light/small, +/obj/structure/cable/yellow, +/obj/machinery/power/apc{ + dir = 2; + name = "Bar APC"; + pixel_y = -24; + req_access = 150 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"mw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"mx" = ( +/obj/structure/table/wood, +/obj/machinery/microwave, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"my" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/snacks/chocolatebar, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, -/area/ruin/powered/syndicate_lava_base) -"be" = ( -/obj/structure/bookcase/random, -/turf/open/floor/plasteel/dark, -/area/ruin/powered/syndicate_lava_base) -"bf" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"bg" = ( -/obj/machinery/door/airlock/hatch{ - name = "Lounge"; - req_access_txt = "150" - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bh" = ( -/obj/machinery/chem_dispenser, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bi" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/syringe, -/obj/structure/sign/nosmoking_2{ - pixel_y = 32 - }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bj" = ( -/obj/machinery/chem_master, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bk" = ( -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/obj/machinery/reagentgrinder{ - desc = "Used to grind things up into raw materials and liquids."; +/area/ruin/unpowered/syndicate_lava_base/bar) +"mz" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; pixel_y = 5 }, -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/area/ruin/powered/syndicate_lava_base) -"bl" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/folder/white, -/obj/item/book/manual/wiki/chemistry, -/obj/item/book/manual/wiki/chemistry, -/obj/item/device/assembly/signaler, -/obj/item/device/assembly/signaler, -/obj/item/device/assembly/voice, -/obj/item/device/assembly/voice, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bm" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/beakers{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/syringes, -/obj/item/gun/syringe/syndicate, -/obj/item/storage/box/beakers, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bn" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"mA" = ( /obj/machinery/light/small{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bo" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bp" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder{ - desc = "Used to grind things up into raw materials and liquids."; - pixel_y = 5 - }, -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bq" = ( -/obj/structure/reagent_dispensers/virusfood{ - pixel_y = 32 - }, -/obj/structure/table/reinforced, -/obj/item/device/healthanalyzer, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"br" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, -/obj/machinery/computer/pandemic, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bs" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/beakers{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/syringes, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bt" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, -/obj/item/reagent_containers/blood/random, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bu" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/ruin/powered/syndicate_lava_base) -"bv" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bw" = ( -/obj/structure/bed/roller, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bx" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"by" = ( -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"bz" = ( -/obj/structure/window/reinforced, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"bA" = ( -/obj/machinery/door/window/brigdoor, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bB" = ( -/obj/machinery/chem_heater, -/obj/structure/extinguisher_cabinet{ +/obj/item/reagent_containers/blood/OMinus, +/obj/machinery/firealarm{ + dir = 8; pixel_x = -26 }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bC" = ( -/obj/structure/chair/office/dark{ +/area/ruin/unpowered/syndicate_lava_base/medbay) +"mB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"mC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"mD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"mE" = ( +/obj/structure/table/reinforced, +/obj/item/scalpel, +/obj/item/circular_saw{ + pixel_y = 9 + }, +/obj/machinery/light/small{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"mF" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -27; + pixel_y = 1 + }, +/obj/structure/chair/stool, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mG" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mH" = ( +/obj/machinery/atmospherics/pipe/manifold/orange/visible{ + dir = 8 + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mI" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 8 + }, +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/head/welding, +/obj/item/weldingtool/largetank, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mJ" = ( /obj/effect/turf_decal/stripes/line, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bD" = ( -/obj/structure/closet/crate/bin, -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 10 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bE" = ( -/turf/open/floor/plasteel/vault, -/area/ruin/powered/syndicate_lava_base) -"bF" = ( -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/timer{ - pixel_x = 3; - pixel_y = 3 +/obj/structure/reagent_dispensers/watertank, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mK" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/computer/atmos_control/tank{ + dir = 1; + frequency = 1442; + name = "Toxins Supply Control"; + output_tag = "syndie_lavaland_tox_out"; + sensors = list("syndie_lavaland_tox_sensor" = "Tank") }, -/obj/item/device/assembly/timer{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/device/assembly/timer{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bG" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/infections, -/obj/item/stack/sheet/mineral/silver{ - amount = 10 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bH" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"bI" = ( -/obj/machinery/door/airlock/hatch{ - name = "Monkey Pen"; +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"mM" = ( +/turf/open/floor/circuit/green, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"mN" = ( +/obj/structure/sign/securearea, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"mO" = ( +/obj/structure/filingcabinet/security, +/obj/machinery/button/door{ + id = "lavalandsyndi_telecomms"; + name = "Telecomms Blast Door Control"; + pixel_y = 26; req_access_txt = "150" }, /turf/open/floor/plasteel/dark, -/area/ruin/powered/syndicate_lava_base) -"bJ" = ( -/obj/structure/table/reinforced, -/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot, -/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bK" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21" - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bL" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/suit/toggle/labcoat, -/obj/item/clothing/suit/toggle/labcoat, -/obj/item/clothing/glasses/science, -/obj/item/clothing/glasses/science, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bM" = ( -/obj/machinery/smartfridge/chemistry/virology/preloaded, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bN" = ( -/obj/machinery/vending/toyliberationstation{ - req_access_txt = "150" - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"bO" = ( -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood/random, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"bP" = ( -/obj/structure/closet/crate/bin, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bQ" = ( -/obj/structure/chair/office/dark, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bR" = ( -/obj/machinery/chem_heater, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bS" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/beaker/large, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bT" = ( -/obj/structure/chair/office/dark, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"bU" = ( -/obj/machinery/door/airlock/hatch{ - name = "Monkey Pen"; - req_access_txt = "150" - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"bV" = ( -/obj/structure/table/reinforced, -/obj/item/folder, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bW" = ( -/obj/structure/table/reinforced, -/obj/item/suppressor/specialoffer, -/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted, -/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"bX" = ( -/obj/machinery/chem_master, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bY" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"bZ" = ( -/obj/machinery/chem_dispenser, -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"ca" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/bio_suit/general, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/head/bio_hood/general, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/science, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cb" = ( -/obj/machinery/shower{ - dir = 4; - icon_state = "shower"; - name = "emergency shower" - }, -/obj/machinery/shower{ - dir = 8; - icon_state = "shower"; - name = "emergency shower" - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"cc" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/light, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cd" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white, -/obj/item/stack/sheet/mineral/gold{ - amount = 10 - }, -/obj/item/stack/sheet/mineral/uranium{ - amount = 10 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"ce" = ( -/obj/structure/bed/roller, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"cf" = ( -/obj/structure/sign/securearea, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cg" = ( -/obj/machinery/door/airlock/hatch{ - name = "Firing Range"; - req_access_txt = "150" - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"ch" = ( -/obj/machinery/door/airlock/hatch{ - name = "Chemistry Lab"; - req_access_txt = "150" - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"ci" = ( -/obj/structure/sign/chemistry, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cj" = ( -/obj/structure/sign/biohazard, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"ck" = ( -/obj/machinery/door/airlock/hatch{ - name = "Virology Lab"; - req_access_txt = "150" - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"cl" = ( -/obj/structure/rack, -/obj/item/ammo_box/foambox{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/ammo_box/foambox, -/obj/item/ammo_box/foambox{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cm" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"co" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cp" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cq" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cr" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/bluecross_2, -/turf/open/floor/plating, -/area/ruin/powered/syndicate_lava_base) -"cs" = ( +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"mP" = ( +/obj/structure/filingcabinet/security, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"mQ" = ( +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"mR" = ( /obj/structure/table, -/obj/item/storage/firstaid/regular{ - pixel_x = 3; - pixel_y = 3 +/obj/item/storage/toolbox/syndicate, +/obj/item/device/multitool, +/obj/machinery/button/door{ + id = "lavalandsyndi_telecomms"; + name = "Telecomms Blast Door Control"; + pixel_x = 26; + req_access_txt = "150" }, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/regular{ - pixel_x = -3; +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"mS" = ( +/obj/machinery/door/airlock/external{ + req_access_txt = "150" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"mT" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"mU" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/bar) +"mV" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer, +/obj/structure/sign/barsign{ + pixel_y = -32; + req_access = null; + req_access_txt = "0" + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"mW" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"mX" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/storage/toolbox/mechanical, +/obj/item/stack/cable_coil/yellow{ + pixel_x = 2; pixel_y = -3 }, -/turf/open/floor/plasteel/vault, -/area/ruin/powered/syndicate_lava_base) -"ct" = ( +/obj/item/device/multitool, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"mY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"mZ" = ( /obj/machinery/sleeper/syndie{ - dir = 8 + dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"na" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 }, -/area/ruin/powered/syndicate_lava_base) -"cu" = ( -/obj/structure/closet/crate/secure, -/obj/item/target, -/obj/item/target, -/obj/item/target/alien, -/obj/item/target/alien, -/obj/item/target/clown, -/obj/item/target/clown, -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"nb" = ( +/obj/structure/table/optable, +/obj/item/surgical_drapes, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 4 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/area/ruin/unpowered/syndicate_lava_base/medbay) +"nc" = ( +/obj/machinery/computer/turbine_computer{ + dir = 1; + id = "syndie_lavaland_incineratorturbine" }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cw" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cx" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cy" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cz" = ( -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"cB" = ( -/obj/machinery/door/airlock/hatch{ - name = "Infirmary"; +/obj/machinery/button/door{ + id = "syndie_lavaland_turbinevent"; + name = "Turbine Vent Control"; + pixel_x = 6; + pixel_y = -24; req_access_txt = "150" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/machinery/button/door{ + id = "syndie_lavaland_auxincineratorvent"; + name = "Auxiliary Vent Control"; + pixel_x = -6; + pixel_y = -24; + req_access_txt = "150" }, -/area/ruin/powered/syndicate_lava_base) -"cC" = ( -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood/random, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"nd" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/area/ruin/powered/syndicate_lava_base) -"cD" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "lavalandsyndi"; - name = "Syndicate Research Experimentor Shutters" +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"ne" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/doorButtons/airlock_controller{ + idExterior = "syndie_lavaland_incinerator_exterior"; + idInterior = "syndie_lavaland_incinerator_interior"; + idSelf = "syndie_lavaland_incinerator_access"; + name = "Incinerator Access Console"; + pixel_x = -8; + pixel_y = -26; + req_access_txt = "150" }, +/obj/machinery/button/ignition{ + id = "syndie_lavaland_Incinerator"; + pixel_x = 6; + pixel_y = -24 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"nf" = ( +/obj/structure/sign/fire, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"ng" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plating, -/area/ruin/powered/syndicate_lava_base) -"cE" = ( -/obj/machinery/door/airlock/hatch{ - name = "Experimentation Room"; - req_access_txt = "150" +/area/ruin/unpowered/syndicate_lava_base/engineering) +"nh" = ( +/obj/machinery/telecomms/relay/preset/ruskie{ + use_power = 0 }, -/turf/open/floor/plasteel/vault{ +/obj/machinery/light/small{ dir = 8 }, -/area/ruin/powered/syndicate_lava_base) -"cF" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"ni" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"nj" = ( /obj/machinery/door/airlock/hatch{ name = "Telecommunications Control"; req_access_txt = "150" }, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"nk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/baseturf_helper/lava_land/surface, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"nl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"nm" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 }, -/area/ruin/powered/syndicate_lava_base) -"cG" = ( -/turf/open/floor/engine, -/area/ruin/powered/syndicate_lava_base) -"cH" = ( /obj/structure/noticeboard{ - pixel_y = 32 + dir = 8; + pixel_x = 27 }, -/obj/machinery/light{ +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"nn" = ( +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"no" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/red/corner{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"np" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nq" = ( +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nr" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ dir = 5 }, -/area/ruin/powered/syndicate_lava_base) -"cI" = ( -/obj/structure/table, -/obj/item/storage/toolbox/syndicate, -/obj/item/device/multitool, -/turf/open/floor/plasteel/vault{ - dir = 8 +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"ns" = ( +/obj/structure/closet/emcloset/anchored, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, -/area/ruin/powered/syndicate_lava_base) -"cJ" = ( -/obj/item/surgicaldrill, -/obj/item/circular_saw, -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 }, -/area/ruin/powered/syndicate_lava_base) -"cK" = ( -/obj/structure/sink{ +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 9 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4; - pixel_x = 11 + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 }, -/obj/structure/mirror{ - pixel_x = 30 +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc{ + dir = 1; + name = "Arrival Hallway APC"; + pixel_y = 24; + req_access = 150 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nu" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/corner{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nw" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 2; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nx" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" + }, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"ny" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"nz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"nA" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/white/corner, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"nB" = ( +/obj/structure/table/reinforced, +/obj/item/surgicaldrill, +/obj/item/cautery, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"nC" = ( +/obj/structure/table/reinforced, +/obj/item/retractor, +/obj/item/hemostat, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 6 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"nD" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass{ + autoclose = 0; + frequency = 1449; + heat_proof = 1; + id_tag = "syndie_lavaland_incinerator_interior"; + locked = 1; + name = "Turbine Interior Airlock"; + req_access_txt = "150" + }, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"nE" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"nF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 1; + frequency = 1442; + id_tag = "syndie_lavaland_tox_out"; + name = "toxin out" + }, +/turf/open/floor/plating/airless, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"nG" = ( +/obj/machinery/air_sensor{ + frequency = 1442; + id_tag = "syndie_lavaland_tox_sensor" + }, +/turf/open/floor/plating/airless, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"nH" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24; + req_access = 150 + }, +/obj/machinery/light/small{ + dir = 8 }, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/ruin/powered/syndicate_lava_base) -"cL" = ( -/obj/item/stack/cable_coil/white{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/syndicate, -/obj/item/stack/cable_coil/white, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"nI" = ( +/obj/machinery/computer/camera_advanced, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 5 }, -/area/ruin/powered/syndicate_lava_base) -"cM" = ( -/obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"cN" = ( +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"nJ" = ( /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ broadcasting = 0; @@ -1197,67 +5450,332 @@ name = "Pirate Radio Listening Channel" }, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"nK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/area/ruin/powered/syndicate_lava_base) -"cO" = ( -/obj/machinery/computer/camera_advanced, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/ruin/powered/syndicate_lava_base) -"cP" = ( -/obj/structure/filingcabinet/chestdrawer, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"nL" = ( +/obj/machinery/door/airlock/hatch{ + name = "Telecommunications"; + req_access_txt = "150" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"nM" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nO" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nP" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nQ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/corner{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nS" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/machinery/firealarm{ + dir = 2; + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nU" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/airalarm{ + pixel_y = 24; + req_access = 150 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/red/corner{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nW" = ( +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nX" = ( +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nY" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/floorgrime, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nZ" = ( +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"oa" = ( +/turf/open/floor/plasteel/white/side{ + dir = 10 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"ob" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"oc" = ( +/obj/machinery/light/small, +/obj/structure/extinguisher_cabinet{ + pixel_y = -29 + }, +/obj/structure/cable/yellow, +/obj/machinery/power/apc{ + dir = 4; + name = "Medbay APC"; + pixel_x = 24; + req_access = 150 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white/side{ + dir = 6 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"od" = ( +/obj/machinery/light/small{ dir = 8 }, -/area/ruin/powered/syndicate_lava_base) -"cQ" = ( -/obj/item/cautery, -/obj/item/scalpel, -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/machinery/doorButtons/access_button{ + idDoor = "syndie_lavaland_incinerator_exterior"; + idSelf = "syndie_lavaland_incinerator_access"; + layer = 3.1; + name = "Incinerator airlock control"; + pixel_x = 8; + pixel_y = -24 }, -/area/ruin/powered/syndicate_lava_base) -"cR" = ( -/obj/structure/table/optable, -/obj/item/surgical_drapes, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"oe" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/area/ruin/powered/syndicate_lava_base) -"cS" = ( -/obj/item/retractor, -/obj/item/hemostat, -/obj/structure/table/reinforced, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"of" = ( /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 2; + on = 0; + target_pressure = 101.325 }, -/area/ruin/powered/syndicate_lava_base) -"cT" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 +/obj/machinery/doorButtons/access_button{ + idDoor = "syndie_lavaland_incinerator_interior"; + idSelf = "syndie_lavaland_incinerator_access"; + name = "Incinerator airlock control"; + pixel_x = -8; + pixel_y = 24 }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"cU" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22" - }, -/obj/structure/extinguisher_cabinet{ +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"og" = ( +/obj/machinery/atmospherics/miner/toxins, +/obj/machinery/light/small, +/turf/open/floor/plating/airless, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"oh" = ( +/obj/machinery/firealarm{ + dir = 8; pixel_x = -26 }, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/ruin/powered/syndicate_lava_base) -"cV" = ( +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"oi" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"oj" = ( /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ broadcasting = 1; @@ -1267,455 +5785,277 @@ name = "Pirate Radio Broadcast Channel" }, /turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"ok" = ( +/obj/structure/chair{ dir = 8 }, -/area/ruin/powered/syndicate_lava_base) -"cW" = ( -/obj/structure/sign/fire{ - pixel_x = -32 - }, -/turf/open/floor/engine, -/area/ruin/powered/syndicate_lava_base) -"cX" = ( -/obj/structure/table/reinforced, -/obj/item/device/assembly/signaler, -/obj/item/device/assembly/signaler, -/obj/item/device/assembly/voice, -/obj/item/device/assembly/voice, -/obj/item/screwdriver/nuke, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"cY" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/plasteel{ - amount = 15 - }, -/obj/item/device/electropack, -/obj/item/device/taperecorder, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"cZ" = ( -/obj/structure/filingcabinet/security, -/obj/machinery/light{ - dir = 8 +/obj/structure/cable/yellow, +/obj/machinery/power/apc{ + dir = 2; + name = "Telecommunications APC"; + pixel_y = -24; + req_access = 150 }, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/ruin/powered/syndicate_lava_base) -"da" = ( +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"ol" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/rack{ + dir = 8 + }, +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, +/obj/item/device/mining_scanner, +/obj/item/pickaxe, +/turf/open/floor/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"om" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"on" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = -29 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/red/side, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"oo" = ( +/turf/open/floor/plasteel/red/side, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"op" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/plasteel/red/side, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"oq" = ( +/obj/machinery/button/door{ + id = "lavalandsyndi_arrivals"; + name = "Arrivals Blast Door Control"; + pixel_y = -26; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/red/side, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"or" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/storage/belt/medical, +/obj/effect/decal/cleanable/dirt, +/obj/item/crowbar, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/neck/stethoscope, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"os" = ( +/obj/machinery/vending/medical{ + desc = "Medical drug dispenser. Looks to have been outfitted with illicit software."; + extended_inventory = 1; + name = "SyndiMed Plus"; + premium = list(/obj/item/reagent_containers/hypospray/medipen = 2, /obj/item/storage/belt/medical = 2); + products = list(/obj/item/reagent_containers/syringe = 6, /obj/item/reagent_containers/dropper = 2, /obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/pill/patch/styptic = 3, /obj/item/reagent_containers/pill/insulin = 5, /obj/item/reagent_containers/pill/patch/silver_sulf = 3, /obj/item/reagent_containers/glass/bottle/charcoal = 2, /obj/item/reagent_containers/spray/medical/sterilizer = 1, /obj/item/reagent_containers/glass/bottle/epinephrine = 2, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/salglu_solution = 2, /obj/item/reagent_containers/glass/bottle/toxin = 2, /obj/item/reagent_containers/syringe/antiviral = 3, /obj/item/reagent_containers/pill/salbutamol = 1, /obj/item/device/healthanalyzer = 2); + req_access_txt = "150" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"ot" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass{ + autoclose = 0; + frequency = 1449; + heat_proof = 1; + id_tag = "syndie_lavaland_incinerator_exterior"; + locked = 1; + name = "Turbine Exterior Airlock"; + req_access_txt = "150" + }, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"ou" = ( +/obj/machinery/computer/message_monitor{ + dir = 1 + }, +/obj/item/paper/monitorkey, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"ov" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"ow" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"ox" = ( +/obj/structure/grille, +/obj/structure/window/plastitanium, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + id = "lavalandsyndi_arrivals" }, -/area/ruin/powered/syndicate_lava_base) -"db" = ( -/obj/machinery/computer/message_monitor, -/obj/item/paper/monitorkey, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"oy" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"oz" = ( +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/ruin/powered/syndicate_lava_base) -"dd" = ( -/obj/effect/baseturf_helper/lava_land/surface, -/turf/open/floor/plasteel/vault{ - dir = 5 +/area/ruin/unpowered/syndicate_lava_base/engineering) +"oA" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/area/ruin/powered/syndicate_lava_base) -"de" = ( -/obj/machinery/button/door{ - id = "lavalandsyndi"; - name = "Syndicate Experimentor Lockdown Control"; - pixel_x = 26; - req_access_txt = "150" +/obj/machinery/igniter{ + id = "syndie_lavaland_Incinerator"; + luminosity = 2; + on = 0 }, -/turf/open/floor/engine, -/area/ruin/powered/syndicate_lava_base) -"df" = ( -/obj/machinery/button/door{ - id = "lavalandsyndi"; - name = "Syndicate Experimentor Lockdown Control"; - pixel_x = -26; - req_access_txt = "150" +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/area/ruin/unpowered/syndicate_lava_base/engineering) +"oB" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 1; + frequency = 1441; + id = "syndie_lavaland_inc_in" }, -/area/ruin/powered/syndicate_lava_base) -"dg" = ( -/obj/item/stack/sheet/mineral/plastitanium{ - amount = 30 +/obj/structure/sign/vacuum{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + name = "EXTERNAL AIRLOCK"; + pixel_y = -32 }, -/obj/item/stack/rods/fifty, -/obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 4 +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/area/ruin/unpowered/syndicate_lava_base/engineering) +"oC" = ( +/obj/machinery/door/poddoor{ + id = "syndie_lavaland_auxincineratorvent"; + name = "Auxiliary Incinerator Vent" }, -/area/ruin/powered/syndicate_lava_base) -"dh" = ( -/obj/structure/filingcabinet/medical, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/ruin/powered/syndicate_lava_base) -"di" = ( -/turf/open/floor/circuit/green, -/area/ruin/powered/syndicate_lava_base) -"dj" = ( -/obj/machinery/door/poddoor/preopen{ - id = "lavalandsyndi"; - name = "Syndicate Research Experimentor Shutters" +/area/ruin/unpowered/syndicate_lava_base/engineering) +"oD" = ( +/obj/structure/sign/xeno_warning_mining{ + pixel_x = -32 }, -/obj/machinery/door/airlock/hatch{ - name = "Experimentation Room"; - req_access_txt = "150" +/obj/structure/sign/fire{ + pixel_x = 32 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"oE" = ( +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 }, -/area/ruin/powered/syndicate_lava_base) -"dk" = ( -/obj/item/stack/sheet/metal/fifty, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, -/obj/structure/table/reinforced, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade/large, -/obj/item/grenade/chem_grenade/large, -/obj/item/grenade/chem_grenade/large, -/obj/item/grenade/chem_grenade/large, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/machinery/power/compressor{ + comp_id = "syndie_lavaland_incineratorturbine"; + dir = 1; + luminosity = 2 }, -/area/ruin/powered/syndicate_lava_base) -"dl" = ( -/obj/machinery/door/airlock/hatch{ - name = "Self Destruct Control"; - req_access_txt = "150" +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/area/ruin/unpowered/syndicate_lava_base/engineering) +"oF" = ( +/obj/structure/sign/securearea, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"oG" = ( +/obj/structure/cable, +/obj/machinery/power/turbine{ + dir = 2; + luminosity = 2 }, -/area/ruin/powered/syndicate_lava_base) -"dm" = ( -/obj/machinery/telecomms/relay/preset/ruskie{ - use_power = 0 +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/area/ruin/unpowered/syndicate_lava_base/engineering) +"oH" = ( +/obj/machinery/door/poddoor{ + id = "syndie_lavaland_turbinevent"; + name = "Turbine Vent" }, -/area/ruin/powered/syndicate_lava_base) -"dn" = ( -/obj/machinery/door/airlock/hatch{ - name = "Syndicate Recon Outpost"; - req_access_txt = "150" +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/obj/structure/fans/tiny, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"do" = ( -/turf/open/floor/circuit/red, -/area/ruin/powered/syndicate_lava_base) -"dp" = ( -/obj/machinery/door/airlock/hatch{ - name = "Monkey Pen"; - req_access_txt = "150" - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"dq" = ( +/area/ruin/unpowered/syndicate_lava_base/engineering) +"oI" = ( /obj/structure/sign/vacuum{ pixel_x = -32 }, /obj/machinery/light/small{ - brightness = 3; dir = 8 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"oJ" = ( +/obj/effect/baseturf_helper/lava_land/surface, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"oK" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/area/ruin/powered/syndicate_lava_base) -"dr" = ( -/obj/structure/sign/xeno_warning_mining{ - pixel_x = 32 - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"ds" = ( -/obj/machinery/syndicatebomb/self_destruct, -/turf/open/floor/circuit/red, -/area/ruin/powered/syndicate_lava_base) -"dt" = ( -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"fJ" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/wood, -/area/ruin/powered/syndicate_lava_base) -"fK" = ( -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/wood, -/area/ruin/powered/syndicate_lava_base) -"fL" = ( -/obj/machinery/light{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4; + piping_layer = 3; + pixel_x = 5; + pixel_y = 5 }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"fM" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22" - }, -/obj/machinery/light/small, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"fN" = ( -/obj/machinery/light/small, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"fP" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"fQ" = ( -/obj/structure/bed/roller, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"fR" = ( -/obj/machinery/light{ - dir = 4 +/obj/effect/baseturf_helper/lava_land/surface, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/main) +"oL" = ( +/obj/effect/baseturf_helper/lava_land/surface, +/turf/open/floor/plasteel/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"oM" = ( +/obj/effect/baseturf_helper/lava_land/surface, +/turf/open/floor/plasteel, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"oN" = ( +/obj/effect/baseturf_helper/lava_land/surface, +/turf/open/floor/plasteel/red/side, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"oO" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 }, /turf/open/floor/plasteel/dark, -/area/ruin/powered/syndicate_lava_base) -"fS" = ( -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood/random, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"fT" = ( -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"fU" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"fV" = ( -/obj/machinery/light/small, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ruin/powered/syndicate_lava_base) -"fX" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"fZ" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ruin/powered/syndicate_lava_base) -"ga" = ( -/obj/machinery/light/small, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"ge" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/engine, -/area/ruin/powered/syndicate_lava_base) -"gi" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/circuit/green, -/area/ruin/powered/syndicate_lava_base) -"gk" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/circuit/red, -/area/ruin/powered/syndicate_lava_base) -"gl" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/circuit/red, -/area/ruin/powered/syndicate_lava_base) -"gm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"go" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) -"gD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered/syndicate_lava_base) +/area/ruin/unpowered/syndicate_lava_base/bar) (1,1,1) = {" aa @@ -1723,8 +6063,10 @@ aa aa aa aa -ab -ab +aa +aa +aa +aa ab ab ab @@ -1754,6 +6096,11 @@ ab ab ab ab +ab +aa +aa +aa +aa aa aa "} @@ -1762,6 +6109,9 @@ aa aa aa aa +aa +aa +aa ab ab ab @@ -1795,10 +6145,19 @@ ab ab ab ab +ab +ab +aa +aa aa "} (3,1,1) = {" aa +aa +aa +aa +ab +aa ab ab ab @@ -1836,9 +6195,12 @@ ab ab ab ab +ab +aa "} (4,1,1) = {" aa +aa ab ab ab @@ -1870,73 +6232,26 @@ ab ab ab ab +mn +mn +mn +mn +mn ab ab ab ab ab aa +aa "} (5,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(6,1,1) = {" aa ab ab ab ab ab -ac -ab -ab -ab -ab -ab -ac -ab -ab -ab -ac -ac -ac ab ab ab @@ -1956,6 +6271,73 @@ ab ab ab ab +ab +ab +ab +ab +ab +ab +ab +mn +mn +mM +nh +mM +mn +mn +ab +ab +ab +ab +ab +aa +"} +(6,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +mn +mM +mM +ni +mM +mM +mn +ab +ab +ab +ab +aa +aa "} (7,1,1) = {" aa @@ -1969,6 +6351,12 @@ ab ab ab ab +eh +eh +eh +eh +gj +eh ab ab ab @@ -1978,26 +6366,29 @@ ab ab ab ab -ac -ab -ac -ac -ab -ab -ab -ac -ab -ac -ac -ac -ac ab ab ab ab ab +ab +mn +mo +mN +nj +mn +mn +mn +ab +ab +ab +ab +ab +aa "} (8,1,1) = {" +aa +ab ab ab ab @@ -2007,37 +6398,44 @@ ab ab ab ac -ac -ac -ab -ab -ac -ac -ac -ac -ab -ac -ac -ab -ab -ac -ad -ad -ad -ad -ad -ad -ae -ad -ad -ac +eh +eG +ff +eI +go +eh +eh +eh +eh ab ab ab ab ab +ab +ab +ab +ab +ab +ab +ab +ab +mp +mP +ni +nH +oh +mn +mn +ab +ab +ab +ab +aa "} (9,1,1) = {" +aa +aa ab ab ab @@ -2046,31 +6444,36 @@ ab ab ab ab -ac -ad -ad -ad -ad -ad -ae -ad -ad -ad -ad -ad -ad -ae -ad -ad -cG -ge -cG -cW -cG -ge -cG -ad -ac +ab +eh +eH +fg +fy +gp +eI +hp +hE +eh +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +mp +mP +nk +nI +oi +ou +mn ab ab ab @@ -2087,30 +6490,37 @@ ab ab ab ab -ad -aq -aq -aq -aY -fP -gm -bz -bJ -bN -bV -cf -cl -cu -ad -cG -cG -cG -cG -cG -cG -cG -ad ab +ac +eh +eI +eI +eI +gq +gT +hq +hF +eh +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +mp +mQ +nl +nJ +oj +ov +mn ab ab ab @@ -2118,44 +6528,51 @@ ab ab "} (11,1,1) = {" +aa +ab +ab +ab +ab ab ab ab ab ab ac +eh +eG +fh +eI +gr +eI +hr +hG +eh ab ab ab -ad -aq -aQ -aO -aO -aO -aO -bA -aO -aq -aq -cg -aq -aq -cD -cG -cG -cG -cG -cG -cG -cG -ad ab ab ab ab ab ab +ab +ab +ab +ab +mp +mR +nm +nK +ok +mn +mn +ab +ab +ab +ab +ab "} (12,1,1) = {" ab @@ -2165,31 +6582,38 @@ ab ab ab ab -ac -ac -ad -aq -fL -aq -aZ -aq -gn -bz -bK -aq -bW -ad -aS -aq -ad -cG -cG -cG -cG -cG -cG -cG -ad +ab +ab +ab +ab +eh +eH +fg +fz +gs +eh +gj +eh +eh +ab +ab +ab +ab +ab +ab +dG +dG +dG +dG +dG +dG +lS +mn +mo +mn +nL +mn +mn ab ab ab @@ -2204,33 +6628,40 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -bu -cg -ad -cG -cG -cG -cG -cG -cG -cG -ad -ac +ab +ab +ab +ab +ab +eh +eh +eI +eI +gt +gU +hs +hH +ab +ab +ab +ab +ab +ab +dG +dG +ig +iu +iu +iu +lv +lT +mq +mS +nn +nM +mT +mT +ab ab ab ab @@ -2244,33 +6675,40 @@ ab ab ab ab -ad -ao -aw -aA -aJ -aR -aU -ba -ad -bh -bB -aS -fS -bO -cf -cm -gm -ad -cG -cG -cG -cG -cG -cG -cG -ad +ab +ab +ab +ab +ab ac +eh +fi +fA +gu +gV +ht +hH +ab +ab +ab +ab +ab +dG +dG +ig +je +iv +jk +le +lw +lT +mr +mS +nn +nN +ol +mT +ab ab ab ab @@ -2284,34 +6722,41 @@ ab ab ab ab -ad -ap -aq -ap -aq -aq -ap -aq -ad -bi -bC -aq -ap -aq -ch -cn -cw -ad -cG -cG -cG -cG -de -cG -cG -ad -ac -ac +ab +ab +ab +ab +ab +ei +eJ +fj +fB +gv +gW +hu +hH +ab +ab +ab +ab +dG +dG +ig +je +jk +jx +jx +jP +jy +jy +ms +mT +no +nN +ol +ow +ab +ab ab ab ab @@ -2323,35 +6768,42 @@ ab ab ab ab +ab +ac +ab +ac ac -ad -aq -ap -aq -ap -ap -aq -ap -ad -bj -bD -aq -aq -aq -ci -cn -cx -ad -cf -cD -cD -cD -ad -dj -ad ae -ad -ad +ae +aL +ae +fC +gw +gX +hv +hH +ab +ab +ab +dG +dG +ig +je +jk +jx +jx +kG +lf +lx +jy +jy +jy +np +nO +mT +mT +mT +oF ab ab ab @@ -2362,36 +6814,43 @@ ab ab ab ab -ab -ac -ad -ar -ax -aB -ad -aS -aq -bb -ad -bk -bE -aq -bP -bX -ad -fX -ga ae -aS -cL -bF -cX -df -aq -cU -bu -dt +ae +ae +aL +ae +ae +ae +ej +eK +ae +fD ad +eh +gj +eh +hW +dG +dG +dG +ig +je +iv +jx +jx +kn +kH +jN +oO +lU +mt +mU +np +nP +mS +oI +oD +lT ab ab ab @@ -2401,37 +6860,44 @@ ab ab ab ab -ab -ab -ad -ad -ad -ad -ad -ad -ad -aV -ad ae -bl -bE -aq -bQ -bY -bu -cn -cw -cE +ae aq aq aq +dc aq -aq -aq -aq -dp -aO -ad +dQ +ek +eL +ae +fE +gy +gY +hw +hI +hX +ig +iu +iu +je +jk +jx +jx +jN +jZ +jN +jZ +jN +jZ +kn +mU +nq +nQ +mT +mT +mT +oF ab ab ab @@ -2441,37 +6907,44 @@ ab ab ab ab -ab -ab -ad -af -as -fJ -aC -aK -aq +ae ap -bc -ad -bm -bF -bL -bR -bZ -ad -cn -cw -cf aq -fL -cT -cY -dg -dk -aS -bu -dt -ad +aq +aq +aq +aq +dR +el +eM +ae +fF +gz +gZ +hw +hJ +hY +ih +iv +iM +iv +iv +jx +jL +jY +jN +kI +lg +ly +lV +mu +mU +nr +nR +om +mT +ab +ab ab ab ab @@ -2481,37 +6954,44 @@ ab ab ab ab -ab -ab -ad -ag -as -as -aD -aL -ap +ae aq -bd -ad -ad -bu -bu -bu -ad -ad -cn -cw -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -cf +aq +aq +oJ +aq +aq +ae +em +eN +ae +ae +gA +ha +ha +hK +ha +ha +ha +iN +ha +ha +jy +jM +jN +oL +kJ +lh +lz +lW +mv +jy +jy +nS +on +ow +ab +ab ab ab ab @@ -2521,37 +7001,44 @@ ab ab ab ab +ae +aq +aq +aq +aq +aq +aq +dS +eo +eO +fk +ae +gB +hb +ha +ha +ha +ii +iw +iO +hB +jl +jz +jN +jZ +ko +kK +li +lA +lX +mw +mV +jy +nu +oo +ox ab ab -ad -ah -as -as -aE -aM -aq -ap -aq -bg -bn -go -go -go -fT -go -co -cy -go -fT -go -go -fT -go -gm -dn -dq -aO -dn ab ab ab @@ -2561,37 +7048,44 @@ ab ab ab ab -ab -ab ae -ad -as -as -aF -aL ap aq -ap -bg -bo -gp -gp -gp -fU -gp -cp -cz -gp -fU -gp -gp -fU -gp -gn -dn -dr -aO -dn +aq +aq +aq +aq +dS +ep +eP +fl +fG +gE +hc +hx +hL +hZ +ij +ix +iP +hd +jm +jz +jO +jN +kp +kL +lj +lB +lY +lA +mW +jy +nT +op +ox +ab +ab ab ab ab @@ -2601,37 +7095,44 @@ ab ab ab ab -ab -ab -ad -ai -as -as -aG -ap +ae +ae aq -ap -fM -ad -ad -bu -bu -bu -ad -ad -cn -cw -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -cf +aq +aq +di +aq +dS +eq +eQ +ae +dQ +gF +hd +hy +hy +ia +ik +if +iQ +hz +hz +jy +jy +ka +kq +kM +lk +lC +lZ +mx +jy +jy +nU +oN +ox +ab +ab ab ab ab @@ -2642,35 +7143,42 @@ ab ab ab ab +ae +ae +ae +aL +ae +ae +ae +ae +ae +ae +fH +gG +he +hz +hz +hz +hz +iy +iR +hz +jn +jA +jP +jy +jy +jy +jy +lD +ma +jy +jy +ns +nV +oo +ox ab -ad -aj -as -fK -aH -aq -ap -aq -be -ad -bp -bG -bM -bS -ca -cj -cn -cw -ae -aS -aq -cU -cZ -dh -ae -ac -ac -ac ab ab ab @@ -2683,33 +7191,40 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -aT -ad -ad -bq -bH -aq -aq -cb -ck -cn -cw -cF -aq -ap -ap -ap -aq -ad ac ac +as +do +dA +dT +er +eR +fm +fI +gH +he +hz +hM +ib +hz +iz +iS +jf +jo +jB +hz +kb +jy +kN +jZ +lE +mb +my +jy +nt +nW +oq +mT ab ab ab @@ -2723,35 +7238,42 @@ ab ab ab ab -ad -ak -at -ay -aI -aN -ad -aq -aS -ad -br -aq -ap -aq -bP -ad -fX -ga -cf -aq -cM -cV -da -aq -ad -ad -ad -ad -ad +ab +as +as +du +dB +dU +es +eS +fn +fO +gG +hf +hz +hN +ic +il +iA +iT +hz +hz +hz +hz +kc +kr +kO +ll +lF +mc +jy +jy +nu +nX +om +ow +ab +ab ab ab ab @@ -2763,35 +7285,42 @@ ab ab ab ab -ad -al -au -au -au -aO -aT -aq -fN -ad -bs -aq -ap -aq -cc -bu -cn -cw -ad -cH -cN -bH -db -aq -ad -aq -gk -aq -ad +ab +at +aM +dv +dC +dV +et +eT +fo +fO +oK +hg +hz +hO +hz +hz +iB +iU +jg +jp +jp +jQ +kd +jy +jy +jy +jy +jP +jy +mX +nv +nY +mT +mT +ab +ab ab ab ab @@ -2803,35 +7332,42 @@ ab ab ab ab -ad -ad -ad -ae -ad -ad -ad -aq -aq -ad -bt -aq -ap -bT -cd -bu -cn -cw -ad -aq -cO -aq -aq -aq -dl -do -ds -do -ad +ab +at +cA +dw +dD +dX +eu +eU +fn +fH +gG +he +hA +hz +id +im +iC +iV +hz +hz +hz +hz +ke +jQ +jQ +jQ +jp +jp +mz +mY +nw +nZ +mT +ab +ab +ab ab ab ab @@ -2843,35 +7379,42 @@ ab ab ab ab -ad -am -au -au -au -aO -aT -aq -fN -ae -bu -bu -ap -bx -bx -ae -cq -gn -ad -cI -cP -aO -aO -bK -ad -aq -gl -aq -ad +ab +at +cG +dx +dE +dY +ev +eV +fp +fH +gI +he +hz +hz +hz +hz +iD +iW +jh +jo +jC +hz +kf +ks +kP +kQ +kQ +kQ +kQ +kT +nx +kR +kQ +kQ +ab +ab ab ab ab @@ -2883,35 +7426,42 @@ ab ab ab ab -ad -an -av -az -av -aP -ad -aq -aS -ad -bv -bI -ap -bI -fV -ad -cr -cB -ad -ad -ad -ad -cF -ad -ad -ad -ad -ad -ad +ab +as +cO +as +dI +dZ +ew +as +cO +as +gJ +hh +hz +hP +ic +in +iE +iX +hz +jq +jA +hO +kg +kt +kQ +kQ +lG +md +mA +mZ +ny +oa +or +kQ +ab +ab ab ab ab @@ -2923,34 +7473,41 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -aW -ad -ad -bw -bx -ap -bx -ce -ad -cs -aq -aq -cJ -cQ -ad -aq -di -di -ad ab ab +ac +cO +as +as +as +as +fq +dy +gK +he +hz +hQ +ie +hz +iF +iY +hz +hz +hz +hz +kh +ha +kQ +lm +lH +me +mB +na +nz +ob +os +oy +ac ab ab ab @@ -2958,7 +7515,7 @@ ab ab "} (32,1,1) = {" -ab +aa ab ab ab @@ -2966,69 +7523,83 @@ ab ab ab ac +dy +dK +ea +ex +eW +fr +fW +gL +he +hz +hz +hz +hz +hO +hz +hz +jr +jD +jR +iQ +ku +kR +ln +lI +oM +mC +lI +nA +oc +kQ +kQ ac ab -ac -ad -aX -bf -ad -bx -bx -ap -bx -bx -ad -fZ -aq -aq -aq -cR -ad -dd -di -dm -ad -ab -ab -ab ab ab ab ab "} (33,1,1) = {" +aa ab ab ab ab ab -ac ab ab -ab -ab -ab -ad -ad -ad -ad -fQ -bI -ap -bU -fV -ad -ct -cC -ct -cK -cS -ad -aq -gi -di -ad +dy +dL +eb +ey +eX +fs +fa +gM +hi +hB +hB +hB +ag +iG +iZ +ji +js +jE +jS +ki +kv +kS +ln +lJ +mf +mD +lI +nB +kQ +kQ ac ab ab @@ -3038,39 +7609,46 @@ ab ab "} (34,1,1) = {" +aa +aa ab ab ab ab ab ab -ab -ab -ab -ac +dy +dM +ec +ez +eY +ft +dy +gN +hj +hj +hR +af +ip +iH +ja +jj +jj +gI +if +kj +kw +kT +lo +lK +kQ +mE +nb +nC +kQ ac ab ab -ac -ad -by -bx -fR -bx -ce -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ac -ab ab ab ab @@ -3078,87 +7656,100 @@ ab ab "} (35,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ad -ad -ad -ad -ad -ad -ad -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab aa +ab +ab +ab +ab +ab +ab +ab +dy +dy +ed +ey +eZ +dy +dy +gO +hk +hC +dy +ha +iq +iI +iq +ha +jt +jF +jT +ju +ju +kU +ju +ju +ju +ju +ju +kU +ju +ju +ju +ju +ab +ab +ab +ab +ab "} (36,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab aa +ab +ab +ab +ab +ab +ab +ab +ac +dP +dy +eA +fa +dy +fY +gP +gQ +hl +hS +ha +ir +iJ +jb +ha +ju +jG +jU +ju +kx +kV +lp +lL +mg +mF +nc +ju +od +ju +oz +ju +ju +nf +ab +ab +ab "} (37,1,1) = {" -aa ab ab ab @@ -3168,36 +7759,373 @@ ab ab ab ab +dy +ee +eB +fb +fu +gb +gQ +hl +gQ +hT +ha +is +iK +jc +ha +jv +jH +jV +ju +ky +kW +lq +lM +mh +mG +nd +nD +oe +ot +oA +oE +oG +oH ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa "} (38,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +dy +ef +eC +fc +fv +fv +gR +hm +hl +hU +ha +it +iL +jd +ha +jw +jI +jW +kk +kz +kX +lr +lN +mi +mH +ne +nE +of +nE +oB +ju +ju +nf +ab +ab +ab +"} +(39,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +dy +eg +eD +fd +fw +gc +gS +hn +gQ +hV +ha +ha +ha +ha +ha +ju +jJ +jX +kl +kA +kY +ls +lO +mj +mI +nf +ju +ju +ju +oC +nf +ab +ab +ab +ab +ab +"} +(40,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +dy +dy +eE +fe +dy +gd +dy +ho +hD +dy +dy +ac +ab +ab +ab +ac +jK +ju +km +kB +kZ +lt +lt +mk +mJ +ng +nF +ld +ju +ab +ab +ab +ab +ab +ab +ab +"} +(41,1,1) = {" +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +dy +eF +eF +dP +gf +dy +eF +eF +dy +ab +ab +ab +ab +ab +ab +ab +ju +ju +kC +la +lu +lP +ml +mK +kD +nG +og +ju +ab +ab +ab +ab +ab +ab +ab +"} +(42,1,1) = {" +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +dy +gg +dy +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ju +kD +lb +kU +kD +lb +ju +ju +ju +ju +ju +ab +ab +ab +ab +ab +ab +aa +"} +(43,1,1) = {" +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +fx +gh +fx +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ju +kE +lc +ju +lQ +mm +ju +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(44,1,1) = {" +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ju +kF +ld +ju +lR +ld +ju +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +"} +(45,1,1) = {" aa aa ab @@ -3225,6 +8153,154 @@ ab ab ab ab +ju +ju +ju +ju +ju +ju +ju +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +"} +(46,1,1) = {" +aa +aa +aa +aa +ab +ab +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +"} +(47,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +"} +(48,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab ab ab ab diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index 1da57dc70a..b3d02e85cd 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -498,7 +498,7 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost/cargobay) "by" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; name = "Security Checkpoint"; req_access_txt = "63" diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 93154afd94..edc4867e34 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -494,7 +494,7 @@ /area/ruin/space/has_grav/ancientstation/comm) "bB" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -1408,7 +1408,7 @@ /turf/open/floor/plasteel/floorgrime, /area/ruin/space/has_grav/ancientstation/deltacorridor) "ef" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Medical Bay" }, /turf/open/floor/plasteel/floorgrime, @@ -3222,7 +3222,7 @@ }, /area/ruin/space/has_grav/ancientstation/rnd) "is" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Chemical Storage"; req_access_txt = "200" }, diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index 7b2e8f6751..947ece0ad4 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -297,7 +297,7 @@ }, /area/ruin/space/has_grav/onehalf/hallway) "aV" = ( -/obj/machinery/door/airlock/glass_medical, +/obj/machinery/door/airlock/medical/glass, /obj/structure/cable{ icon_state = "1-2" }, @@ -984,7 +984,7 @@ /turf/template_noop, /area/ruin/space/has_grav/onehalf/hallway) "cE" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge" }, /turf/open/floor/plasteel, @@ -998,7 +998,7 @@ id = "bridge_onehalf"; name = "bridge blast door" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge" }, /turf/open/floor/plasteel, diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 42b04d5c30..9ca7c8ea35 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -3447,7 +3447,7 @@ /turf/closed/wall, /area/ruin/space/has_grav/hotel/security) "jq" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Hotel Security Checkpoint"; req_access_txt = "203" }, @@ -4197,7 +4197,7 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "lF" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Hotel Security Checkpoint"; req_access_txt = "203" }, diff --git a/_maps/RandomZLevels/beach.dmm b/_maps/RandomZLevels/beach.dmm index fb9c5e73c2..10fa8be861 100644 --- a/_maps/RandomZLevels/beach.dmm +++ b/_maps/RandomZLevels/beach.dmm @@ -162,7 +162,7 @@ uniform = /obj/item/clothing/under/rank/bartender; death = 0; desc = "Looks secure."; - flavour_text = "You are a bartender for the beach!"; + flavour_text = "You are a bartender for the beach!"; icon = 'icons/obj/machines/sleeper.dmi'; icon_state = "sleeper"; mob_name = "Jerry Thomas"; diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm index 0c7fd7f713..1f4ae8457a 100644 --- a/_maps/RandomZLevels/centcomAway.dmm +++ b/_maps/RandomZLevels/centcomAway.dmm @@ -1513,7 +1513,7 @@ /turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "fG" = ( -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engineering"; req_access_txt = "32" }, @@ -1803,7 +1803,7 @@ /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "gF" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge"; req_access_txt = "19" }, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index f6815d7b1d..a25155be43 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -3204,7 +3204,7 @@ }, /area/awaymission/moonoutpost19/research) "gk" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Post"; req_access_txt = "201" }, @@ -4009,7 +4009,7 @@ }, /area/awaymission/moonoutpost19/research) "hG" = ( -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Research Storage"; req_access_txt = "201" }, @@ -4244,11 +4244,9 @@ }, /area/awaymission/moonoutpost19/research) "ie" = ( -/obj/machinery/door/airlock/glass_medical{ - glass = 0; +/obj/machinery/door/airlock/medical{ id_tag = ""; name = "Research Division"; - opacity = 1; req_access_txt = "201"; req_one_access_txt = "0" }, diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 5693bd14ff..b98b064142 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -1596,7 +1596,7 @@ /turf/open/floor/plating, /area/awaymission/research/interior/security) "eS" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; name = "Brig"; req_access_txt = "63" @@ -1913,7 +1913,7 @@ }, /area/awaymission/research/interior) "fS" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; name = "Brig"; req_access_txt = "63" @@ -2323,7 +2323,7 @@ }, /area/awaymission/research/interior) "hb" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; name = "Brig"; req_access_txt = "63" diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 31a6232330..84c91c3dd7 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -160,7 +160,7 @@ /area/awaymission/snowdin/base) "aC" = ( /obj/structure/barricade/wooden, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, @@ -2181,7 +2181,7 @@ /area/awaymission/snowdin/post) "ha" = ( /obj/structure/barricade/wooden, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, @@ -2570,7 +2570,7 @@ /turf/open/floor/plasteel/darkred, /area/awaymission/snowdin/post) "is" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, @@ -3306,7 +3306,7 @@ /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/sekret) "kJ" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index a00c460da8..dbd2000946 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -7380,7 +7380,7 @@ }, /area/awaymission/undergroundoutpost45/research) "oE" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "201" }, @@ -8008,7 +8008,7 @@ /turf/closed/wall/rust, /area/awaymission/undergroundoutpost45/research) "pM" = ( -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Research Storage"; req_access_txt = "201" }, @@ -8159,7 +8159,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "SMES Room"; req_access_txt = "201"; req_one_access_txt = "0" @@ -8622,7 +8622,7 @@ /obj/machinery/atmospherics/pipe/simple{ dir = 4 }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Server Room"; req_access_txt = "201" }, @@ -9318,7 +9318,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engineering Reception"; req_access_txt = "0" }, @@ -9760,7 +9760,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engineering Reception"; req_access_txt = "0" }, @@ -10793,7 +10793,7 @@ /turf/closed/wall, /area/awaymission/undergroundoutpost45/engineering) "uF" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "201" }, @@ -11382,7 +11382,7 @@ "vN" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Mining Foyer"; req_access_txt = "201" }, @@ -11396,7 +11396,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Mining Foyer"; req_access_txt = "201" }, @@ -11682,7 +11682,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Chief Engineer"; req_access_txt = "201" }, @@ -12448,7 +12448,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Mining EVA"; req_access_txt = "201" }, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 2f9716406c..a91375d6a5 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2,19 +2,6 @@ "aaa" = ( /turf/open/space/basic, /area/space) -"aab" = ( -/obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; - id = "syndicate_n"; - name = "north of station"; - turf_type = /turf/open/space; - width = 18 - }, -/turf/open/space, -/area/space/nearstation) "aae" = ( /obj/effect/landmark/carpspawn, /turf/open/space, @@ -635,52 +622,35 @@ /turf/open/floor/plasteel/floorgrime, /area/security/prison) "abN" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory"; - name = "Armoury Shutter" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/structure/closet/secure_closet/lethalshots, +/turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "abO" = ( /turf/open/floor/plasteel/showroomfloor, /area/security/main) "abP" = ( /obj/structure/closet/secure_closet/security/sec, -/obj/effect/turf_decal/bot{ - dir = 2 - }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "abQ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/window/southleft{ - base_state = "right"; - dir = 1; - icon_state = "right"; - name = "Armory"; - req_access_txt = "3" +/obj/structure/rack, +/obj/machinery/airalarm{ + pixel_y = 23 }, -/obj/effect/turf_decal/stripes/line{ +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/temperature/security, +/obj/item/clothing/suit/armor/laserproof, +/turf/open/floor/plasteel/vault{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "abR" = ( /obj/structure/closet/secure_closet/security/sec, /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/bot{ - dir = 2 - }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "abS" = ( @@ -818,13 +788,8 @@ /turf/open/floor/plasteel/freezer, /area/security/prison) "aci" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory"; - name = "Armoury Shutter" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, +/obj/vehicle/ridden/secway, +/turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "acj" = ( /obj/machinery/light{ @@ -843,9 +808,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/airalarm{ - pixel_y = 23 - }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "acm" = ( @@ -855,13 +817,12 @@ name = "Armory APC"; pixel_x = 24 }, +/obj/structure/cable{ + icon_state = "0-2" + }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "0-8" - }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "acn" = ( @@ -881,14 +842,11 @@ /area/security/main) "acq" = ( /obj/effect/landmark/secequipment, -/obj/effect/turf_decal/bot{ - dir = 2 - }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "acr" = ( /obj/structure/chair/comfy/black, -/obj/effect/landmark/start/head_of_security, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "acs" = ( @@ -914,8 +872,7 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "acv" = ( -/obj/structure/closet/secure_closet/lethalshots, -/obj/effect/turf_decal/bot_white, +/obj/structure/closet/secure_closet/contraband/armory, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "acw" = ( @@ -1087,7 +1044,6 @@ dir = 1; layer = 2.9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel{ dir = 2 }, @@ -1097,6 +1053,7 @@ /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) "acO" = ( +/obj/structure/closet/l3closet/security, /obj/machinery/camera{ c_tag = "Brig Equipment Room"; dir = 4 @@ -1241,7 +1198,9 @@ /turf/open/floor/plasteel/freezer, /area/security/prison) "adg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "adh" = ( @@ -1250,9 +1209,10 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "adi" = ( -/obj/structure/closet/secure_closet/contraband/armory, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/obj/machinery/flasher/portable, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/ai_monitored/security/armory) "adj" = ( /obj/structure/rack, @@ -1275,9 +1235,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel{ dir = 2 }, @@ -1495,14 +1452,14 @@ /turf/closed/wall, /area/security/prison) "adH" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 3"; req_access_txt = "2" }, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "adI" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 2"; req_access_txt = "2" }, @@ -1510,7 +1467,7 @@ /turf/open/floor/plasteel/floorgrime, /area/security/prison) "adJ" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 1"; req_access_txt = "2" }, @@ -1570,7 +1527,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "adR" = ( @@ -1859,14 +1815,10 @@ }, /area/security/prison) "aes" = ( -/obj/structure/rack, -/obj/item/gun/energy/ionrifle, -/obj/item/gun/energy/temperature/security, -/obj/item/clothing/suit/armor/laserproof, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/turf_decal/bot, +/obj/machinery/suit_storage_unit/security, /turf/open/floor/plasteel/red/side, /area/ai_monitored/security/armory) "aet" = ( @@ -1876,20 +1828,10 @@ /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "aeu" = ( -/obj/structure/rack, -/obj/item/storage/box/teargas{ - pixel_x = -3; - pixel_y = 3 +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/item/storage/box/handcuffs, -/obj/item/storage/box/flashbangs{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/obj/effect/turf_decal/bot, +/obj/machinery/suit_storage_unit/security, /turf/open/floor/plasteel/red/side, /area/ai_monitored/security/armory) "aev" = ( @@ -1912,7 +1854,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hos) "aey" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Head of Security"; req_access_txt = "58" }, @@ -2144,20 +2086,32 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/closet/secure_closet/warden, +/obj/structure/rack, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/mask/gas/sechailer, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = 3; + pixel_y = -3 + }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "aeX" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/structure/cable{ - icon_state = "0-4" - }, /turf/open/floor/plating, /area/ai_monitored/security/armory) "aeY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/machinery/door/window/southleft{ name = "Armory"; req_access_txt = "3" @@ -2166,21 +2120,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "aeZ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "0-8" }, /obj/structure/cable{ icon_state = "0-4" }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 }, /turf/open/floor/plating, /area/ai_monitored/security/armory) @@ -2477,7 +2428,7 @@ /turf/open/floor/plasteel/red/side, /area/security/prison) "afK" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = null; name = "Evidence Storage"; req_access_txt = "63" @@ -2529,7 +2480,7 @@ /turf/open/floor/plating, /area/security/main) "afS" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Equipment Room"; req_access_txt = "1" }, @@ -2560,6 +2511,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/landmark/start/head_of_security, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/main) @@ -2642,7 +2594,7 @@ /area/security/execution/transfer) "agi" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "2" }, @@ -2656,7 +2608,7 @@ /area/security/brig) "agk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "2" }, @@ -2694,16 +2646,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "agp" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - areastring = "/area/security/warden"; - dir = 1; - name = "Brig Control APC"; - pixel_x = 0; - pixel_y = 24 - }, +/obj/machinery/computer/prisoner, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "agq" = ( @@ -2714,25 +2657,26 @@ name = "Armory"; req_access_txt = "3" }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/machinery/light{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "agr" = ( +/obj/machinery/computer/secure_data, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -2944,9 +2888,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "agU" = ( @@ -3178,12 +3119,21 @@ }, /area/security/brig) "ahv" = ( -/obj/machinery/computer/prisoner{ - dir = 4 +/obj/machinery/power/apc{ + dir = 8; + name = "Brig Control APC"; + areastring = "/area/security/warden"; + pixel_x = -24 + }, +/obj/structure/cable{ + icon_state = "0-4" }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "ahx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/structure/cable{ icon_state = "2-4" }, @@ -3203,8 +3153,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -3254,7 +3204,7 @@ }, /area/security/brig) "ahE" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Brig Control"; req_access_txt = "3" }, @@ -3400,12 +3350,10 @@ /turf/open/floor/plasteel/white, /area/security/brig) "ahQ" = ( +/obj/structure/closet/secure_closet/warden, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/computer/security{ - dir = 4 - }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "ahR" = ( @@ -3428,6 +3376,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "ahS" = ( +/obj/structure/table, /obj/structure/cable{ icon_state = "1-8" }, @@ -3467,11 +3416,18 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, +/obj/machinery/computer/crew{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "ahY" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel/red/side, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + dir = 5 + }, /area/security/brig) "ahZ" = ( /obj/structure/disposalpipe/segment{ @@ -3528,12 +3484,14 @@ }, /area/security/brig) "aie" = ( +/obj/structure/table, +/obj/item/folder/red, +/obj/item/pen, +/obj/item/hand_labeler, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "aif" = ( @@ -3793,35 +3751,42 @@ /turf/open/floor/plating, /area/security/warden) "aiJ" = ( -/obj/machinery/computer/crew{ - dir = 1 +/obj/structure/table/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "Armory Desk"; + req_access_txt = "3" + }, +/obj/machinery/door/window/southleft{ + name = "Reception Desk"; + req_access_txt = "63" + }, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 4; + pixel_y = 4 }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "aiK" = ( -/obj/structure/chair/office/dark, -/obj/effect/landmark/start/warden, -/obj/machinery/button/door{ - id = "Prison Gate"; - name = "Prison Wing Lockdown"; - pixel_x = -27; - pixel_y = 8; - req_access_txt = "2" - }, -/obj/machinery/button/door{ - id = "seclobby"; - name = "Security Lobby Lockdown"; - pixel_x = -27; - pixel_y = -2; - req_access_txt = "2" +/obj/structure/cable{ + icon_state = "0-8" }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-4" }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel/showroomfloor, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/security/warden) "aiL" = ( /obj/structure/cable{ @@ -3834,7 +3799,7 @@ /turf/open/floor/plating, /area/security/warden) "aiM" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Brig Control"; req_access_txt = "3" }, @@ -3871,10 +3836,6 @@ /area/security/brig) "aiR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/firealarm{ - dir = 2; - pixel_y = 24 - }, /turf/open/floor/plasteel/red/side{ dir = 1 }, @@ -3945,15 +3906,18 @@ /obj/structure/sign/goldenplaque{ pixel_y = 32 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/red/side{ dir = 1 }, /area/security/brig) "aje" = ( -/obj/item/twohanded/required/kirbyplants/random, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/firealarm{ + dir = 2; + pixel_y = 24 + }, /turf/open/floor/plasteel/red/side{ - dir = 9 + dir = 1 }, /area/security/brig) "ajf" = ( @@ -3970,7 +3934,6 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, /area/security/brig) "ajh" = ( @@ -4144,7 +4107,7 @@ }, /area/security/brig) "ajB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/brig) "ajC" = ( @@ -4172,7 +4135,7 @@ "ajF" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/red/corner{ - dir = 8 + dir = 2 }, /area/security/brig) "ajG" = ( @@ -4202,12 +4165,11 @@ /turf/open/floor/plasteel, /area/security/brig) "ajJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/red/side{ - dir = 8 - }, +/turf/open/floor/plasteel, /area/security/brig) "ajK" = ( /obj/structure/cable{ @@ -4420,16 +4382,16 @@ /turf/open/floor/plasteel, /area/security/brig) "aki" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-8" }, /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/red/corner{ dir = 8 }, @@ -4444,21 +4406,16 @@ /turf/open/floor/plasteel/red/side, /area/security/brig) "akk" = ( -/obj/machinery/door_timer{ - id = "Cell 1"; - name = "Cell 1"; - pixel_y = -32 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, /turf/open/floor/plasteel/red/corner{ dir = 2 }, /area/security/brig) "akl" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /turf/open/floor/plasteel, /area/security/brig) @@ -4494,9 +4451,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /turf/open/floor/plasteel/red/side, /area/security/brig) "akq" = ( @@ -4508,46 +4462,45 @@ dir = 4 }, /obj/machinery/door_timer{ - id = "Cell 4"; - name = "Cell 4"; + id = "Cell 3"; + name = "Cell 3"; pixel_y = -32 }, -/turf/open/floor/plasteel/red/corner, +/turf/open/floor/plasteel/red/side, /area/security/brig) "akr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/red/side{ - dir = 10 - }, -/area/security/brig) -"aks" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/red/side{ - dir = 5 - }, -/area/security/brig) -"akt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /turf/open/floor/plasteel/red/side{ dir = 9 }, /area/security/brig) -"aku" = ( +"aks" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/red/corner{ + dir = 8 + }, +/area/security/brig) +"akt" = ( +/obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door_timer{ + id = "Cell 4"; + name = "Cell 4"; + pixel_y = -32 + }, +/turf/open/floor/plasteel/red/side, +/area/security/brig) +"aku" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/open/floor/plasteel/red/side{ - dir = 6 + dir = 4 }, /area/security/brig) "akv" = ( @@ -4579,14 +4532,9 @@ }, /area/security/courtroom) "akz" = ( -/obj/structure/chair, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/hallway/primary/fore) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/floorgrime, +/area/security/brig) "akA" = ( /obj/structure/chair{ dir = 8; @@ -4674,23 +4622,26 @@ /turf/open/floor/plating, /area/maintenance/fore) "akM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-2" + }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/brig) "akN" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/brig) "akO" = ( @@ -4698,22 +4649,21 @@ id = "Cell 1"; name = "Cell 1" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ icon_state = "4-8" }, /turf/open/floor/plasteel/red/side, /area/security/brig) "akP" = ( -/obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 2"; - name = "Cell 2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-8" }, -/turf/open/floor/plasteel/red/side, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/security/brig) "akQ" = ( /obj/structure/cable{ @@ -4732,29 +4682,28 @@ /turf/open/floor/plasteel/red/side, /area/security/brig) "akS" = ( -/obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 4"; - name = "Cell 4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/red/side, -/area/security/brig) -"akT" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "0-8" }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/brig) +"akT" = ( +/obj/machinery/door/window/brigdoor/security/cell{ + id = "Cell 3"; + name = "Cell 3" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side, +/area/security/brig) "akU" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Brig Desk"; req_access_txt = "1" }, @@ -4767,17 +4716,17 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "akV" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/structure/cable{ icon_state = "0-8" }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/brig) "akW" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 2; id_tag = "innerbrig"; name = "Brig"; @@ -4791,33 +4740,28 @@ }, /area/security/brig) "akX" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "seclobby"; - name = "security shutters" - }, -/turf/open/floor/plating, -/area/security/brig) -"akY" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/door/airlock/glass_security{ - cyclelinkeddir = 1; - id_tag = "outerbrig"; +/obj/machinery/door/airlock/security/glass{ + cyclelinkeddir = 2; + id_tag = "innerbrig"; name = "Brig"; req_access_txt = "63" }, -/turf/open/floor/plasteel/red/side{ - dir = 5 +/obj/structure/cable{ + icon_state = "4-8" }, +/turf/open/floor/plasteel/red/side{ + dir = 9 + }, +/area/security/brig) +"akY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/security/brig) "akZ" = ( /obj/structure/cable{ @@ -4867,11 +4811,11 @@ }, /area/security/courtroom) "alf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/red/side{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 }, -/area/hallway/primary/fore) +/turf/open/floor/plasteel/floorgrime, +/area/security/brig) "alg" = ( /obj/structure/cable{ icon_state = "0-2" @@ -4963,13 +4907,11 @@ /turf/closed/wall/r_wall, /area/ai_monitored/security/armory) "alu" = ( -/obj/structure/barricade/wooden, -/obj/structure/grille, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/nuclearbomb/selfdestruct, +/turf/open/floor/plasteel/vault{ + dir = 8 }, -/turf/open/floor/wood, -/area/maintenance/fore) +/area/ai_monitored/nuke_storage) "alv" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4988,22 +4930,15 @@ /turf/open/floor/plasteel/floorgrime, /area/security/brig) "alw" = ( -/obj/item/device/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; - name = "Prison Intercom (General)"; - pixel_x = -25; - pixel_y = -2; - prison_radio = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, -/area/security/brig) -"alx" = ( /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/floorgrime, +/area/security/brig) +"alx" = ( /turf/open/floor/plasteel/floorgrime, /area/security/brig) "aly" = ( @@ -5028,14 +4963,14 @@ pixel_y = 6; req_access_txt = "0" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/machinery/button/flasher{ id = "brigentry"; pixel_x = -28; pixel_y = -8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel/dark, /area/security/brig) "alA" = ( @@ -5060,22 +4995,28 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "alC" = ( -/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/red/side{ dir = 9 }, -/area/hallway/primary/fore) +/area/security/brig) "alD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/security/courtroom) "alE" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/plasteel/red/side{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 }, -/area/hallway/primary/fore) +/obj/machinery/flasher{ + id = "Cell 4"; + pixel_x = 28 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime, +/area/security/brig) "alF" = ( /obj/machinery/atmospherics/components/unary/tank/air{ dir = 2 @@ -5236,6 +5177,11 @@ /turf/open/floor/plasteel, /area/security/processing) "amf" = ( +/obj/structure/bed, +/obj/item/bedsheet, +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/machinery/flasher{ id = "Cell 1"; pixel_x = -28 @@ -5250,8 +5196,11 @@ /turf/open/floor/plasteel/floorgrime, /area/security/brig) "amh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/structure/bed, +/obj/item/bedsheet, +/obj/machinery/flasher{ + id = "Cell 2"; + pixel_x = -28 }, /turf/open/floor/plasteel/floorgrime, /area/security/brig) @@ -5326,10 +5275,14 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "amo" = ( -/turf/open/floor/plasteel/red/side{ - dir = 9 +/obj/machinery/flasher{ + id = "brigentry"; + pixel_x = 28 }, -/area/hallway/primary/fore) +/turf/open/floor/plasteel/red/side{ + dir = 5 + }, +/area/security/brig) "amp" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 4"; @@ -5338,15 +5291,18 @@ /turf/open/floor/plasteel/floorgrime, /area/security/brig) "amq" = ( -/obj/machinery/vending/snack/random, -/obj/machinery/flasher{ - id = "brigentry"; - pixel_x = 28 +/obj/structure/bed, +/obj/item/bedsheet, +/obj/item/device/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + dir = 2; + name = "Prison Intercom (General)"; + pixel_x = 25; + pixel_y = -2; + prison_radio = 1 }, -/turf/open/floor/plasteel/red/side{ - dir = 4 - }, -/area/hallway/primary/fore) +/turf/open/floor/plasteel/floorgrime, +/area/security/brig) "amr" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5488,7 +5444,7 @@ /turf/open/floor/plating, /area/security/processing) "amM" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prisoner Processing"; req_access_txt = "2" }, @@ -5519,9 +5475,16 @@ /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "amQ" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/turf/open/floor/plasteel/floorgrime, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "Secure Gate"; + name = "brig shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/security/brig) "amR" = ( /obj/structure/cable{ @@ -5544,24 +5507,20 @@ /turf/closed/wall/r_wall, /area/security/brig) "amT" = ( -/obj/machinery/button/door{ - id = "seclobby"; - name = "Security Lobby Lockdown"; - pixel_x = -26; - pixel_y = 8; - req_access_txt = "2" +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "briggate"; + name = "security shutters" + }, +/obj/machinery/door/window/southleft{ + name = "Brig Desk"; + req_access_txt = "1" }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "4-8" }, -/obj/machinery/button/door{ - desc = "A remote control switch for the medbay foyer."; - id = "lobbyairlock"; - name = "Security Lobby Doors Control"; - normaldoorcontrol = 1; - pixel_x = -26; - pixel_y = -2; - req_access_txt = "63" +/obj/structure/cable{ + icon_state = "1-8" }, /turf/open/floor/plasteel/dark, /area/security/brig) @@ -5577,14 +5536,25 @@ /turf/open/floor/plating, /area/security/brig) "amV" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "briggate"; + name = "security shutters" + }, +/obj/machinery/door/window/southleft{ + base_state = "right"; + icon_state = "right"; + name = "Brig Desk"; + req_access_txt = "1" + }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" }, /turf/open/floor/plasteel/dark, /area/security/brig) "amW" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 1; id_tag = "outerbrig"; name = "Brig"; @@ -5595,10 +5565,17 @@ }, /area/security/brig) "amX" = ( -/turf/open/floor/plasteel/red/side{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + cyclelinkeddir = 1; + id_tag = "outerbrig"; + name = "Brig"; + req_access_txt = "63" }, -/area/hallway/primary/fore) +/turf/open/floor/plasteel/red/side{ + dir = 9 + }, +/area/security/brig) "amY" = ( /obj/structure/chair{ dir = 1 @@ -5828,16 +5805,18 @@ }, /area/hallway/primary/fore) "anB" = ( -/turf/open/floor/plasteel/red/side{ - dir = 5 +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/sign/securearea{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/red/corner{ + dir = 4 }, /area/hallway/primary/fore) "anC" = ( /obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "seclobby"; - name = "security shutters" - }, /turf/open/floor/plating, /area/security/courtroom) "anD" = ( @@ -5962,29 +5941,18 @@ /area/hallway/primary/fore) "anR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/red/corner{ - dir = 1 - }, +/turf/open/floor/plasteel, /area/hallway/primary/fore) "anS" = ( /obj/machinery/holopad, /turf/open/floor/plasteel, /area/hallway/primary/fore) "anT" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "seclobby"; - name = "security shutters" - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, /area/hallway/primary/fore) "anU" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "seclobby"; - name = "security shutters" - }, /obj/machinery/door/airlock/public/glass{ name = "Courtroom" }, @@ -6219,7 +6187,6 @@ codes_txt = "patrol;next_patrol=EVA"; location = "Security" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aoz" = ( @@ -6242,19 +6209,15 @@ dir = 1; pixel_y = -24 }, -/turf/open/floor/plasteel/red/side{ - dir = 10 +/turf/open/floor/plasteel/red/corner{ + dir = 2 }, /area/hallway/primary/fore) "aoC" = ( -/obj/structure/chair{ - dir = 1 +/obj/machinery/vending/coffee, +/turf/open/floor/plasteel/red/corner{ + dir = 2 }, -/obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 - }, -/turf/open/floor/plasteel/red/side, /area/hallway/primary/fore) "aoD" = ( /obj/machinery/camera{ @@ -6265,22 +6228,21 @@ pixel_x = 5; pixel_y = -32 }, -/obj/machinery/light, -/obj/structure/chair{ - dir = 1 +/turf/open/floor/plasteel/red/corner{ + dir = 2 }, -/turf/open/floor/plasteel/red/side, /area/hallway/primary/fore) "aoE" = ( -/obj/structure/table, -/obj/machinery/chem_dispenser/drinks, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/bar, +/obj/machinery/vending/cigarette, +/turf/open/floor/plasteel/red/corner{ + dir = 2 + }, /area/hallway/primary/fore) "aoF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/plasteel/red/side, +/obj/machinery/vending/snack/random, +/turf/open/floor/plasteel/red/corner{ + dir = 2 + }, /area/hallway/primary/fore) "aoG" = ( /obj/structure/table, @@ -6496,9 +6458,6 @@ /area/maintenance/fore/secondary) "apm" = ( /obj/machinery/door/firedoor, -/obj/structure/sign/securearea{ - pixel_x = 32 - }, /turf/open/floor/plasteel/red/corner{ dir = 4 }, @@ -6508,7 +6467,9 @@ /turf/closed/wall, /area/maintenance/fore/secondary) "apo" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/closed/wall, /area/maintenance/fore/secondary) "app" = ( @@ -6727,10 +6688,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/maintenance/port/fore) -"apQ" = ( -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) "apR" = ( /obj/item/paper/fluff/jobs/security/beepsky_mom, /turf/open/floor/plating, @@ -6815,12 +6772,12 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "aqg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/obj/structure/disposalpipe/junction/flip{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "aqh" = ( @@ -7181,9 +7138,6 @@ /area/lawoffice) "arc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "ard" = ( @@ -8973,14 +8927,14 @@ /area/maintenance/port/fore) "avT" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_ne"; name = "northeast of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) @@ -10050,22 +10004,44 @@ /turf/closed/wall/r_wall, /area/maintenance/port/fore) "ayA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/barricade/wooden, -/obj/structure/grille, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"ayB" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/maintenance/bar/cafe) +/area/maintenance/fore) +"ayB" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/maintenance/fore) "ayC" = ( -/turf/closed/wall, -/area/maintenance/bar/cafe) -"ayD" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar/cafe) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/maintenance/fore) +"ayD" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/maintenance/fore) "ayE" = ( /turf/closed/wall/r_wall, /area/maintenance/fore) @@ -10474,35 +10450,23 @@ /turf/closed/wall, /area/maintenance/port/fore) "azH" = ( -/obj/machinery/power/apc{ - areastring = "/area/maintenance/bar/cafe"; - dir = 1; - name = "Abandoned Cafe APC"; - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/maintenance/bar/cafe) -"azI" = ( +/obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/chair/stool/bar, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/bar/cafe) +/turf/open/space, +/area/space/nearstation) +"azI" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/space, +/area/space/nearstation) "azJ" = ( /obj/machinery/gateway{ dir = 9 }, /obj/effect/turf_decal/bot_white/right, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 1 + }, /area/gateway) "azK" = ( /obj/machinery/light{ @@ -10515,14 +10479,18 @@ dir = 5 }, /obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 4 + }, /area/gateway) "azM" = ( /obj/machinery/gateway{ dir = 1 }, /obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/gateway) "azN" = ( /obj/machinery/light{ @@ -10564,7 +10532,7 @@ /area/ai_monitored/storage/eva) "azS" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "EVA Storage"; req_access_txt = "18" }, @@ -11064,7 +11032,9 @@ dir = 8 }, /obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/gateway) "aBe" = ( /turf/open/floor/plasteel/dark, @@ -11074,7 +11044,9 @@ dir = 4 }, /obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/gateway) "aBg" = ( /obj/machinery/gateway/centerstation, @@ -11358,48 +11330,32 @@ /turf/closed/wall/r_wall, /area/storage/primary) "aBS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"aBT" = ( -/obj/machinery/power/apc{ - areastring = "/area/crew_quarters/theatre/mime"; - dir = 2; - name = "Mime's Office APC"; - pixel_x = 1; - pixel_y = -24 +/obj/machinery/light_switch{ + pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/chair/wood{ +/turf/open/floor/circuit, +/area/ai_monitored/nuke_storage) +"aBT" = ( +/obj/machinery/computer/bank_machine, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/vault{ dir = 8 }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/bar/cafe) +/area/ai_monitored/nuke_storage) "aBU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/power/apc{ + dir = 1; + name = "Vault APC"; + areastring = "/area/ai_monitored/nuke_storage"; + pixel_y = 25 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-2" }, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/circuit, +/area/ai_monitored/nuke_storage) "aBV" = ( /obj/machinery/airalarm{ pixel_y = 23 @@ -11410,37 +11366,30 @@ /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "aBW" = ( -/obj/machinery/power/apc{ - areastring = "/area/crew_quarters/theatre/clown"; - dir = 2; - name = "Clown's Office APC"; - pixel_x = 1; - pixel_y = -24 +/obj/structure/filingcabinet, +/obj/item/folder/documents, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/vault{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/bar/cafe) +/area/ai_monitored/nuke_storage) "aBX" = ( /obj/machinery/gateway{ dir = 10 }, /obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 4 + }, /area/gateway) "aBY" = ( /obj/machinery/gateway{ dir = 6 }, /obj/effect/turf_decal/bot_white/right, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 1 + }, /area/gateway) "aBZ" = ( /obj/machinery/gateway, @@ -11448,7 +11397,9 @@ icon_state = "0-2" }, /obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/gateway) "aCa" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -11598,6 +11549,7 @@ pixel_x = -32 }, /obj/item/reagent_containers/food/snacks/baguette, +/obj/item/toy/dummy, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -11979,19 +11931,38 @@ /turf/open/floor/plasteel, /area/storage/primary) "aDr" = ( -/turf/closed/wall, -/area/crew_quarters/theatre/mime) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/open/floor/circuit, +/area/ai_monitored/nuke_storage) "aDs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/crew_quarters/theatre/mime) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/turf_decal/bot_white/right, +/turf/open/floor/plasteel/vault{ + dir = 1 + }, +/area/ai_monitored/nuke_storage) "aDt" = ( -/turf/closed/wall, -/area/crew_quarters/theatre/clown) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/circuit, +/area/ai_monitored/nuke_storage) "aDv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/crew_quarters/theatre/clown) +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/turf_decal/bot_white/left, +/turf/open/floor/plasteel/vault{ + dir = 4 + }, +/area/ai_monitored/nuke_storage) "aDw" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -12229,6 +12200,7 @@ /area/maintenance/starboard/fore) "aDY" = ( /obj/structure/chair/stool, +/obj/effect/landmark/start/mime, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, @@ -12567,13 +12539,26 @@ /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "aEN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/bed, -/obj/item/bedsheet/mime, -/turf/open/floor/plasteel/white/side{ +/obj/structure/closet/crate{ + name = "Gold Crate" + }, +/obj/item/stack/sheet/mineral/gold{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/stack/sheet/mineral/gold{ + pixel_y = 2 + }, +/obj/item/stack/sheet/mineral/gold{ + pixel_x = 1; + pixel_y = -2 + }, +/obj/item/storage/belt/champion, +/obj/effect/turf_decal/bot_white/right, +/turf/open/floor/plasteel/vault{ dir = 1 }, -/area/crew_quarters/theatre/mime) +/area/ai_monitored/nuke_storage) "aEO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -12581,10 +12566,34 @@ /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "aEP" = ( -/obj/structure/closet/secure_closet/freezer/cream_pie, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) +/obj/item/coin/silver{ + pixel_x = 7; + pixel_y = 12 + }, +/obj/item/coin/silver{ + pixel_x = 12; + pixel_y = 7 + }, +/obj/item/coin/silver{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/item/coin/silver{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/coin/silver{ + pixel_x = 5; + pixel_y = -8 + }, +/obj/structure/closet/crate{ + name = "Silver Crate" + }, +/obj/effect/turf_decal/bot_white/left, +/turf/open/floor/plasteel/vault{ + dir = 4 + }, +/area/ai_monitored/nuke_storage) "aEQ" = ( /obj/structure/table, /obj/item/paper/pamphlet/gateway, @@ -12648,7 +12657,7 @@ /area/ai_monitored/storage/eva) "aEX" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "EVA Storage"; req_access_txt = "18" }, @@ -13068,15 +13077,11 @@ /turf/open/floor/plasteel/vault/corner, /area/ai_monitored/nuke_storage) "aGb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "Mime's Office"; - dir = 8 - }, -/turf/open/floor/plasteel/white/side{ +/obj/effect/turf_decal/bot_white/right, +/turf/open/floor/plasteel/vault{ dir = 1 }, -/area/crew_quarters/theatre/mime) +/area/ai_monitored/nuke_storage) "aGc" = ( /obj/structure/cable{ icon_state = "1-8" @@ -13098,17 +13103,18 @@ /turf/open/floor/plasteel/vault/side, /area/ai_monitored/nuke_storage) "aGe" = ( -/obj/structure/mirror{ - pixel_x = -28 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "Clown's Office"; - c_tag_order = 999; +/obj/structure/safe, +/obj/item/clothing/head/bearpelt, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/gun/ballistic/revolver/russian, +/obj/item/ammo_box/a357, +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/effect/turf_decal/bot_white/left, +/turf/open/floor/plasteel/vault{ dir = 4 }, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) +/area/ai_monitored/nuke_storage) "aGf" = ( /obj/machinery/firealarm{ dir = 4; @@ -13204,6 +13210,7 @@ /area/ai_monitored/storage/eva) "aGr" = ( /obj/structure/chair/stool, +/obj/effect/landmark/start/clown, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, @@ -13314,6 +13321,9 @@ /obj/structure/mirror{ pixel_x = -28 }, +/obj/item/device/flashlight/lamp/bananalamp{ + pixel_y = 3 + }, /turf/open/floor/plasteel/redblue, /area/crew_quarters/theatre) "aGE" = ( @@ -13648,6 +13658,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -13655,9 +13668,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/chapel/main) -"aHr" = ( -/turf/open/space, -/area/space) "aHs" = ( /obj/machinery/door/airlock/titanium{ name = "Arrivals Shuttle Airlock" @@ -13909,10 +13919,7 @@ dir = 4; pixel_x = -22 }, -/obj/structure/table/wood, -/obj/item/device/flashlight/lamp/bananalamp{ - pixel_y = 3 - }, +/obj/structure/closet/crate/wooden/toy, /turf/open/floor/plasteel/redblue, /area/crew_quarters/theatre) "aIa" = ( @@ -14890,24 +14897,22 @@ /turf/open/floor/plating, /area/storage/primary) "aKt" = ( -/obj/machinery/door/airlock/freezer{ - boltDown = null; - boltUp = null; - doorClose = null; - doorDeni = null; - doorOpen = null; - name = "Mime's Office"; - noPower = null; - req_access_txt = "46" +/obj/structure/cable{ + icon_state = "0-4" }, -/turf/open/floor/plasteel/white/side{ - dir = 1 +/obj/structure/cable{ + icon_state = "0-8" }, -/area/crew_quarters/theatre/mime) -"aKu" = ( -/obj/effect/spawner/structure/window, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/crew_quarters/theatre/mime) +/area/hallway/primary/port) +"aKu" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/hallway/primary/port) "aKv" = ( /obj/structure/cable, /obj/structure/cable{ @@ -14920,18 +14925,27 @@ /turf/open/floor/plating, /area/hallway/primary/port) "aKw" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, -/area/maintenance/fore) +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/hallway/primary/port) "aKx" = ( -/obj/effect/spawner/structure/window, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/crew_quarters/theatre/clown) +/area/hallway/primary/port) "aKy" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -15058,13 +15072,6 @@ "aKQ" = ( /obj/machinery/reagentgrinder, /obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, /turf/open/floor/wood, /area/crew_quarters/bar) "aKR" = ( @@ -15223,7 +15230,16 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "aLl" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE"; + pixel_y = 32 + }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "aLm" = ( @@ -15377,6 +15393,15 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE"; + pixel_y = 32 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "aLK" = ( @@ -15418,6 +15443,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "aLQ" = ( @@ -17520,7 +17548,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aRL" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Holding Area"; req_access_txt = "2" }, @@ -18926,10 +18954,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) -"aVG" = ( -/obj/structure/table, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) "aVH" = ( /obj/machinery/processor, /obj/machinery/firealarm{ @@ -19357,7 +19381,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 4; name = "Bridge"; req_access_txt = "19" @@ -19375,7 +19399,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 8; name = "Bridge"; req_access_txt = "19" @@ -19572,7 +19596,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 4; name = "Bridge"; req_access_txt = "19" @@ -19605,7 +19629,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 8; name = "Bridge"; req_access_txt = "19" @@ -21735,8 +21759,9 @@ /turf/closed/wall, /area/quartermaster/storage) "bcU" = ( -/turf/open/floor/wood, -/area/maintenance/bar) +/obj/item/stack/tile/plasteel, +/turf/open/space, +/area/space/nearstation) "bcV" = ( /obj/machinery/airalarm{ dir = 8; @@ -21823,7 +21848,9 @@ /area/ai_monitored/turret_protected/ai_upload) "bdh" = ( /obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 1 + }, /area/ai_monitored/turret_protected/ai_upload) "bdi" = ( /obj/machinery/computer/arcade, @@ -23254,7 +23281,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/ai_monitored/nuke_storage) +/area/engine/gravity_generator) "bgS" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -23803,17 +23830,14 @@ /area/bridge/meeting_room) "bif" = ( /obj/machinery/vending/cigarette, -/obj/machinery/light{ - dir = 4 - }, /turf/open/floor/wood, /area/bridge/meeting_room) "big" = ( -/obj/machinery/light_switch{ - pixel_y = 28 +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/vault{ + dir = 8 }, -/turf/open/floor/circuit, -/area/ai_monitored/nuke_storage) +/area/engine/gravity_generator) "bih" = ( /obj/effect/turf_decal/bot_white/right, /turf/open/floor/plasteel/vault{ @@ -24316,7 +24340,7 @@ /area/quartermaster/storage) "bjs" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; req_access_txt = "50" }, @@ -24368,11 +24392,16 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bjy" = ( +/obj/machinery/camera{ + c_tag = "Gravity Generator Room"; + dir = 8; + network = list("SS13") + }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) +/area/engine/gravity_generator) "bjz" = ( /turf/closed/wall/r_wall, /area/maintenance/central) @@ -24583,14 +24612,6 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/storage/emergency/starboard) -"bke" = ( -/obj/structure/rack, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/turf/open/floor/plating, -/area/storage/emergency/starboard) "bkf" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -24979,9 +25000,12 @@ /turf/open/floor/plating, /area/maintenance/central) "bkZ" = ( -/obj/machinery/nuclearbomb/selfdestruct, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) +/obj/machinery/gravity_generator/main/station, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/engine/gravity_generator) "bla" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25384,12 +25408,10 @@ /turf/open/floor/plating, /area/maintenance/disposal) "blT" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "blU" = ( @@ -25496,7 +25518,7 @@ }, /area/quartermaster/office) "bmg" = ( -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; req_access_txt = "31" }, @@ -25527,7 +25549,7 @@ /area/quartermaster/storage) "bmk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Delivery Office"; req_access_txt = "50" }, @@ -25597,13 +25619,13 @@ dir = 8 }, /turf/closed/wall/r_wall, -/area/ai_monitored/nuke_storage) +/area/engine/gravity_generator) "bmv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) +/area/engine/gravity_generator) "bmw" = ( /obj/machinery/light{ dir = 4 @@ -25686,7 +25708,7 @@ }, /area/medical/chemistry) "bmH" = ( -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; req_access_txt = "31" }, @@ -26224,37 +26246,55 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "bnT" = ( -/obj/effect/turf_decal/bot_white/right, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE"; + pixel_x = -32 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/gravity_generator) "bnU" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/open/floor/plasteel/vault/side, -/area/ai_monitored/nuke_storage) -"bnV" = ( -/obj/machinery/camera/motion{ - c_tag = "Vault"; - dir = 1; - network = list("MiniSat") +/obj/machinery/door/airlock/engineering/glass{ + name = "Gravity Generator"; + req_access_txt = "11"; + req_one_access_txt = "0" }, -/obj/machinery/light, -/turf/open/floor/plasteel/vault/corner{ - dir = 8 - }, -/area/ai_monitored/nuke_storage) -"bnW" = ( -/obj/structure/safe, -/obj/item/clothing/head/bearpelt, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/gun/ballistic/revolver/russian, -/obj/item/ammo_box/a357, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/effect/turf_decal/bot_white/left, /turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) +/area/engine/gravity_generator) +"bnV" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/gravity_generator) +"bnW" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'RADIOACTIVE AREA'"; + icon_state = "radiation"; + name = "RADIOACTIVE AREA"; + pixel_x = 32 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/gravity_generator) "bnX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/carpet, @@ -26313,7 +26353,7 @@ /area/medical/chemistry) "boe" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5" @@ -26332,7 +26372,7 @@ /area/medical/medbay/central) "boh" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5" @@ -26367,7 +26407,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bok" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, @@ -26754,24 +26794,35 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "bpg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/chair/office/light, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 }, -/turf/closed/wall/r_wall, -/area/ai_monitored/nuke_storage) +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "bph" = ( -/obj/structure/sign/securearea, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/closed/wall/r_wall, -/area/ai_monitored/nuke_storage) +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "bpi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 }, -/turf/closed/wall/r_wall, -/area/ai_monitored/nuke_storage) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "bpj" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -26943,7 +26994,7 @@ /area/hallway/primary/central) "bpD" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Chemistry Lab"; req_access_txt = "5; 33" @@ -27357,20 +27408,17 @@ /area/engine/gravity_generator) "bqE" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/security/checkpoint/tertiary) +/obj/machinery/holopad, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "bqF" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "4-8" }, -/turf/open/floor/plating, -/area/security/checkpoint/tertiary) +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "bqG" = ( /obj/structure/cable{ icon_state = "0-8" @@ -28015,20 +28063,20 @@ /turf/closed/wall/r_wall, /area/engine/gravity_generator) "bsb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, /turf/closed/wall/r_wall, -/area/security/checkpoint/tertiary) +/area/engine/gravity_generator) "bsc" = ( /turf/open/floor/plasteel, /area/engine/gravity_generator) "bsd" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/security/checkpoint/tertiary) +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "bse" = ( /obj/machinery/power/terminal{ dir = 1 @@ -28039,14 +28087,11 @@ /turf/closed/wall/r_wall, /area/engine/gravity_generator) "bsf" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 }, -/turf/open/floor/plating, -/area/security/checkpoint/tertiary) +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "bsg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -28190,7 +28235,7 @@ /area/medical/medbay/central) "bsu" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "GeneticsDoor"; name = "Genetics"; req_access_txt = "5; 68" @@ -29217,32 +29262,45 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "buP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/tertiary) -"buQ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/closed/wall, +/area/engine/gravity_generator) +"buQ" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) +"buR" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/tertiary) -"buR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/tertiary) +/turf/closed/wall, +/area/engine/gravity_generator) "buS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Gravity Generator Foyer" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, /turf/open/floor/plasteel, -/area/security/checkpoint/tertiary) +/area/engine/gravity_generator) "buT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29399,7 +29457,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bvl" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Surgery Observation"; req_access_txt = "0" }, @@ -29460,7 +29518,7 @@ }, /area/medical/genetics) "bvt" = ( -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Genetics Research"; req_access_txt = "5; 9; 68" }, @@ -29576,15 +29634,6 @@ dir = 9 }, /area/quartermaster/qm) -"bvG" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_y = 28 - }, -/turf/open/floor/plasteel, -/area/quartermaster/miningdock) "bvH" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -29738,9 +29787,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bwb" = ( @@ -29841,27 +29887,39 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "bwm" = ( -/turf/open/floor/plasteel/red/side, -/area/security/checkpoint/tertiary) -"bwn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-2" +/turf/closed/wall, +/area/engine/gravity_generator) +"bwn" = ( +/obj/structure/closet/radiation, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'RADIOACTIVE AREA'"; + icon_state = "radiation"; + name = "RADIOACTIVE AREA"; + pixel_x = -32 }, -/turf/open/floor/plasteel/red/side, -/area/security/checkpoint/tertiary) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "bwo" = ( -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/structure/table, -/turf/open/floor/plasteel/red/side, -/area/security/checkpoint/tertiary) -"bwp" = ( -/obj/structure/chair/office/dark, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/red/side, -/area/security/checkpoint/tertiary) +/turf/closed/wall, +/area/engine/gravity_generator) +"bwp" = ( +/obj/structure/closet/radiation, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'RADIOACTIVE AREA'"; + icon_state = "radiation"; + name = "RADIOACTIVE AREA"; + pixel_x = 32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "bwq" = ( /obj/machinery/teleport/station, /turf/open/floor/plating, @@ -30089,7 +30147,7 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "bwT" = ( -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; req_access_txt = "41" }, @@ -30162,7 +30220,7 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "bwY" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, @@ -30362,7 +30420,7 @@ /turf/open/floor/plasteel, /area/security/checkpoint/science) "bxw" = ( -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; req_access_txt = "41" }, @@ -30457,65 +30515,30 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "bxH" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "vault"; - name = "vault shutters" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/security/checkpoint/tertiary) +/turf/closed/wall, +/area/engine/gravity_generator) "bxI" = ( -/obj/machinery/door/airlock/security{ - name = "Security Checkpoint"; - req_access = null; - req_access_txt = "1" +/obj/machinery/ai_status_display, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/tertiary) +/turf/closed/wall, +/area/engine/gravity_generator) "bxJ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "vault"; - name = "vault shutters" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/security/checkpoint/tertiary) +/turf/closed/wall, +/area/engine/gravity_generator) "bxK" = ( -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced, -/obj/item/paper, -/obj/machinery/door/window/westright{ - dir = 1; - name = "Security Checkpoint"; - req_access_txt = "1" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "vault"; - name = "vault shutters" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/turf/closed/wall, +/area/engine/gravity_generator) "bxL" = ( /obj/machinery/camera{ c_tag = "Central Hallway South-East"; @@ -30589,7 +30612,7 @@ /turf/open/floor/plasteel, /area/medical/sleeper) "bxW" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Research Director"; req_access_txt = "30" }, @@ -30697,7 +30720,7 @@ /turf/closed/wall, /area/security/checkpoint/science) "byj" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, @@ -31011,9 +31034,6 @@ /area/security/checkpoint/supply) "byU" = ( /obj/machinery/light, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "byV" = ( @@ -31021,9 +31041,6 @@ pixel_x = 5; pixel_y = -32 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "byW" = ( @@ -31077,7 +31094,7 @@ /turf/open/floor/plating, /area/medical/sleeper) "bzc" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Recovery Room"; req_access_txt = "0" @@ -31524,9 +31541,6 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bAh" = ( @@ -31703,7 +31717,7 @@ /area/science/server) "bAB" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Server Room"; req_access_txt = "30" }, @@ -32017,9 +32031,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bBm" = ( @@ -32078,9 +32089,6 @@ pixel_x = -32; pixel_y = -32 }, -/obj/structure/cable{ - icon_state = "1-8" - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bBr" = ( @@ -32294,10 +32302,6 @@ }, /turf/open/floor/circuit/telecomms/server, /area/science/server) -"bBT" = ( -/obj/machinery/rnd/server, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "bBU" = ( /obj/machinery/atmospherics/pipe/simple{ dir = 9 @@ -33154,7 +33158,7 @@ /turf/open/floor/plasteel/white, /area/medical/sleeper) "bDU" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Chief Medical Officer"; req_access_txt = "40" }, @@ -33174,7 +33178,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "bDW" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Medbay Storage"; req_access_txt = "45" @@ -33219,7 +33223,7 @@ /turf/open/floor/plasteel/floorgrime, /area/science/storage) "bEd" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Medbay Storage"; req_access_txt = "45" @@ -33843,6 +33847,12 @@ dir = 4; pixel_x = 11 }, +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Medbay RC"; + pixel_w = 30 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bFB" = ( @@ -34402,11 +34412,6 @@ /obj/item/gun/syringe, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"bGS" = ( -/obj/structure/closet/crate/freezer/surplus_limbs, -/obj/item/reagent_containers/glass/beaker/synthflesh, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "bGT" = ( /obj/structure/table, /obj/item/folder/white, @@ -34987,6 +34992,12 @@ pixel_x = -3; pixel_y = -3 }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bIj" = ( @@ -35000,13 +35011,6 @@ /area/medical/sleeper) "bIk" = ( /obj/structure/table, -/obj/machinery/requests_console{ - announcementConsole = 0; - department = "Medbay"; - departmentType = 1; - name = "Medbay RC"; - pixel_y = -30 - }, /obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 @@ -35016,18 +35020,15 @@ pixel_x = -3; pixel_y = -3 }, +/obj/machinery/door/window/northright{ + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access_txt = "5" + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bIl" = ( /obj/structure/table, -/obj/item/device/radio/intercom{ - broadcasting = 0; - freerange = 0; - frequency = 1485; - listening = 1; - name = "Station Intercom (Medbay)"; - pixel_y = -30 - }, /obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 @@ -35037,28 +35038,16 @@ pixel_x = -3; pixel_y = -3 }, +/obj/machinery/door/window/northleft{ + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access_txt = "5" + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bIm" = ( +/obj/machinery/rnd/protolathe/department/medical, /obj/machinery/light, -/obj/structure/table, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/box/syringes, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 7; - pixel_y = -3 - }, -/obj/item/reagent_containers/glass/bottle/morphine{ - pixel_x = 8; - pixel_y = -3 - }, -/obj/item/reagent_containers/syringe{ - pixel_x = 6; - pixel_y = -3 - }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bIn" = ( @@ -35072,6 +35061,12 @@ pixel_x = -3; pixel_y = -3 }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bIo" = ( @@ -35427,7 +35422,7 @@ /turf/open/floor/plating, /area/shuttle/mining) "bJd" = ( -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ cyclelinkeddir = 8; name = "Mining Dock"; req_access_txt = "48" @@ -35771,13 +35766,8 @@ /turf/open/floor/plasteel, /area/science/misc_lab) "bJP" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/soap/nanotrasen, -/turf/open/floor/plating, +/obj/machinery/vending/boozeomat, +/turf/open/floor/plasteel/bar, /area/maintenance/port/aft) "bJQ" = ( /obj/effect/spawner/structure/window/reinforced, @@ -37199,7 +37189,7 @@ /area/medical/virology) "bNj" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Isolation A"; req_access_txt = "39" }, @@ -37212,7 +37202,7 @@ /area/medical/virology) "bNl" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Isolation B"; req_access_txt = "39" }, @@ -37298,10 +37288,9 @@ /turf/open/floor/engine/vacuum, /area/science/mixing) "bNu" = ( -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ autoclose = 0; frequency = 1449; - glass = 1; heat_proof = 1; icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; @@ -37312,10 +37301,9 @@ /turf/open/floor/engine, /area/science/mixing) "bNv" = ( -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ autoclose = 0; frequency = 1449; - glass = 1; heat_proof = 1; icon_state = "door_locked"; id_tag = "tox_airlock_interior"; @@ -37430,7 +37418,7 @@ /area/construction) "bNK" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; req_access_txt = "50" }, @@ -37442,12 +37430,6 @@ }, /turf/open/floor/plating, /area/construction) -"bNM" = ( -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/quartermaster/office) "bNN" = ( /obj/structure/cable{ icon_state = "1-2" @@ -38005,7 +37987,7 @@ /turf/open/floor/plating, /area/engine/atmos) "bPb" = ( -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Firing Range"; req_access_txt = "47" }, @@ -38380,9 +38362,8 @@ /turf/open/floor/plasteel, /area/tcommsat/computer) "bPR" = ( -/obj/item/shard, -/obj/effect/decal/cleanable/oil, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/robot_debris/old, +/turf/open/floor/wood, /area/maintenance/port/aft) "bPS" = ( /turf/open/floor/wood, @@ -38397,7 +38378,13 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "bPV" = ( -/obj/effect/decal/cleanable/blood/old, +/obj/machinery/door/airlock/maintenance{ + name = "Maint Bar Access"; + req_access_txt = "12" + }, +/obj/structure/barricade/wooden{ + name = "wooden barricade (CLOSED)" + }, /turf/open/floor/plating, /area/maintenance/port/aft) "bPW" = ( @@ -38688,7 +38675,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bQK" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Control Room"; req_access_txt = "19; 61" }, @@ -38828,11 +38815,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bRc" = ( -/obj/machinery/door/airlock{ - id_tag = "MaintDorm1"; - name = "Maintenance Dorm 1" +/obj/structure/table/wood, +/obj/item/soap/nanotrasen, +/turf/open/floor/wood{ + icon_state = "wood-broken7" }, -/turf/open/floor/wood, /area/maintenance/port/aft) "bRd" = ( /obj/structure/table, @@ -38901,7 +38888,7 @@ /turf/open/floor/plating, /area/construction) "bRm" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, @@ -39039,7 +39026,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Distribution Loop"; req_access_txt = "24" }, @@ -39155,7 +39142,7 @@ /area/medical/virology) "bRR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Monkey Pen"; req_access_txt = "39" }, @@ -39342,28 +39329,12 @@ /turf/open/floor/wood, /area/maintenance/port/aft) "bSo" = ( -/obj/machinery/button/door{ - id = "MaintDorm1"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - req_access_txt = "0"; - specialfunctions = 4 - }, +/obj/structure/chair/stool, /turf/open/floor/wood, /area/maintenance/port/aft) "bSp" = ( -/obj/machinery/button/door{ - id = "MaintDorm2"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - req_access_txt = "0"; - specialfunctions = 4 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, +/obj/structure/grille/broken, +/turf/open/floor/plating, /area/maintenance/port/aft) "bSq" = ( /obj/structure/rack, @@ -39374,11 +39345,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/maintenance/port/aft) -"bSr" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bSs" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -39859,31 +39825,33 @@ }, /area/maintenance/port/aft) "bTt" = ( -/obj/structure/closet/secure_closet/personal, /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, /area/maintenance/port/aft) "bTu" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/closed/wall, +/turf/open/floor/wood, /area/maintenance/port/aft) "bTv" = ( -/obj/structure/bed, -/obj/item/bedsheet, /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/plating, /area/maintenance/port/aft) "bTw" = ( -/obj/machinery/light/small, -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/manifold/general/hidden, -/turf/open/floor/wood, +/obj/machinery/door/airlock/maintenance/abandoned{ + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 4 + }, +/turf/open/floor/plating, /area/maintenance/port/aft) "bTx" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -40007,7 +39975,7 @@ /area/engine/atmos) "bTN" = ( /obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Monitoring"; req_access_txt = "24" }, @@ -40265,11 +40233,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "bUt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-4" }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -40283,19 +40248,16 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, /turf/open/floor/plating, /area/maintenance/port/aft) "bUv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/port/aft) "bUx" = ( @@ -40708,10 +40670,6 @@ }, /turf/open/space, /area/space/nearstation) -"bVw" = ( -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/space/nearstation) "bVx" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 2 @@ -40782,11 +40740,11 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "bVG" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -31 +/obj/structure/sign/nosmoking_2{ + pixel_x = -28 }, -/turf/open/floor/wood, -/area/maintenance/bar) +/turf/open/floor/plating, +/area/maintenance/port/aft) "bVI" = ( /turf/closed/wall/r_wall, /area/tcommsat/server) @@ -40797,11 +40755,6 @@ /obj/machinery/vending/snack/random, /turf/open/floor/plasteel, /area/engine/break_room) -"bVL" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bVM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, @@ -41488,7 +41441,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engineering"; req_access_txt = "32" }, @@ -42617,7 +42570,7 @@ }, /area/tcommsat/server) "cal" = ( -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ cyclelinkeddir = 4; name = "Server Room"; req_access_txt = "61" @@ -42630,7 +42583,7 @@ }, /area/tcommsat/computer) "can" = ( -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ cyclelinkeddir = 8; name = "Server Room"; req_access_txt = "61" @@ -42667,7 +42620,7 @@ dir = 5 }, /turf/closed/wall, -/area/maintenance/bar) +/area/maintenance/port/aft) "cas" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -44139,10 +44092,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"cdM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/aft) "cdN" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -44552,7 +44501,7 @@ /area/maintenance/port/aft) "ceZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Power Storage"; req_access_txt = "11"; req_one_access_txt = "0" @@ -45214,7 +45163,7 @@ /area/engine/engineering) "cgL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; req_access_txt = "10" }, @@ -46258,8 +46207,9 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cjn" = ( -/turf/closed/wall, -/area/maintenance/bar) +/obj/item/weldingtool, +/turf/open/floor/plating/airless, +/area/space/nearstation) "cjo" = ( /obj/structure/closet/toolcloset, /turf/open/floor/plasteel, @@ -46539,7 +46489,7 @@ id = "testlab"; name = "test chamber blast door" }, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ cyclelinkeddir = 4; name = "Test Chamber"; req_access_txt = "47" @@ -46814,7 +46764,7 @@ /turf/open/floor/plasteel, /area/science/misc_lab) "ckN" = ( -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ cyclelinkeddir = 8; name = "Test Chamber"; req_access_txt = "47" @@ -46826,7 +46776,7 @@ /turf/open/floor/plasteel, /area/science/misc_lab) "ckO" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Chief Engineer"; req_access_txt = "56" }, @@ -47149,16 +47099,18 @@ /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "clD" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/engine/engine_smes) "clE" = ( /obj/structure/cable{ icon_state = "0-8" }, /obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/bot_white/right, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 1 + }, /area/engine/engine_smes) "clF" = ( /obj/structure/cable{ @@ -47174,8 +47126,9 @@ icon_state = "0-4" }, /obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 4 + }, /area/engine/engine_smes) "clI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -47426,8 +47379,9 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/engine/engine_smes) "cmB" = ( /obj/machinery/power/terminal{ @@ -47436,8 +47390,9 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/engine/engine_smes) "cmC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -47642,16 +47597,18 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/engine/engine_smes) "cno" = ( /obj/structure/cable{ icon_state = "0-8" }, /obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 4 + }, /area/engine/engine_smes) "cnp" = ( /obj/structure/cable{ @@ -47673,8 +47630,9 @@ icon_state = "0-4" }, /obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/bot_white/right, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 1 + }, /area/engine/engine_smes) "cnr" = ( /obj/machinery/door/window/southleft{ @@ -47850,13 +47808,12 @@ /area/engine/engine_smes) "cnO" = ( /obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "cnP" = ( @@ -47867,9 +47824,6 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "cnQ" = ( @@ -47992,7 +47946,7 @@ "coc" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; req_access_txt = "10" }, @@ -48073,10 +48027,10 @@ /turf/open/floor/plasteel, /area/engine/engine_smes) "cox" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plasteel, @@ -48092,9 +48046,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel, /area/engine/engine_smes) "coz" = ( @@ -48107,7 +48058,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/engine/engine_smes) "coA" = ( @@ -48273,9 +48223,17 @@ /turf/open/space, /area/space/nearstation) "cpg" = ( +/obj/item/grenade/barrier{ + pixel_x = 4 + }, +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ + pixel_x = -4 + }, /obj/structure/table, -/obj/item/storage/lockbox/loyalty, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/ai_monitored/security/armory) "cph" = ( /obj/structure/lattice, @@ -48308,7 +48266,6 @@ /turf/open/floor/plasteel, /area/engine/engine_smes) "cpl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engine/engine_smes) "cpm" = ( @@ -48322,18 +48279,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/structure/cable{ - icon_state = "1-8" - }, /turf/open/floor/plasteel, /area/engine/engine_smes) "cpn" = ( /obj/machinery/light, /obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/engine/engine_smes) "cpo" = ( @@ -48391,7 +48341,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; req_access_txt = "10" }, @@ -48425,10 +48375,12 @@ /turf/open/floor/engine, /area/engine/engineering) "cpA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/structure/chair/office/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "cpC" = ( @@ -48543,6 +48495,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cpS" = ( +/obj/structure/cable, /obj/machinery/power/apc{ dir = 2; name = "SMES room APC"; @@ -48552,10 +48505,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engine_smes) "cpT" = ( @@ -48571,8 +48520,12 @@ /turf/open/floor/plasteel, /area/engine/engine_smes) "cpU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -48861,7 +48814,7 @@ /area/engine/supermatter) "cqE" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ heat_proof = 1; name = "Supermatter Chamber"; req_access_txt = "10" @@ -48893,8 +48846,9 @@ pixel_x = 3; pixel_y = -3 }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/ai_monitored/security/armory) "cqJ" = ( /obj/structure/cable, @@ -49022,7 +48976,7 @@ /area/engine/engineering) "crd" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; req_access_txt = "10" }, @@ -49056,11 +49010,9 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "crn" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/airless, +/area/engine/engineering) "cro" = ( /obj/structure/cable{ icon_state = "0-4" @@ -49101,7 +49053,7 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "crt" = ( -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ heat_proof = 1; name = "Supermatter Chamber"; req_access_txt = "10" @@ -49450,11 +49402,6 @@ /obj/structure/lattice, /turf/open/space, /area/space/nearstation) -"csw" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/turf/open/space, -/area/space/nearstation) "csx" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, @@ -49468,10 +49415,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"csz" = ( -/obj/effect/landmark/carpspawn, -/turf/open/space, -/area/space) "csA" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "engsm"; @@ -49485,10 +49428,6 @@ }, /turf/open/floor/plating, /area/engine/supermatter) -"csC" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) "csD" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -49863,13 +49802,6 @@ /obj/structure/lattice, /turf/open/space, /area/space/nearstation) -"ctO" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 5 - }, -/turf/open/space, -/area/space/nearstation) "ctP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -51056,7 +50988,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "AI Core"; req_access_txt = "65" }, @@ -51227,15 +51159,18 @@ /area/shuttle/escape) "cwM" = ( /obj/structure/rack, -/obj/item/storage/box/chemimp{ - pixel_x = 6 +/obj/item/storage/box/teargas{ + pixel_x = -3; + pixel_y = 3 }, -/obj/item/storage/box/trackimp{ - pixel_x = -3 +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ + pixel_x = 3; + pixel_y = -3 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "cwN" = ( /obj/machinery/computer/security{ @@ -51865,12 +51800,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit) -"cyq" = ( -/obj/machinery/computer/pod{ - id = "oldship_gun" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "cyr" = ( /obj/machinery/door/airlock/external{ cyclelinkeddir = 8; @@ -51897,9 +51826,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"cyv" = ( -/turf/open/floor/plating, -/area/shuttle/abandoned) "cyw" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt{ @@ -51920,25 +51846,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) -"cyy" = ( -/obj/machinery/mass_driver{ - dir = 4; - icon_state = "mass_driver"; - id = "oldship_gun" - }, -/turf/open/floor/plating, -/area/shuttle/abandoned) -"cyz" = ( -/obj/machinery/door/airlock/public/glass, -/turf/open/floor/plating, -/area/shuttle/abandoned) -"cyA" = ( -/obj/machinery/door/poddoor{ - id = "oldship_gun"; - name = "pod bay door" - }, -/turf/open/floor/plating, -/area/shuttle/abandoned) "cyB" = ( /turf/open/floor/mineral/titanium/blue, /area/shuttle/supply) @@ -51980,10 +51887,6 @@ }, /turf/open/floor/plating, /area/engine/atmos) -"cyH" = ( -/obj/machinery/door/airlock/titanium, -/turf/open/floor/plating, -/area/shuttle/abandoned) "cyI" = ( /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -51991,15 +51894,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) -"cyJ" = ( -/obj/structure/rack, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/storage/toolbox/mechanical, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "cyK" = ( /obj/structure/cable{ icon_state = "4-8" @@ -52055,12 +51949,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"cyP" = ( -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "cyQ" = ( /obj/machinery/door/airlock/titanium{ name = "Supply Shuttle Airlock"; @@ -52122,28 +52010,6 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) -"cyV" = ( -/obj/machinery/door/window, -/turf/open/floor/mineral/titanium/purple, -/area/shuttle/abandoned) -"cyW" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/mineral/titanium/purple, -/area/shuttle/abandoned) -"cyX" = ( -/obj/structure/table, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"cyY" = ( -/obj/structure/table, -/obj/item/gun/energy/laser/retro, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "cyZ" = ( /obj/machinery/conveyor{ dir = 4; @@ -52155,35 +52021,6 @@ }, /turf/open/floor/plating, /area/shuttle/supply) -"cza" = ( -/obj/machinery/door/airlock/public/glass, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"czb" = ( -/obj/machinery/porta_turret/aux_base{ - always_up = 1; - desc = "A turret built with substandard parts and run down further with age. Still capable of delivering lethal lasers to the odd space carp, but not much else."; - dir = 4; - has_cover = 0; - icon_state = "standard_lethal"; - lethal_projectile = /obj/item/projectile/beam/weak; - name = "turret" - }, -/turf/closed/wall/mineral/titanium, -/area/shuttle/abandoned) -"czc" = ( -/obj/machinery/computer/shuttle/white_ship, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"czd" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"cze" = ( -/obj/structure/table, -/obj/item/tank/internals/oxygen, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "czf" = ( /turf/closed/wall/mineral/titanium/interior, /area/shuttle/supply) @@ -52206,11 +52043,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) -"czl" = ( -/obj/machinery/door/window/northright, -/obj/effect/decal/remains/human, -/turf/open/floor/mineral/titanium/purple, -/area/shuttle/abandoned) "czm" = ( /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -52221,13 +52053,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"czn" = ( -/obj/structure/frame/computer{ - anchored = 1 - }, -/obj/structure/light_construct, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "czp" = ( /obj/structure/window/reinforced{ dir = 1 @@ -52261,40 +52086,6 @@ /obj/structure/shuttle/engine/propulsion/burst/right, /turf/open/floor/plating/airless, /area/shuttle/supply) -"czw" = ( -/obj/item/device/multitool, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"czx" = ( -/obj/structure/chair, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"czy" = ( -/obj/structure/frame/computer{ - anchored = 1 - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"czA" = ( -/obj/item/scalpel, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"czB" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular{ - pixel_x = 6; - pixel_y = -5 - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"czC" = ( -/obj/machinery/sleeper{ - dir = 8 - }, -/obj/effect/decal/remains/human, -/obj/structure/light_construct, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "czE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -52728,16 +52519,6 @@ }, /turf/open/floor/plasteel, /area/janitor) -"cAM" = ( -/obj/structure/table/wood, -/obj/structure/disposalpipe/segment, -/obj/item/toy/cards/deck/cas, -/obj/item/toy/cards/deck/cas/black{ - pixel_x = -2; - pixel_y = 6 - }, -/turf/open/floor/wood, -/area/library) "cAN" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; @@ -52759,9 +52540,7 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "cAQ" = ( -/obj/structure/chair{ - dir = 8 - }, +/obj/structure/chair, /turf/open/floor/plating, /area/maintenance/port/aft) "cAR" = ( @@ -53212,45 +52991,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/main) -"cBW" = ( -/obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; - id = "syndicate_southmaint"; - name = "south maintenance airlock"; - turf_type = /turf/open/space; - width = 18 - }, -/turf/open/space, -/area/space/nearstation) -"cBX" = ( -/obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; - id = "syndicate_se"; - name = "southeast of station"; - turf_type = /turf/open/space; - width = 18 - }, -/turf/open/space, -/area/space/nearstation) -"cBY" = ( -/obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; - id = "syndicate_s"; - name = "south of station"; - turf_type = /turf/open/space; - width = 18 - }, -/turf/open/space, -/area/space/nearstation) "cBZ" = ( /obj/structure/table/wood, /obj/item/clothing/under/burial, @@ -53262,9 +53002,9 @@ /turf/open/floor/plasteel/grimy, /area/chapel/office) "cCa" = ( -/obj/structure/chair/stool, -/turf/open/floor/wood, -/area/maintenance/bar) +/obj/item/clothing/head/hardhat, +/turf/open/floor/plating/airless, +/area/space/nearstation) "cCb" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -53516,10 +53256,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plasteel, /area/engine/engineering) -"cCW" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/turf/open/floor/plating, -/area/engine/engineering) "cCY" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -53801,13 +53537,6 @@ }, /turf/closed/wall, /area/engine/engineering) -"cDS" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/space, -/area/space/nearstation) "cDY" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -54489,7 +54218,7 @@ /area/engine/engineering) "cGI" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Laser Room"; req_access_txt = "10" }, @@ -54614,10 +54343,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"cHl" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/r_wall, -/area/engine/engineering) "cHn" = ( /obj/structure/cable{ icon_state = "1-4" @@ -54642,10 +54367,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"cHs" = ( -/obj/item/crowbar/large, -/turf/open/floor/plating, -/area/engine/engineering) "cHD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -54763,7 +54484,7 @@ /area/science/robotics/mechbay) "cHK" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Robotics Lab"; req_access_txt = "29" }, @@ -55090,18 +54811,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"cMd" = ( -/obj/structure/light_construct{ - dir = 4 - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"cMe" = ( -/obj/structure/light_construct/small{ - dir = 4 - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "cMf" = ( /obj/machinery/door/airlock/titanium{ name = "medbay"; @@ -55113,18 +54822,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) -"cMh" = ( -/obj/structure/light_construct/small{ - dir = 8 - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"cMk" = ( -/obj/structure/light_construct/small{ - dir = 1 - }, -/turf/open/floor/plating, -/area/shuttle/abandoned) "cMl" = ( /obj/machinery/light{ dir = 8 @@ -55162,13 +54859,6 @@ "cMH" = ( /turf/open/floor/engine, /area/engine/supermatter) -"cMI" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/engine, -/area/engine/supermatter) "cMN" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -55335,11 +55025,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cPa" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "cPA" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4 @@ -55751,10 +55436,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"cTW" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "cTX" = ( /obj/structure/cable{ icon_state = "0-2" @@ -55777,31 +55458,10 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) -"Qlj" = ( -/obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; - id = "syndicate_nw"; - name = "northwest of station"; - turf_type = /turf/open/space - }, -/turf/open/space/basic, -/area/space/nearstation) -"Qlk" = ( -/obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; - id = "syndicate_nw"; - name = "northwest of station"; - turf_type = /turf/open/space; - width = 18 - }, -/turf/open/space/basic, -/area/space/nearstation) +"kSb" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/quartermaster/miningdock) "Qll" = ( /obj/machinery/door/airlock/titanium{ name = "recovery shuttle external airlock" @@ -55896,14 +55556,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"Qls" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "Qlt" = ( /obj/structure/tank_dispenser/oxygen{ layer = 2.7; @@ -56041,13 +55693,6 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) -"QlC" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/abandoned) "QlD" = ( /obj/machinery/door/airlock/titanium{ name = "E.V.A. equipment" @@ -56058,13 +55703,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) -"QlE" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/abandoned) "QlF" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/old, @@ -56113,18 +55751,6 @@ dir = 1 }, /area/shuttle/abandoned) -"QlJ" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/turf_decal/delivery{ - dir = 1 - }, -/turf/open/floor/plasteel{ - dir = 1 - }, -/area/shuttle/abandoned) "QlK" = ( /obj/effect/decal/cleanable/robot_debris/old, /obj/effect/decal/cleanable/oil, @@ -56214,13 +55840,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"QlQ" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/abandoned) "QlR" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt{ @@ -56241,18 +55860,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/abandoned) -"QlT" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/turf_decal/delivery{ - dir = 1 - }, -/turf/open/floor/plasteel{ - dir = 1 - }, -/area/shuttle/abandoned) "QlU" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt{ @@ -56307,16 +55914,6 @@ }, /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) -"Qma" = ( -/obj/machinery/door/airlock/titanium{ - name = "E.V.A. equipment" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/abandoned) "Qmb" = ( /obj/machinery/door/airlock/titanium{ name = "recovery shuttle interior airlock" @@ -56331,20 +55928,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) -"Qmc" = ( -/obj/machinery/door/airlock/titanium{ - name = "recovery shuttle interior airlock" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/abandoned) "Qmd" = ( /obj/structure/sign/cargo, /turf/closed/wall/mineral/titanium, @@ -56376,13 +55959,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"Qmh" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/abandoned) "Qmi" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt{ @@ -56411,20 +55987,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) -"Qml" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/abandoned) -"Qmm" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/abandoned) "Qmn" = ( /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -56475,13 +56037,6 @@ /obj/machinery/vending/coffee, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"Qms" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "Qmt" = ( /obj/structure/chair, /obj/effect/decal/cleanable/dirt{ @@ -56490,22 +56045,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"Qmu" = ( -/obj/structure/chair, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"Qmv" = ( -/obj/structure/chair, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "Qmw" = ( /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -56517,46 +56056,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"Qmx" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"Qmy" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"Qmz" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/abandoned) -"QmA" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"QmB" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "QmC" = ( /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -56585,16 +56084,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) -"QmE" = ( -/obj/machinery/door/airlock/titanium{ - name = "recovery shuttle external airlock" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/abandoned) "QmF" = ( /obj/machinery/door/airlock/titanium{ name = "recovery shuttle interior airlock" @@ -56791,73 +56280,6 @@ /obj/machinery/vending/cola/random, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"QmW" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"QmX" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"QmY" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"QmZ" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"Qna" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"Qnb" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"Qnc" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "Qnd" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt{ @@ -57285,14 +56707,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"QnQ" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "QnR" = ( /obj/machinery/hydroponics/constructable, /obj/item/seeds/glowshroom, @@ -57302,14 +56716,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"QnS" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) "QnT" = ( /obj/structure/table, /obj/machinery/reagentgrinder{ @@ -57439,88 +56845,19 @@ /obj/structure/grille, /turf/open/space/basic, /area/space/nearstation) -"Qoe" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) "Qof" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, /area/space/nearstation) -"Qog" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qoh" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) "Qoi" = ( /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"Qoj" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qok" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) "Qol" = ( /obj/structure/grille, /turf/open/floor/plating/airless, /area/space/nearstation) -"Qom" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qon" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qoo" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qop" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qoq" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qor" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qos" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"Qot" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qou" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) "Qov" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -57528,27 +56865,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"Qow" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engine/engineering) -"Qox" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engine/engineering) -"Qoy" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engine/engineering) "Qoz" = ( /obj/structure/cable{ icon_state = "1-2" @@ -57582,14 +56898,6 @@ /obj/item/stack/sheet/metal/fifty, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"QoE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) -"QoF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) "QoG" = ( /obj/structure/girder, /turf/open/floor/plasteel/dark, @@ -57608,10 +56916,6 @@ /obj/machinery/light, /turf/open/floor/plating, /area/engine/engineering) -"QoJ" = ( -/obj/machinery/light, -/turf/open/floor/plating, -/area/engine/engineering) "QoK" = ( /obj/item/crowbar/large, /obj/structure/rack, @@ -57652,23 +56956,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/miningdock) -"QoQ" = ( -/obj/machinery/rnd/protolathe/department/medical, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) -"QoR" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/rnd/protolathe/department/engineering, -/turf/open/floor/plasteel, -/area/engine/engineering) -"QoS" = ( -/obj/machinery/computer/rdconsole/production, -/turf/open/floor/plasteel, -/area/engine/engineering) "QoT" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel/showroomfloor, @@ -57699,2741 +56986,33 @@ /turf/open/floor/plating, /area/maintenance/department/medical/morgue) "QoY" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"QoZ" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Qpa" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Qpb" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Qpc" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Qpd" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Qpe" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Qpf" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Qpg" = ( -/obj/structure/grille, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Qph" = ( -/obj/structure/window/reinforced, -/obj/vehicle/ridden/secway, -/obj/item/key/security, -/obj/machinery/door/window/eastleft{ - name = "Secway Docking Port" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/showroomfloor, -/area/security/main) -"Qpi" = ( -/obj/structure/window/reinforced, -/obj/vehicle/ridden/secway, -/obj/item/key/security, -/obj/machinery/door/window/eastleft{ - name = "Secway Docking Port" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/showroomfloor, -/area/security/main) -"Qpj" = ( -/obj/structure/closet/l3closet/security, -/turf/open/floor/plasteel/showroomfloor, -/area/security/main) -"Qpk" = ( -/obj/machinery/flasher/portable, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"Qpl" = ( -/obj/machinery/flasher/portable, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"Qpm" = ( -/obj/machinery/flasher/portable, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"Qpn" = ( -/obj/machinery/flasher/portable, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"Qpo" = ( /obj/structure/table, -/obj/item/grenade/barrier{ - pixel_x = 4 - }, -/obj/item/grenade/barrier, -/obj/item/grenade/barrier{ - pixel_x = -4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"Qpp" = ( -/obj/structure/rack, -/obj/item/gun/energy/e_gun/dragnet, -/obj/item/gun/energy/e_gun/dragnet, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"Qpq" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"Qpr" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/clothing/head/helmet/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/head/helmet/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/shield/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/shield/riot, -/obj/item/shield/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"Qps" = ( -/obj/structure/window/reinforced, -/obj/machinery/door/window/eastleft{ - name = "Cyborg Docking Port" - }, -/obj/machinery/recharge_station, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/showroomfloor, -/area/security/main) -"Qpt" = ( -/obj/effect/landmark/secequipment, -/obj/effect/turf_decal/bot{ - dir = 2 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/main) -"Qpu" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/effect/turf_decal/bot{ - dir = 2 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/main) -"Qpv" = ( -/obj/machinery/camera/motion{ - c_tag = "Non-Lethal Armory Motion Sensor"; - dir = 4 - }, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"Qpw" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"Qpx" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"Qpy" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"Qpz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpC" = ( -/obj/machinery/door/poddoor/shutters{ - id = "lowsecarmory"; - name = "Non-Lethal Armoury Shutter" - }, -/obj/machinery/button/door{ - id = "lowsecarmory"; - name = "Non-Lethal Armory Shutters"; - pixel_y = 26; - req_access_txt = "3" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpD" = ( -/obj/effect/landmark/secequipment, -/obj/effect/turf_decal/bot{ - dir = 2 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/main) -"QpE" = ( -/obj/machinery/suit_storage_unit/security, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"QpF" = ( -/obj/machinery/suit_storage_unit/security, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"QpG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"QpH" = ( -/obj/machinery/suit_storage_unit/security, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"QpI" = ( -/obj/machinery/suit_storage_unit/security, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"QpJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpL" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpM" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/camera/motion{ - c_tag = "Armory Motion Sensor"; - dir = 2; - name = "motion-sensitive security camera" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpO" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpP" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/ai_monitored/security/armory) -"QpR" = ( -/obj/structure/table, -/obj/item/storage/box/firingpins, -/obj/item/storage/box/firingpins, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"QpS" = ( -/obj/structure/table, -/obj/item/storage/toolbox/drone, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"QpT" = ( -/obj/structure/falsewall, -/obj/effect/turf_decal/delivery/white, -/turf/open/floor/plasteel/dark, -/area/security/execution/transfer) -"QpU" = ( -/obj/effect/turf_decal/loading_area/white, -/obj/effect/turf_decal/stripes/white/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/white/corner, -/turf/open/floor/plasteel/dark, -/area/security/execution/transfer) -"QpV" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/rack, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/mask/gas/sechailer, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = 3; - pixel_y = -3 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"QpW" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/white/corner{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/security/execution/transfer) -"QpX" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/white/corner, -/turf/open/floor/plasteel/dark, -/area/security/execution/transfer) -"QpY" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/closet/secure_closet/brig{ - id = "Secure Cell"; - name = "Secure Cell Locker" - }, -/obj/effect/turf_decal/stripes/white/end{ - dir = 4 - }, -/obj/effect/turf_decal/delivery/white, -/turf/open/floor/plasteel/dark, -/area/security/execution/transfer) -"QpZ" = ( -/turf/open/floor/plasteel, -/area/security/execution/transfer) -"Qqa" = ( -/turf/open/floor/plasteel, -/area/security/execution/transfer) -"Qqb" = ( -/turf/open/floor/plasteel, -/area/security/execution/transfer) -"Qqc" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/security/execution/transfer) -"Qqd" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/stripes/white/corner{ - dir = 1 - }, -/obj/machinery/door_timer{ - id = "Secure Cell"; - name = "Secure Cell"; - pixel_y = -32 - }, -/turf/open/floor/plasteel/dark, -/area/security/execution/transfer) -"Qqe" = ( -/obj/machinery/door/window/brigdoor/security/cell{ - dir = 4; - id = "Secure Cell"; - name = "Secure Cell" - }, -/obj/machinery/door/window/brigdoor/security/cell{ - dir = 8; - id = "Secure Cell"; - name = "Secure Cell" - }, -/obj/effect/turf_decal/stripes/white/corner{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/white/corner{ - dir = 8 - }, -/obj/machinery/light/small, -/turf/open/floor/plasteel/dark/side{ - dir = 8 - }, -/area/security/execution/transfer) -"Qqf" = ( -/turf/open/floor/plasteel, -/area/security/execution/transfer) -"Qqg" = ( -/obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/mask/muzzle, -/turf/open/floor/plasteel, -/area/security/execution/transfer) -"Qqh" = ( -/turf/open/floor/plasteel, -/area/security/execution/transfer) -"Qqi" = ( -/turf/open/floor/plasteel, -/area/security/execution/transfer) -"Qqj" = ( -/turf/open/floor/plasteel, -/area/security/execution/transfer) -"Qqk" = ( -/turf/open/floor/plasteel, -/area/security/execution/transfer) -"Qql" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/security/warden) -"Qqm" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/table, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"Qqn" = ( -/obj/machinery/computer/secure_data{ - dir = 1 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"Qqo" = ( -/obj/structure/table, -/obj/item/folder/red, -/obj/item/pen, -/obj/item/hand_labeler, -/obj/item/book/manual/wiki/security_space_law, -/obj/machinery/light, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"Qqp" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor{ - dir = 1; - name = "Armory Desk"; - req_access_txt = "3" - }, -/obj/machinery/door/window/southleft{ - name = "Reception Desk"; - req_access_txt = "63" - }, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"Qqq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"Qqr" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"Qqs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/red/corner{ - dir = 4 - }, -/area/security/brig) -"Qqt" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/security/brig) -"Qqu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/red/corner{ - dir = 1 - }, -/area/security/brig) -"Qqv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ - cyclelinkeddir = 2; - id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/turf/open/floor/plasteel/red/side{ - dir = 9 - }, -/area/security/brig) -"Qqw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"Qqx" = ( -/obj/machinery/door_timer{ - id = "Cell 2"; - name = "Cell 2"; - pixel_y = -32 - }, -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel/red/corner, -/area/security/brig) -"Qqy" = ( -/obj/machinery/door_timer{ - id = "Cell 3"; - name = "Cell 3"; - pixel_y = -32 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/red/corner, -/area/security/brig) -"Qqz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/red/corner{ - dir = 8 - }, -/area/security/brig) -"QqA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ - cyclelinkeddir = 2; - id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/turf/open/floor/plasteel/red/side{ - dir = 10 - }, -/area/security/brig) -"QqB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/light, -/turf/open/floor/plasteel/red/side, -/area/security/brig) -"QqC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/security/brig) -"QqD" = ( -/obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 3"; - name = "Cell 3" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/red/side, -/area/security/brig) -"QqE" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/glass_security{ - cyclelinkeddir = 1; - id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/turf/open/floor/plasteel/red/side{ - dir = 9 - }, -/area/security/brig) -"QqF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plasteel/floorgrime, -/area/security/brig) -"QqG" = ( -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/hallway/primary/fore) -"QqH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/plasteel/floorgrime, -/area/security/brig) -"QqI" = ( -/obj/machinery/flasher{ - id = "Cell 2"; - pixel_x = -28 - }, -/turf/open/floor/plasteel/floorgrime, -/area/security/brig) -"QqJ" = ( -/obj/machinery/flasher{ - id = "Cell 3"; - pixel_x = -28 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/plasteel/floorgrime, -/area/security/brig) -"QqK" = ( -/obj/machinery/flasher{ - id = "Cell 4"; - pixel_x = -28 - }, -/turf/open/floor/plasteel/floorgrime, -/area/security/brig) -"QqL" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "briggate"; - name = "security shutters" - }, -/obj/machinery/door/window/eastright{ - name = "Brig Desk"; - req_access_txt = "2" - }, -/turf/open/floor/plasteel/dark, -/area/security/brig) -"QqM" = ( -/turf/open/floor/plasteel/red/side{ - dir = 8 - }, -/area/hallway/primary/fore) -"QqN" = ( -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/hallway/primary/fore) -"QqO" = ( -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/hallway/primary/fore) -"QqP" = ( -/turf/open/floor/plasteel/red/side{ - dir = 6 - }, -/area/hallway/primary/fore) -"QqQ" = ( -/turf/open/floor/plasteel/red/side{ - dir = 10 - }, -/area/hallway/primary/fore) -"QqR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/red/side{ - dir = 4 - }, -/area/hallway/primary/fore) -"QqS" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/plasteel/red/side{ - dir = 4 - }, -/area/hallway/primary/fore) -"QqT" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "briggate"; - name = "security shutters" - }, -/obj/machinery/door/window/southleft{ - base_state = "right"; - icon_state = "right"; - name = "Brig Desk"; - req_access_txt = "1" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel/dark, -/area/security/brig) -"QqU" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "seclobby"; - name = "security shutters" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/security/brig) -"QqV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/red/side{ - dir = 4 - }, -/area/hallway/primary/fore) -"QqW" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/plasteel/red/side{ - dir = 4 - }, -/area/hallway/primary/fore) -"QqX" = ( -/obj/machinery/vending/kink, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"QqY" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/red/corner{ - dir = 1 - }, -/area/hallway/primary/fore) -"QqZ" = ( -/obj/structure/sign/securearea{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/red/corner{ - dir = 4 - }, -/area/hallway/primary/fore) -"Qra" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ - cyclelinkeddir = 1; - id_tag = "lobbyairlock"; - name = "Security Lobby"; - req_access_txt = "0" - }, -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/hallway/primary/fore) -"Qrb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/red/side{ - dir = 10 - }, -/area/hallway/primary/fore) -"Qrc" = ( -/turf/open/floor/plasteel/red/side, -/area/hallway/primary/fore) -"Qrd" = ( -/turf/open/floor/plasteel/red/side, -/area/hallway/primary/fore) -"Qre" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/red/side{ - dir = 6 - }, -/area/hallway/primary/fore) -"Qrf" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/red/side{ - dir = 4 - }, -/area/hallway/primary/fore) -"Qrg" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ - cyclelinkeddir = 1; - id_tag = "lobbyairlock"; - name = "Security Lobby"; - req_access_txt = "0" - }, -/turf/open/floor/plasteel/red/side, -/area/hallway/primary/fore) -"Qrh" = ( -/turf/open/floor/plasteel/red/side{ - dir = 6 - }, -/area/hallway/primary/fore) -"Qri" = ( -/obj/machinery/flasher{ - id = "brigentry"; - pixel_x = 0; - pixel_y = -28 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/plasteel/red/side, -/area/hallway/primary/fore) -"Qrj" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"Qrk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/fore/secondary) -"Qrl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/closed/wall, -/area/maintenance/fore/secondary) -"Qrm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"Qrn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) -"Qro" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"Qrp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"Qrq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"Qrr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"Qrs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"Qrt" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/fore) -"Qru" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"Qrv" = ( -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/bar/cafe) -"Qrw" = ( -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"Qrx" = ( -/obj/structure/chair/wood{ - dir = 8 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar/cafe) -"Qry" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"Qrz" = ( -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"QrA" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/bar/cafe) -"QrB" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks/beer, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"QrC" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/bar/cafe) -"QrD" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"QrE" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"QrF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"QrG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"QrH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/structure/chair/stool/bar, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar/cafe) -"QrI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/obj/structure/table/wood, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/bar/cafe) -"QrJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"QrK" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"QrL" = ( -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"QrM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/obj/structure/table/wood, -/obj/machinery/light/small, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/maintenance/bar/cafe) -"QrN" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"QrO" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/maintenance/bar/cafe) -"QrP" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/obj/machinery/light_switch{ - pixel_x = 27 - }, -/turf/open/floor/wood, -/area/maintenance/bar/cafe) -"QrQ" = ( -/turf/closed/wall, -/area/crew_quarters/theatre/mime) -"QrR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/crew_quarters/theatre/mime) -"QrS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/crew_quarters/theatre/clown) -"QrT" = ( -/obj/machinery/vending/autodrobe, -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/theatre/mime) -"QrU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/theatre/mime) -"QrV" = ( -/obj/structure/closet/crate/wooden/toy, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) -"QrW" = ( -/obj/machinery/vending/autodrobe, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) -"QrX" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/snacks/baguette, -/obj/item/toy/dummy, -/obj/structure/mirror{ - pixel_x = -28 - }, -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/theatre/mime) -"QrY" = ( -/obj/effect/landmark/start/mime, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/theatre/mime) -"QrZ" = ( -/obj/effect/landmark/start/clown, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) -"Qsa" = ( -/obj/structure/bed, -/obj/item/bedsheet/clown, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) -"Qsb" = ( -/obj/structure/table, -/obj/item/lipstick/random{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/lipstick/random{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/theatre/mime) -"Qsc" = ( -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/theatre/mime) -"Qsd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/theatre/mime) -"Qse" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) -"Qsf" = ( -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) -"Qsg" = ( -/obj/structure/displaycase/clown, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) -"Qsh" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/pen, -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/theatre/mime) -"Qsi" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/theatre/mime) -"Qsj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel/white/side{ - dir = 1 - }, -/area/crew_quarters/theatre/mime) -"Qsk" = ( -/obj/structure/table, -/obj/item/device/flashlight/lamp/bananalamp, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/obj/item/device/radio/intercom{ - freerange = 0; - frequency = 1459; - name = "Station Intercom (General)"; - pixel_x = -30 - }, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) -"Qsl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) -"Qsm" = ( -/obj/structure/statue/bananium/clown, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) -"Qsn" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/crew_quarters/theatre/clown) -"Qso" = ( -/obj/machinery/door/airlock/clown{ - name = "Clown's Office"; - req_access_txt = "46" - }, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/theatre/clown) -"Qsp" = ( -/obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" - }, -/turf/open/floor/plasteel{ - icon_state = "wood" - }, -/area/crew_quarters/bar) -"Qsq" = ( -/obj/structure/reagent_dispensers/beerkeg, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"Qsr" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/wood, -/area/bridge/meeting_room) -"Qss" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/bridge/meeting_room) -"Qst" = ( -/turf/open/floor/plating, -/area/maintenance/department/bridge) -"Qsu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/department/bridge) -"Qsv" = ( -/turf/open/floor/plating, -/area/maintenance/department/bridge) -"Qsw" = ( -/turf/open/floor/plating, -/area/maintenance/department/bridge) -"Qsx" = ( -/turf/open/floor/plating, -/area/maintenance/department/bridge) -"Qsy" = ( -/turf/open/floor/plating, -/area/maintenance/department/bridge) -"Qsz" = ( -/turf/open/floor/plating, -/area/maintenance/department/bridge) -"QsA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/maintenance/department/bridge) -"QsB" = ( -/turf/open/floor/plating, -/area/maintenance/department/bridge) -"QsC" = ( -/obj/machinery/door/airlock/maintenance{ - name = "bridge maintenance access"; - req_access_txt = "20" - }, -/turf/open/floor/plating, -/area/crew_quarters/heads/captain) -"QsD" = ( -/turf/closed/wall/r_wall, -/area/maintenance/department/bridge) -"QsE" = ( -/turf/closed/wall/r_wall, -/area/maintenance/department/bridge) -"QsF" = ( -/obj/machinery/computer/bank_machine, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) -"QsG" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "Vault APC"; - areastring = "/area/ai_monitored/nuke_storage"; - pixel_y = 25 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/circuit, -/area/ai_monitored/nuke_storage) -"QsH" = ( -/obj/structure/filingcabinet, -/obj/item/folder/documents, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) -"QsI" = ( -/obj/structure/closet/crate{ - name = "Gold Crate" - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_y = 2 - }, -/obj/item/stack/sheet/mineral/gold{ - pixel_x = 1; - pixel_y = -2 - }, -/obj/item/storage/belt/champion, -/obj/effect/turf_decal/bot_white/right, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) -"QsJ" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/circuit, -/area/ai_monitored/nuke_storage) -"QsK" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/circuit, -/area/ai_monitored/nuke_storage) -"QsL" = ( -/obj/item/coin/silver{ +/obj/item/storage/box/syringes, +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 7; - pixel_y = 12 + pixel_y = -3 }, -/obj/item/coin/silver{ - pixel_x = 12; - pixel_y = 7 - }, -/obj/item/coin/silver{ - pixel_x = 4; - pixel_y = 8 - }, -/obj/item/coin/silver{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/coin/silver{ - pixel_x = 5; - pixel_y = -8 - }, -/obj/structure/closet/crate{ - name = "Silver Crate" - }, -/obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/nuke_storage) -"QsM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/closed/wall/r_wall, -/area/ai_monitored/nuke_storage) -"QsN" = ( -/obj/structure/sign/securearea, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/closed/wall/r_wall, -/area/ai_monitored/nuke_storage) -"QsO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/ai_monitored/nuke_storage) -"QsP" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/security/checkpoint/tertiary) -"QsQ" = ( -/turf/closed/wall/r_wall, -/area/security/checkpoint/tertiary) -"QsR" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/security/checkpoint/tertiary) -"QsS" = ( -/obj/structure/closet/secure_closet/security, -/obj/machinery/power/apc{ - areastring = "/area/security/checkpoint/tertiary"; - dir = 8; - name = "Security Checkpoint APC"; - pixel_x = -24; - pixel_y = 0 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plasteel/red/side{ - dir = 9 - }, -/area/security/checkpoint/tertiary) -"QsT" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 30 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/security/checkpoint/tertiary) -"QsU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/security/checkpoint/tertiary) -"QsV" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/security/checkpoint/tertiary) -"QsW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/security/checkpoint/tertiary) -"QsX" = ( -/obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; - pixel_y = 30 - }, -/turf/open/floor/plasteel/red/side{ - dir = 1 - }, -/area/security/checkpoint/tertiary) -"QsY" = ( -/obj/machinery/computer/security, -/turf/open/floor/plasteel/red/side{ - dir = 5 - }, -/area/security/checkpoint/tertiary) -"QsZ" = ( -/obj/structure/closet/wardrobe/red, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel/red/side{ - dir = 8 - }, -/area/security/checkpoint/tertiary) -"Qta" = ( -/turf/open/floor/plasteel, -/area/security/checkpoint/tertiary) -"Qtb" = ( -/obj/machinery/computer/secure_data, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel/red/side{ - dir = 4 - }, -/area/security/checkpoint/tertiary) -"Qtc" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/camera{ - c_tag = "Security Checkpoint"; - dir = 1 - }, -/obj/machinery/button/door{ - desc = "A remote control switch for the vault shutters."; - id = "vault"; - name = "vault shutter control"; - normaldoorcontrol = 0; +/obj/item/reagent_containers/glass/bottle/morphine{ pixel_x = 8; - pixel_y = -24; - req_access_txt = "63" + pixel_y = -3 }, -/turf/open/floor/plasteel/red/side{ - dir = 10 +/obj/item/reagent_containers/syringe{ + pixel_x = 6; + pixel_y = -3 }, -/area/security/checkpoint/tertiary) -"Qtd" = ( -/obj/item/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/pen, -/obj/structure/table, -/turf/open/floor/plasteel/red/side, -/area/security/checkpoint/tertiary) -"Qte" = ( -/obj/item/device/radio/off, -/obj/item/crowbar, -/obj/item/device/assembly/flash/handheld, -/obj/structure/table, -/obj/item/device/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 - }, -/turf/open/floor/plasteel/red/side{ - dir = 6 - }, -/area/security/checkpoint/tertiary) -"Qtf" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "vault"; - name = "vault shutters" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/security/checkpoint/tertiary) -"Qtg" = ( -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/quartermaster/miningdock) -"Qth" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"Qti" = ( -/obj/effect/spawner/lootdrop/grille_or_trash, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/maintenance/port/aft) -"Qtj" = ( -/obj/machinery/door/airlock{ - id_tag = "MaintDorm2"; - name = "Maintenance Dorm 2" - }, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"Qtk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"Qtl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"Qtm" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"Qtn" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"Qto" = ( -/obj/machinery/light/small, -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 5 - }, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"Qtp" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"Qtq" = ( -/turf/closed/wall, -/area/maintenance/bar) -"Qtr" = ( -/turf/closed/wall, -/area/maintenance/bar) -"Qts" = ( -/turf/closed/wall, -/area/maintenance/bar) -"Qtt" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ - req_access_txt = "0" - }, -/turf/open/floor/plating, -/area/maintenance/bar) -"Qtu" = ( -/turf/closed/wall, -/area/maintenance/bar) -"Qtv" = ( -/turf/closed/wall, -/area/maintenance/bar) -"Qtw" = ( -/turf/closed/wall, -/area/maintenance/bar) -"Qtx" = ( -/turf/closed/wall, -/area/maintenance/bar) -"Qty" = ( -/turf/open/floor/wood, -/area/maintenance/bar) -"Qtz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"QtA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"QtB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/bar) -"QtC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"QtD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance/abandoned{ - req_access_txt = "0" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/bar) -"QtE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"QtF" = ( -/turf/closed/wall, -/area/maintenance/bar) -"QtG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar) -"QtH" = ( -/obj/structure/chair/stool/bar, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"QtI" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"QtJ" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_x = 30 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar) -"QtK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/bar) -"QtL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/bar) -"QtM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/bar) -"QtN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/bar) -"QtO" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/bar) -"QtP" = ( -/turf/closed/wall, -/area/maintenance/bar) -"QtQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"QtR" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/bar) -"QtS" = ( -/obj/structure/chair/stool/bar, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/wood, -/area/maintenance/bar) -"QtT" = ( -/obj/structure/table/wood, -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/bar) -"QtU" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"QtV" = ( -/obj/machinery/chem_dispenser/drinks/beer, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/maintenance/bar) -"QtW" = ( -/turf/closed/wall, -/area/maintenance/bar) -"QtX" = ( -/obj/item/restraints/handcuffs/fake, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears, -/turf/open/floor/plating, -/area/maintenance/bar) -"QtY" = ( -/obj/item/shard, -/obj/item/wirecutters, -/obj/item/wallframe/camera, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/maintenance/bar) -"QtZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar) -"Qua" = ( -/turf/closed/wall, -/area/maintenance/bar) -"Qub" = ( /obj/item/device/radio/intercom{ freerange = 0; - frequency = 1459; - name = "Station Intercom (General)"; - pixel_x = -30 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/maintenance/bar) -"Quc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qud" = ( -/obj/structure/chair/stool/bar, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar) -"Que" = ( -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/maintenance/bar) -"Quf" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar) -"Qug" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks, -/turf/open/floor/wood, -/area/maintenance/bar) -"Quh" = ( -/turf/closed/wall, -/area/maintenance/bar) -"Qui" = ( -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, -/obj/item/crowbar, -/obj/item/device/electropack/shockcollar, -/turf/open/floor/plating, -/area/maintenance/bar) -"Quj" = ( -/obj/structure/bed, -/obj/item/bedsheet/grey, -/obj/effect/decal/cleanable/semen{ - desc = "Blech."; - name = "dried semen" - }, -/obj/effect/spawner/lootdrop/costume, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/maintenance/bar) -"Quk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar) -"Qul" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ - name = "Incinerator Access"; - req_access_txt = "12" - }, -/obj/structure/barricade/wooden{ - name = "wooden barricade (CLOSED)" - }, -/turf/open/floor/plating, -/area/maintenance/bar) -"Qum" = ( -/turf/open/floor/wood, -/area/maintenance/bar) -"Qun" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/bar) -"Quo" = ( -/obj/structure/chair/stool/bar, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qup" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Quq" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qur" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qus" = ( -/turf/closed/wall, -/area/maintenance/bar) -"Qut" = ( -/obj/item/lighter/greyscale, -/obj/effect/decal/cleanable/semen{ - desc = "Blech."; - name = "dried semen" - }, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/maintenance/bar) -"Quu" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/cleanable/blood/old, -/obj/item/device/assembly/signaler, -/turf/open/floor/plating, -/area/maintenance/bar) -"Quv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar) -"Quw" = ( -/turf/closed/wall, -/area/maintenance/bar) -"Qux" = ( -/obj/effect/spawner/lootdrop/keg, -/turf/open/floor/wood, -/area/maintenance/bar) -"Quy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/maintenance/bar) -"Quz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/wood, -/area/maintenance/bar) -"QuA" = ( -/obj/machinery/power/apc{ - areastring = "/area/maintenance/bar"; - dir = 2; - name = "Maintenance Bar APC"; - pixel_x = 1; - pixel_y = -24 - }, -/obj/structure/cable, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar) -"QuB" = ( -/turf/closed/wall, -/area/maintenance/bar) -"QuC" = ( -/turf/closed/wall, -/area/maintenance/bar) -"QuD" = ( -/obj/structure/falsewall, -/turf/open/floor/plating, -/area/maintenance/bar) -"QuE" = ( -/turf/closed/wall, -/area/maintenance/bar) -"QuF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar) -"QuG" = ( -/turf/closed/wall, -/area/maintenance/bar) -"QuH" = ( -/turf/closed/wall, -/area/maintenance/bar) -"QuI" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ - req_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/maintenance/bar) -"QuJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/maintenance/abandoned{ - req_access_txt = "0" - }, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/maintenance/bar) -"QuK" = ( -/obj/structure/sign/poster/official/no_erp, -/turf/closed/wall, -/area/maintenance/bar) -"QuL" = ( -/turf/closed/wall, -/area/maintenance/bar) -"QuM" = ( -/obj/machinery/vending/clothing, -/turf/open/floor/wood, -/area/maintenance/bar) -"QuN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar) -"QuO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/maintenance/bar) -"QuP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/wood, -/area/maintenance/bar) -"QuQ" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/bar) -"QuR" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/bar) -"QuS" = ( -/obj/machinery/vending/autodrobe, -/turf/open/floor/wood, -/area/maintenance/bar) -"QuT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar) -"QuU" = ( -/obj/structure/sign/poster/random{ - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar) -"QuV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/maintenance/bar) -"QuW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/maintenance/bar) -"QuX" = ( -/obj/structure/chair/stool, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar) -"QuY" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/bar) -"QuZ" = ( -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/machinery/newscaster{ + frequency = 1485; + listening = 1; + name = "Station Intercom (Medbay)"; pixel_x = 30 }, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qva" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar) -"Qvb" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvc" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvd" = ( -/obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qve" = ( -/obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvf" = ( -/obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/item/storage/pill_bottle/dice, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvg" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvi" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/table/wood, -/obj/item/reagent_containers/spray/cleaner, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/bar) -"Qvj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar) -"Qvk" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/bar) -"Qvl" = ( -/obj/structure/table/wood/poker, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvm" = ( -/obj/structure/table/wood/poker, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvn" = ( -/obj/structure/table/wood/poker, -/obj/item/coin/iron, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvo" = ( -/obj/machinery/vending/games{ - name = "\improper Good 'Clean' Fun" - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar) -"Qvq" = ( -/obj/effect/spawner/lootdrop/keg, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar) -"Qvr" = ( -/obj/structure/sign/poster/random{ - pixel_y = -32 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvs" = ( -/obj/structure/chair/stool, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/maintenance/bar) -"Qvt" = ( -/obj/structure/chair/stool, -/obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -35 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvu" = ( -/obj/structure/sign/poster/random{ - pixel_y = -32 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/bar) -"Qvv" = ( -/obj/machinery/vending/kink, -/turf/open/floor/wood, -/area/maintenance/bar) -"Qvw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar) -"Qvx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/closed/wall/r_wall, -/area/engine/engine_smes) -"Qvy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/closed/wall/r_wall, -/area/engine/engine_smes) -"Qvz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"QvA" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = -32 - }, -/obj/structure/closet/radiation, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvB" = ( -/obj/machinery/camera{ - c_tag = "Gravity Generator Foyer" - }, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 32 - }, -/obj/structure/closet/radiation, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"QvD" = ( -/turf/closed/wall, -/area/engine/gravity_generator) -"QvE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvF" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"QvI" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/engine/engineering) -"QvJ" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/engine/engineering) -"QvK" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/engine/engineering) -"QvL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"QvM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"QvN" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"QvO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvP" = ( -/obj/item/device/radio/intercom{ - broadcasting = 0; - listening = 1; - name = "Station Intercom (General)"; - pixel_y = 20 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvQ" = ( -/obj/machinery/power/terminal, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/structure/cable, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"QvR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"QvS" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/item/paper/guides/jobs/engi/gravity_gen{ - layer = 3 - }, -/obj/structure/table, -/obj/item/pen/blue, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvT" = ( -/obj/machinery/holopad, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvU" = ( -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvV" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "Gravity Generator APC"; - areastring = "/area/engine/gravity_generator"; - pixel_x = -25; - pixel_y = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/chair/office/light{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvW" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvX" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvY" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"QvZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"Qwa" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_x = -32 - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/engine/gravity_generator) -"Qwb" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/engine/gravity_generator) -"Qwc" = ( -/obj/machinery/door/airlock/glass_engineering{ - name = "Gravity Generator"; - req_access_txt = "11"; - req_one_access_txt = "0" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"Qwd" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/engine/gravity_generator) -"Qwe" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 32 - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/engine/gravity_generator) -"Qwf" = ( -/obj/effect/turf_decal/bot_white/right, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"Qwg" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"Qwh" = ( -/obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"Qwi" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"Qwj" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"Qwk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) -"Qwl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"Qwm" = ( -/obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"Qwn" = ( -/obj/machinery/gravity_generator/main/station, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"Qwo" = ( -/obj/effect/turf_decal/bot_white/right, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"Qwp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Gravity Generator Room"; - dir = 8; - network = list("SS13") - }, -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) -"Qwq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/engine/gravity_generator) +/turf/open/floor/plasteel/white, +/area/medical/sleeper) (1,1,1) = {" aaa @@ -66997,11 +63576,11 @@ Qlm cyc QlL QlW -QlC -QlC -QlC -QlC -QlC +cyI +cyI +cyI +cyI +cyI cyc Qnt QnD @@ -67255,10 +63834,10 @@ Qlx QlM QlX Qmi -Qms +cye QmG Qmw -QlC +cyI Qno Qnu cyi @@ -67514,11 +64093,11 @@ cyc Qmj Qmt QmH -QmX -QlC +cMc +cyI Qnp cyi -QlC +cyI QnR cyR aaa @@ -67771,7 +64350,7 @@ QlY Qmk Qmt QmI -QmX +cMc Qnh cyc Qnv @@ -68025,11 +64604,11 @@ Qlp Qlz QlO QlZ -QlC +cyI Qmt QmJ -QmX -QlC +cMc +cyI cyc cyc QnF @@ -68282,13 +64861,13 @@ cyc cyc cyc cyc -QlC +cyI Qmw QmK -Qms -QlC +cye +cyI Qnq -QlC +cyI QnG QnT cyc @@ -68540,10 +65119,10 @@ QlA cyn cyc cLY -QlC +cyI cyi -QlC -QlC +cyI +cyI cyc Qnw cyi @@ -69051,13 +65630,13 @@ aaf cyR Qlr cyi -QlC +cyI QlD cyi -QlC -QlC -QlC -QlC +cyI +cyI +cyI +cyI cyc Qny QnI @@ -69307,14 +65886,14 @@ aAC aaf cyc Qlt -QlC +cyI QlR cyc -QlC -Qms +cyI +cye QmM -Qms -QlC +cye +cyI cyc cyc cyc @@ -69821,16 +66400,16 @@ aAD awW Qll Qlu -QlC +cyI cyi Qmb -QlC +cyI Qmk QmO -QlC -QlC +cyI +cyI Qnr -QlC +cyI QnK QnX cyR @@ -70082,12 +66661,12 @@ QlF cyx Qmb cyi -QlC +cyI cMa cyi -QlC +cyI cyc -Qms +cye czm QnY cyc @@ -70338,10 +66917,10 @@ cyc QlG cyc cyc -QlC -Qms +cyI +cye QmP -Qms +cye Qnj cyc cyc @@ -70595,11 +67174,11 @@ cyk QlH QlS Qmd -QlC -Qms +cyI +cye QmQ Qmw -QlC +cyI Qns QnA QnL @@ -70852,11 +67431,11 @@ cyj QlI QlI Qme -QlC -QlC +cyI +cyI cyi -QlC -QlC +cyI +cyI cMf cyi QnM @@ -71368,8 +67947,8 @@ QlV cyc cyw QmC -QlC -Qms +cyI +cye Qnk cyc QnC @@ -71625,7 +68204,7 @@ cyc cyc Qmo QmD -QlC +cyI Qnd Qnl cyc @@ -71881,7 +68460,7 @@ aaa aaa cyR Qmp -QlC +cyI QmS Qne Qnm @@ -76269,6 +72848,8 @@ aaa aaa aaa aaa +aaa +aaa aag aaa aaa @@ -76276,8 +72857,6 @@ aaa aaa aaa aaa -aaa -aaa aaf aaS aaa @@ -76526,6 +73105,8 @@ aaa aaa aaa aaa +aaa +aaa aag aaa aaa @@ -76533,8 +73114,6 @@ aaa aaa aaa aaa -aaa -aaa aaf aaS aaf @@ -76783,6 +73362,8 @@ aaa aaa aaa aaa +aaa +aaa aag aaa aaa @@ -76790,8 +73371,6 @@ aaa aaa aaa aaa -aaa -aaa aaf aaS aaa @@ -77040,6 +73619,8 @@ aaa aaa aaa aaa +aaa +aaa aag aaa aaa @@ -77047,8 +73628,6 @@ aaa aaa aaa aaa -aaa -aaa aaf aaS acy @@ -77297,6 +73876,8 @@ aaa aaa aaa aaa +aaa +aaa aag aaa aaa @@ -77304,8 +73885,6 @@ aaa aaa aaa aaa -aaa -aaa aaf aba aaa @@ -77554,6 +74133,8 @@ aaa aaa aaa aaa +aaa +aaa aag aaa aaa @@ -77561,8 +74142,6 @@ aaa aaa aaa aaa -aaa -aaa aaf aaS aaf @@ -77811,10 +74390,10 @@ aaa aaa aaa aaa +aaa +aaa aag aaa -aaa -aaa aoV bZm aoV @@ -78068,10 +74647,10 @@ aaa aaa aaa aaa +aaa +aaa aag aaa -aaa -aaa aoV bVz aaf @@ -78325,10 +74904,10 @@ aaa aaa aaa aaa +aaa +aaa aag aaa -aaa -aaa aag bVz aag @@ -78582,10 +75161,10 @@ aaa aaa aaa aaa +aaa +aaa aag aaa -aaa -aaa aaf bVz aoV @@ -78839,9 +75418,9 @@ aaa aaa aaa aaa +aaa +aaa aag -Qoi -aoV aaa aaf bVz @@ -79096,10 +75675,10 @@ aaa aaf aaf aaf +aaa +aaa aag -Qoi -aaf -Qoi +aaa bVx caf aoV @@ -79353,11 +75932,11 @@ aaa aaa aaa bCq +bCq +bCq bLv bCq -bCq -bCq -bCq +aoV cbj aoV aag @@ -79612,8 +76191,8 @@ aaa bCq bJP bCq -bTs -Qtn +bSn +bCq bCq cbj bLv @@ -79867,10 +76446,10 @@ cTg cTg aaa bCq -bHE -bCq -Qtk -Qto +bPS +bRd +bPS +bPS bCq cbk bLv @@ -80070,17 +76649,17 @@ alU ali ali atO -axo -alU -alU -alU -aBQ -aBQ -aBQ -aBQ -aBQ -aBQ -aBQ +axm +ayz +ayz +ayz +aBR +aBR +aBR +aBR +aBR +aBR +aBR aLJ aLE aOl @@ -80127,7 +76706,7 @@ bLv bPR bRc bSo -Qtp +bTs bCq bVy bLv @@ -80329,16 +76908,16 @@ aaf avY axo ayB -Qrv -QrC -QrL -QrQ -QrT -QrX -Qsb -Qsh +aaa +aaf +aaa +aaf +aaa +aaf +aaa +aaa aKu -aLF +aLM aLF aOs aPG @@ -80381,9 +76960,9 @@ bLt bMF aaa bCq -bHE -bCq -bCq +bPS +bRf +bSo bTu bCq bVB @@ -80585,17 +77164,17 @@ aoV aoV avY axo -ayB -Qrw -QrD -QrM -QrR -QrU -QrY -Qsc -Qsi +ayA +aaf +aBa +aBa +aBa +aBa +aBa +aBa +aaf aKt -aLE +aLL bDe aOl aPF @@ -80638,9 +77217,9 @@ bLs cTg aaa bLv -bPU -bCq -bPS +bPT +bRe +bSo bTt bCq bVA @@ -80842,17 +77421,17 @@ aaf aaf avY axo -ayB -Qrx -QrE +ayA +aaa +aBa aBT aDs aEN aGb -Qsd -Qsj -aKu -aLE +aBa +aaa +aKt +aLN aLE aOl aPH @@ -80897,7 +77476,7 @@ aaa bCq bPV bCq -Qtl +bCq bTw bCq bVD @@ -80924,7 +77503,7 @@ aaa aaf aaa bCq -bLv +bCq bLv bLv bLv @@ -81098,18 +77677,18 @@ aqQ aqQ aqQ avZ -axo +axp ayC azH -QrF +aBb aBS aDr -aDr -aDr -aDr -aDr -aDr -aLE +aEM +aGa +aHF +aJd +aKv +aLN aLE aOl aPF @@ -81152,8 +77731,8 @@ bGi aoV aoV bCq -bPW -Qtj +bPU +bHE bSp bTv bCq @@ -81181,23 +77760,23 @@ bLv bLv bLv bCq -bJe +ciT cqK crl bLv aaa -aaT -aaT -aaT -aaT -aaT -aaT -aaT -aaT -aaT aaa -aaT -aaT +aaa +aae +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -81354,17 +77933,17 @@ aqR aGh aqR aqR -Qrt -axq +awb +axo ayA -Qry -QrG -QrN +aaa +aBa +aBV alu -apS -apS -apS -apS +aEM +aGd +aHG +aJe aKw aLP aMR @@ -81409,10 +77988,10 @@ bGi aoV aoV bCq -Qti +bPW bCq bCq -bTu +bTy bCq bVF bWA @@ -81443,19 +78022,19 @@ cAQ crm bLv aaa -aaT -ctv -ctv -ctv -ctv -ctv -ctv -ctv -aaT -Qoi -ctv -aaT -aaT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -81611,19 +78190,19 @@ aqQ aqQ aqQ aqQ -avZ -axp +awa +axq ayD azI -QrH +aBc aBU aDt -aDt -aDt -aDt -aDt -aDt -aLE +aEO +aGc +aHF +aJd +aKb +aLN aMQ aNT aPI @@ -81667,8 +78246,8 @@ aoV aoV bCq bHE -bPU -Qtm +bHE +bSq bTx bCq bVE @@ -81697,22 +78276,22 @@ bLv bCq cqv cqL -ciT -bCq -Qoi -aaT -aaT -aaT -aaT -aaT -aaT -aaT -aaT -aaT -Qoi -ctv -ctv -aaT +bJe +bLv +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -81870,17 +78449,17 @@ aaa aag avY axo -ayB -Qrz -QrI +ayA +aaa +aBa aBW aDv aEP aGe -Qse -Qsk -Qsn -aLE +aBa +aaa +aKt +aLN aMS aOt aPK @@ -81926,20 +78505,20 @@ bCq bPY cOw bCq -Qtq -Qtx -QtF -QtP -Qua -Qul -Quw -QuG -cjn -cjn -cjn -cjn -cjn -cjn +bCq +bCq +bCq +bCq +bCq +bYy +bCq +bCq +bLv +bCq +bCq +bCq +bCq +bLv bUs bLv aaa @@ -81956,19 +78535,19 @@ bCq bCq bCq bCq -Qoi -Qoi -Qoi -aaa -aaa -Qoi aaa aaa aaa -Qoi -Qoi -Qoi -Qoi +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -82127,17 +78706,17 @@ aaa aag avY axo -ayB -QrA -QrJ -QrO -QrS -QrV -QrZ -Qsf -Qsl -Qso -aLE +ayA +aaf +aBa +aBa +aBa +aBa +aBa +aBa +aaf +aKt +aLN aMS aOi aLE @@ -82183,20 +78762,20 @@ bCq bPX bRg bRg -Qtr -Qty +bCq +bHE bVG -QtQ -Qub -Qum -Qux -QuH -bcU -QuU -bVG -bcU -Qvq -cjn +bHE +bHE +bHE +bLv +aaf +aoV +aoV +aoV +aoV +aoV +bLv bUs bLv aaa @@ -82211,20 +78790,20 @@ aaa aaa aaf aaf -QvD +cig +aaf +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa -QvM -bij -bij -bij -bij -bij -bij -Qwk -btG -btG aaa -Qoi aaa aaa aaa @@ -82383,18 +78962,18 @@ aaa aaa aag avY -axo -ayB -QrB -QrK -QrP -aDt -QrW -Qsa -Qsg -Qsm +axs +ayF +aaa +aaf +aaa +aaf +aaa +aaf +aaa +aaa aKx -aLE +aLN aMS aOi aLE @@ -82440,20 +79019,20 @@ bLv bQa bHE bHE -Qts -Qtz -QtG -QtR -Quc -Qun -Quy -QuI -QuO -QuV -Qvb -Qvk -Qvr -cjn +bCq +bHE +bLv +bLv +bLv +bLv +bLv +aoV +aoV +aoV +aoV +aoV +aaf +bLv bUs bLv aaf @@ -82465,25 +79044,25 @@ cjJ cjJ cjJ cjJ -Qvx -bij -bij +cjJ +cjJ +aaa crn -bij -QvN -QvS -QvV -Qwa -bkI -bgN -bgN -Qwl -bgN -btG -Qoi -aaT -aaT -aaT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -82640,17 +79219,17 @@ aaf arP avd avZ -axo -arP -arP -arP -arP -arP -arP -arP -arP -arP -arP +axr +ayE +ayE +ayE +ayE +ayE +ayE +ayE +ayE +ayE +ayE aLl aMT aOi @@ -82697,20 +79276,20 @@ bLv bPZ bHE bHE -Qtt -QtA -QtH -QtS -Qud -Quo -Quz -QuJ -QuP -QuW -Qvc -cCa -bcU -cjn +cTF +bHE +bLv +aoV +aoV +aoV +aoV +aoV +aoV +aoV +aoV +aoV +aoV +bLv bUs bLv aaa @@ -82723,24 +79302,24 @@ cnL cov cpj cpS -btG -QvA -QvE -btG -QvO -bsc -QvW -Qwb -bgN -Qwf -Qwi -Qwm -bgN -btG +cjJ +aaa +crn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa -aaT -ctv -aaT aaa aaa aaa @@ -82954,20 +79533,20 @@ bLv bHE bHE bSs -Qtu -QtB -QtI -QtT -Que -Qup +bCq +bHE +bLv +aoV +aoV +aoV bcU -QuK -QuQ +aaf +aaH cCa -Qvd -Qvl -Qvs -cjn +aoV +aoV +aoV +bLv bUs bLv aaa @@ -82980,24 +79559,24 @@ cnN cox cpl cpU -btF -bsc -QvF -btF -bsc -QvT -QvX -Qwc -bgN -Qwg -bgN -Qwn -bgN -btG -Qoi -aaT -ctv -aaT +cjJ +aaf +crn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -83194,7 +79773,7 @@ bkM bbR bud QoO -Qtg +kSb bAZ bGm bzF @@ -83211,20 +79790,20 @@ bCq bHE bRh bLu -Qtv -QtC -QtJ -QtU -Quf -Quq -QuA -QuL -bcU -QuX -Qve -Qvm -Qvt -cjn +bCq +bHE +bLv +aaf +aaf +aoV +aoV +aaH +bdV +aaH +aaf +aaf +aaf +bLv bUs bLv aaf @@ -83237,24 +79816,24 @@ cnM cow cpk cpT -btG -QvB -QvG -btG -QvP -bsc -QvY -Qwd -bgN -Qwh -Qwj -Qwo -bgN -btG +cjJ +aaa +crn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa -aaT -ctv -aaT aaa aaa aaa @@ -83389,11 +79968,11 @@ abc abc afu abc -abc -abc -abc -abc -Qoi +aaa +aaa +aaa +aaa +aaa aaa akD akD @@ -83448,7 +80027,7 @@ boS bfm bNK bkN -bfm +bml bwe bwe bwd @@ -83468,20 +80047,20 @@ bCq bOK bCq bCq -Qtw -QtD -QtK -QtV -Qug -Qur -QuB -cjn -bcU -cCa -Qvf -Qvn -cCa +bCq +bHE +bLv +aoV +aoV +aoV +aoV cjn +bSu +aaH +aoV +aoV +aoV +bLv bUs bLv aaa @@ -83493,25 +80072,25 @@ cnq cnP coz cpn -Qvy -Qvz -QvC -QvH -QvL -QvQ -QvU -QvZ -Qwe -bmw -bgN -bgN -Qwp -bgN -btG +cjJ +cjJ +aaa +crn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa -aaT -ctv -aaT aaa aaa aaa @@ -83645,13 +80224,13 @@ abc aea aeH aft -QpT -QpU -QpW -Qqc abc -Qoi -Qoi +aaa +aaa +aaa +aaa +aaa +aaa aaa aiU aln @@ -83726,19 +80305,19 @@ bHE bLv aaa bLv -QtE -QtL -QtW -Quh -Qus -QuC -bcU -bcU -bcU -Qvg -cCa -Qvu -cjn +bHE +bLv +aoV +aoV +aoV +aoV +aoV +aaH +aaf +aoV +aoV +aoV +bLv bUs bLv aaa @@ -83753,21 +80332,20 @@ cpm cjJ aaf aaf -QvI +crn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa -QvR -bgO -bgO -bgO -bgO -bgO -bgO -Qwq -btG -btG -Qoi aaT -ctv aaT aaa aaa @@ -83821,6 +80399,7 @@ aaa aaa aaa aaa +aaa "} (92,1,1) = {" aaa @@ -83904,9 +80483,9 @@ aeJ afw abc abc -QpX -Qqd -abc +aaf +aaa +aaf aaf aaf aaf @@ -83984,18 +80563,18 @@ bLv aaf bLv bUt -QtM -QtX -Qui -Qut -QuD -bcU -QuR -QuY -Qvh -bcU -bcU -cjn +bLv +aaf +aaf +aoV +aoV +aoV +aaH +aoV +aoV +aaf +aaf +bLv bUs bLv aaf @@ -84010,22 +80589,22 @@ cjJ cjJ aaa aaa -QvJ +crn aaf -aaa -aaa -aaa -Qoi -aaa -aaa -Qoi -Qoi -Qoi -aaa -aoV aaT +aaT +aaT +aaT +aaT +aaT +aaT +aaT +aaT +aaa +aaf ctv aaT +aaT aaa aaa aaa @@ -84161,9 +80740,9 @@ aeI afv agf abc -QpY -Qqe -abc +aaf +aaa +aaa aiT aiT aiV @@ -84240,19 +80819,19 @@ bLv bCq aaa bLv -bUt -QtN -QtY -Quj -Quu -QuE -QuM -QuS -QuZ -Qvi -Qvo -Qvv -cjn +bUs +bLv +aoV +aoV +aoV +aoV +aoV +aaf +aoV +aoV +aoV +aoV +bCq bUs bCq aaa @@ -84267,21 +80846,21 @@ cpo cjJ aaa aaa -QvK +crn aaf -Qoi -aaa -aaa -Qoi -aaa -aaa -Qoi -Qoi -Qoi -Qoi -aoV aaT ctv +ctv +ctv +ctv +ctv +ctv +ctv +aaT +aaa +aaf +ctv +ctv aaT aaa aaa @@ -84418,10 +80997,10 @@ aeL afy agh abc -QpZ -Qqf -Qqi -aiV +aaf +aaa +aaf +aiT ajs akb akI @@ -84498,17 +81077,17 @@ aaa aaa bTB bUv -QtO -QtZ -Quk -Quv -QuF -QuN -QuT -Qva -Qvj -Qvp -Qvw +bES +bES +bES +bES +bGp +bGp +bGp +bGp +bES +bES +bES car bUs bCq @@ -84526,20 +81105,20 @@ aaf aaf cig aaf -Qoi -aaa -aaa -Qoi -aaa -aaa -Qoi -aaa -Qoi +aaT +aaT +aaT +aaT +aaT +aaT +aaT +aaT +aaT aaf aaf -aaT -aaT -aaT +aaf +aaf +aaa aaa aaa aaa @@ -84675,10 +81254,10 @@ aeK afx agg abc -Qqa -Qqg -Qqj -aiV +aaf +aaa +aaa +aiU ajr aka akH @@ -84794,7 +81373,7 @@ aaa aaa aaa aaf -Qoi +aaa aaa aaa aaa @@ -84932,10 +81511,10 @@ aeN afA afA afA -Qqb -Qqh -Qqk -aiV +aaf +aaa +aaa +aiU aju akd akK @@ -86738,11 +83317,11 @@ agj ajz aki akM -aly +alv amf amQ -aiX anw +anz aov cCi arT @@ -86996,10 +83575,10 @@ auj akl akO alx -QqH -amg -aiX +alx +amR anw +anz aox cCi cCi @@ -87251,11 +83830,11 @@ aid agj aiZ akk -akQ -agj -agj -agj -aiX +akN +alw +amg +amR +anw anR aow apg @@ -87506,14 +84085,14 @@ ahP ahP aiF agj -ajD -akm -QqC -aly -QqI -amQ -aiX -anw +aja +ajG +akQ +agj +agj +amS +anx +anz aov aph aph @@ -87763,14 +84342,14 @@ ahD aiw aiO agj -aja -akl +ajD +akm akP -alx +aly amh -ami -aiX +amR anw +anz aov aph aob @@ -87805,9 +84384,9 @@ aZP bbh bcc bdd -Qsr -bfr bbX +bfr +bgM bif aZM aZM @@ -87822,7 +84401,7 @@ bmr bmr byQ aJq -bBi +aJq bCs bDy bFb @@ -88021,13 +84600,13 @@ agP agP aiz ajg -Qqx -akQ -agj -agj -agj -aiX +akl +akR +alx +alx +amR anw +anz aov aph aoc @@ -88064,7 +84643,7 @@ bbk bbk bbk bfs -Qss +aZM aZM aZM aaf @@ -88259,7 +84838,7 @@ aaa aaa aaf aaf -QoY +aaa aaf aai abi @@ -88281,10 +84860,10 @@ ajb ajF akN alw -QqJ -amQ -aiX +ami +amR anw +anz aov api ata @@ -88321,19 +84900,19 @@ bce bdf beb aYv -Qst -QsD aaf aaf -Qoi +aaf +aaf aaa -Qoi aaa -QsQ -bsb -bsb -bsb -bsb +aaa +aaa +aaf +aaa +aaa +aaa +aJn aXf aJq byU @@ -88516,7 +85095,7 @@ aaf aaf aaf aaf -aaS +aaf aaR aaZ aaZ @@ -88532,16 +85111,16 @@ agn agR agn agR -Qql agn -Qqq -akv -QqD -QqF -aww -amk -aiX -QqY +ajc +ajI +ako +akQ +agj +agj +amS +any +anz aov aph aqb @@ -88578,22 +85157,22 @@ aZR bbm bec bfu -Qsu -aBb -aBb +bgO +bgO +bgO bmu -aBb -aBb -QsM -aaa -bsb -QsS -QsZ -Qtc +bgO +bgO +bgO +bgO bsb +aaf +aaf +aaf +aJn aXf aJq -bBi +aJq bCs bFa bFa @@ -88773,32 +85352,32 @@ aaa aaa aaa aaf -QoZ +aaa +aaf +aaf +aaT aaf aaZ -Qpk -Qpv -QpE -aaZ +abm cpg acv adi -QpR +adi aaZ aeW -QpV +agQ ahv ahQ -Qqm aiI -ajI -Qqy -akQ -agj -agj -agj -aiX +aiH +ajB +akm +akP +aly +amj +amR anw +anz aov aph aph @@ -88835,22 +85414,22 @@ aZR aZR aZR bft -Qsv -aBa -QsF +bgN +bgN +bgN bmv -QsI +bkI bnT bpg -aaa -bsb -QsT +bqD +bsa +bgO buP bwm bxH byS aJq -Qth +aMh bCs bCs bCs @@ -89030,32 +85609,32 @@ aaa aaa aaa aaf -Qpa +aaa aaf +aaf +aaT +aaa aaZ -Qpl -Qpw -QpF -aaZ +abH acl -cxA +ajC acL -QpS +adi aaZ agp agT ahx ahS aiK -Qqp -Qqr -akm +ajc +ajI +akl akT -aly -QqK -amQ -aiX +aww +alx +amR anw +anz aov apk anw @@ -89092,16 +85671,16 @@ bbm bdh bee bfv -Qsw -aBa +bgN +bih big -aEM -aEM -aGa +bii +bgN +bnV bph bqF bsd -QsU +btG buQ bwn bxI @@ -89287,41 +85866,41 @@ aaa aaa aaa aaf -Qpb +aaa aaf +aaf +abY +aaa aaZ -Qpm -Qpx -QpG -aaZ -QpM +abn +ack adk adK cqG aeX -agt +ago agS agQ -agt +ahR aiJ -aiL +ajc ajI -akl +akk akS -alx -amh -amp -aiX +alw +amk +amR +anw anS aoy -Qrj -Qrm -Qro -Qrp -Qrq -Qrr -Qrs -Qru +apj +anz +anz +anz +anz +anz +anz +awk axB anz anz @@ -89349,19 +85928,19 @@ bcf bdg bed bfv -Qsx -aBa -aBV +bgN +big +bgN bkZ -QsJ +bgN bnU -aHG +bph bqE -QsR -QsV -Qta -Qtd -Qtf +bsc +btF +bph +bsc +btF bvW bAf bBp @@ -89544,14 +86123,14 @@ aaa aaa aaa aaf -Qpc +aaa aaf +aaf +aaT +aaa aaZ -Qpn -Qpy -QpH -aaZ -QpN +abJ +ack acM adQ cwM @@ -89560,16 +86139,16 @@ agr agU ahy ahX -Qqn -aiN -Qqs +aiL +ajc +ajI akq akQ agj agj -agj -aiX -QqZ +amS +anx +anz aoz apm aqd @@ -89606,16 +86185,16 @@ bbm bdh bef bfv -Qsy -aBa -QsG -aEO -QsK +bgN +bii +big +bih +bgN bnV -QsN -QsP +bph +bqF bsf -QsW +btG buS bwp bxK @@ -89801,14 +86380,14 @@ aaa aaa aaa aaf -Qpd +aaa aaf +aaf +aaT +aaa aaZ -Qpo -Qpz -QpI -aaZ -QpO +abI +ack coS aet cxA @@ -89817,17 +86396,17 @@ agt agt ahz aie -agt -aiM -Qqt +aiN +ajc +ajI akp akU alz aml amT -aiX -Qra -Qrg +anw +anz +aoz apl aqc aqc @@ -89863,16 +86442,16 @@ aZR aZR aZR bfw -Qsz -aBa -QsH +bgN +bgN +bgN bjy -QsL +bmw bnW bpi -aaa -bsb -QsX +bqG +bse +bij buR bwo bxJ @@ -90058,14 +86637,14 @@ aaa aaa aaa aaf -Qpe +aaa aaf +aaf +abY +aaa aaZ -Qpp -QpA -QpJ abQ -QpP +ack adj arc blT @@ -90074,17 +86653,17 @@ cml agV cxk aig -Qqo -agn -Qqu -Qqz +aiM +ajc +ajI +akp akV alB amn amV -QqT -anB -Qrh +anw +anz +aoz aod aqf ahT @@ -90120,19 +86699,19 @@ aZR bbm beh bfx -QsA -aBc -aBc +bij +bij +bij bgR -aBc -aBc -QsO -aaa -bsb -QsY -Qtb -Qte -bsb +bij +bij +bij +bij +bsg +aaf +aaf +aaf +aJn aJq aJq bBu @@ -90315,34 +86894,34 @@ aaa aaa aaa aaf -Qpf +aaa aaf +aaf +abY +aaa aaZ -Qpq -ack -QpK abN -QpQ -acF +ack +bkA acF aes avB amN agt -ahB +awN aHp -agn -agn -Qqv -QqA -amS +aIF +ajc +ajI +akp +akQ alA -QqL amm -QqU +amU +anw anT -anT -aod +aoA +apn aqe arf arf @@ -90377,19 +86956,19 @@ bcg aZU beg aYB -QsB -QsE aaf aaf -Qoi +aaf +aaf aaa -Qoi aaa -bsb -bsb -bsb -bsb -bsb +aaa +aaa +aaf +aaa +aaa +aaa +aJn aJq aJq bBt @@ -90572,12 +87151,12 @@ aaa aaa aaa aaf -Qpg +aaa +aaf +aaf +aaT aaf aaZ -Qpr -QpB -QpL aci acm cpA @@ -90594,10 +87173,10 @@ ajJ akr akX alC -QqM -amX -amX +alC amX +anz +anz aoB aod aqe @@ -90634,7 +87213,7 @@ bbp bbp bbp bfz -QsC +aZV aZV aZV aaf @@ -90829,14 +87408,14 @@ aaa aaa aaf aaf +aaf +aaf +aaa +adR +abo aaZ aaZ aaZ -aaZ -QpC -avB -aaZ -aaZ acT adl aaZ @@ -90847,17 +87426,17 @@ ahE aii agn ajd -ajb +ajI ahY -akX -QqG +akW +aiG amo -amX -amX -Qrb -Qri -Qrk -Qrn +amW +anz +anz +aoz +aod +aqe arf apY ate @@ -90891,7 +87470,7 @@ bch bdi bei bfy -bbw +bgS bik aZV aZV @@ -91086,14 +87665,14 @@ aaa aaa aaa aaa +aaf +aaf +aaa abp -Qph -Qpi -Qps -abO -abO +abP +aco acO -abO +abl abO abO afc @@ -91104,14 +87683,14 @@ ahA ahZ adR aiQ -Qqw +ajI akt -QqE -anw -QqN -QqP +akQ +agj +agj +aiX anB -Qrc +anz aoD aod aqe @@ -91343,6 +87922,9 @@ aaa aaa aaa aaa +aaa +aaf +aaa abo abO abO @@ -91350,9 +87932,6 @@ abO abO abO abO -abO -abO -abO afb abo afg @@ -91364,11 +87943,11 @@ ajf ajK aks akY +alx +amp +aiX anA -QqO -QqQ -amo -Qrd +anz aoC aod aqe @@ -91600,15 +88179,15 @@ aaa aaa aaa aaa +aaa +aaf +aaa abp abO -abO -Qpt -QpD acq acq acq -abO +acq aew afe afS @@ -91619,13 +88198,13 @@ aia aiP aiR ajB -QqB -aiX +akv +ala akz alf -QqR -QqV -Qre +aiX +anA +anz aoF apo aqh @@ -91857,11 +88436,11 @@ aaa aaa aaa aaf +aaf +aaf +aaf abo abO -abO -abO -abO acp acP acP @@ -91877,14 +88456,14 @@ adR aiG ajL aku -aiX +akZ alE amq -QqS -QqW -Qrf +aiX +anA +anz aoE -Qrl +aod aqg aun asf @@ -92114,15 +88693,15 @@ aaa aaa aaa aaa +aaa +aaa +aaf abp -aco -Qpj -Qpu abR abP abP abP -abl +abP abp abp abp @@ -92371,9 +88950,9 @@ aaa aaa aaf aaf -abp -abp -abp +aaf +aaf +aaf abq abq abq @@ -93964,7 +90543,7 @@ aCr aCr aJC bYP -bbx +aQg aJC aQg aJC @@ -96272,7 +92851,7 @@ aGI aId aJD aKP -aOL +aMx aNJ aQe aOL @@ -96529,7 +93108,7 @@ aGH aIc aJC aKO -aQc +aMw aNI aMw aOK @@ -96786,7 +93365,7 @@ aGJ aIe aJC aJC -Qsp +aJC aJC aJC aJC @@ -97043,7 +93622,7 @@ aGJ aIe aJE aKQ -aKR +aLU aNu aJC aPw @@ -97814,9 +94393,9 @@ aGL aIe aJC aKS -aKR aMC aJC +aJC aJI aJI aSI @@ -98071,15 +94650,15 @@ aGL aIg aJH aKR -Qsq aMB aJC +aOP +aJI aRA aVz aVz aVz aVz -aVz aYJ aJI bbz @@ -98105,8 +94684,8 @@ bAu bvj bCN bEa +QoY bFA -QoQ bIm bJD bKK @@ -106786,8 +103365,8 @@ aaf aaf aaf aaf -alP -QqX +aaf +aaf alP anf alP @@ -107043,8 +103622,8 @@ aaa aaa aaa aaa -alP -alP +aaa +aaf alP anf alP @@ -107134,7 +103713,7 @@ cls cmr cNW cOe -cPa +cmo cNW aaf aaf @@ -109178,7 +105757,7 @@ bPN bWr cbZ bQZ -cPa +cmo cNW cOx cNW @@ -110204,7 +106783,7 @@ bUp bUp bPN cOx -cPa +cmo cNW cOx cOx diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index fe77452705..f644d8b9c0 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -398,7 +398,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/machinery/door/airlock/glass_maintenance{ +/obj/machinery/door/airlock/maintenance/glass{ name = "Maintenance" }, /turf/open/floor/plasteel, @@ -449,7 +449,7 @@ }, /area/shuttle/abandoned) "abb" = ( -/obj/machinery/door/airlock/glass_maintenance{ +/obj/machinery/door/airlock/maintenance/glass{ name = "Maintenance" }, /turf/open/floor/plasteel, @@ -2198,7 +2198,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Infirmary"; req_access_txt = "0" @@ -2863,7 +2863,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engineering Storage" }, /turf/open/floor/plasteel/neutral/side{ @@ -3322,14 +3322,14 @@ /area/construction/mining/aux_base) "agO" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_ne"; name = "northeast of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) @@ -3654,7 +3654,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge"; welded = 1 }, @@ -5703,7 +5703,7 @@ /area/security/checkpoint/customs) "amm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 0; name = "Customs Desk"; req_access_txt = "19" @@ -5763,7 +5763,7 @@ /area/hallway/secondary/entry) "amu" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Checkpoint"; req_access_txt = "63" }, @@ -12507,7 +12507,7 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "aAW" = ( -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ heat_proof = 1; name = "Supermatter Chamber"; req_access_txt = "0"; @@ -16396,7 +16396,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Power Monitoring"; req_access_txt = "0"; req_one_access_txt = "24;10" @@ -17251,16 +17251,16 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aKz" = ( /obj/structure/chair/stool/bar, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aKA" = ( /obj/structure/chair/stool/bar, /obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aKB" = ( /obj/structure/chair/stool/bar, @@ -17268,7 +17268,7 @@ name = "Station Intercom"; pixel_x = 26 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aKC" = ( /turf/closed/wall, @@ -17824,10 +17824,10 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aLL" = ( -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aLM" = ( /obj/machinery/airalarm{ @@ -17837,7 +17837,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aLN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -18478,15 +18478,15 @@ /area/crew_quarters/bar/atrium) "aNg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aNh" = ( /obj/structure/chair/stool, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aNi" = ( /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aNj" = ( /obj/effect/spawner/structure/window/reinforced, @@ -19173,12 +19173,12 @@ "aOI" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aOJ" = ( /obj/structure/table/wood, /obj/item/storage/pill_bottle/dice, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aOK" = ( /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -19189,12 +19189,12 @@ pixel_x = -8 }, /obj/structure/table/wood, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aOL" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/soda_cans/cola, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aOM" = ( /obj/structure/table, @@ -19939,6 +19939,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/landmark/xmastree, /turf/open/floor/carpet, /area/crew_quarters/bar/atrium) "aQo" = ( @@ -19964,7 +19965,7 @@ dir = 5 }, /obj/structure/chair/stool, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aQs" = ( /obj/structure/table/wood, @@ -19972,7 +19973,7 @@ dir = 4 }, /obj/item/reagent_containers/food/drinks/bottle/orangejuice, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aQt" = ( /obj/structure/table/wood, @@ -19980,7 +19981,7 @@ dir = 4 }, /obj/item/reagent_containers/food/snacks/cheesiehonkers, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aQu" = ( /obj/structure/table/wood, @@ -19988,20 +19989,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aQv" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aQw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aQx" = ( /obj/machinery/door/firedoor, @@ -20825,7 +20826,7 @@ /area/crew_quarters/bar/atrium) "aSb" = ( /obj/effect/landmark/lightsout, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aSc" = ( /obj/machinery/door/firedoor, @@ -20852,7 +20853,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Delivery Office"; req_access_txt = 0; req_one_access_txt = "48;50" @@ -20904,7 +20905,7 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "cardoor"; name = "Cargo Cell"; req_access_txt = "63" @@ -21708,30 +21709,30 @@ "aTH" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/coffee, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aTI" = ( /obj/structure/table/wood, /obj/item/device/paicard, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aTJ" = ( /obj/structure/table/wood, /obj/item/clothing/head/hardhat/cakehat, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aTK" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aTL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aTM" = ( /obj/machinery/door/firedoor, @@ -22568,27 +22569,27 @@ "aVq" = ( /obj/structure/chair/stool, /obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aVr" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/chips, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aVs" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aVt" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/britcup, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aVu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/chair/stool, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aVv" = ( /obj/structure/cable/white{ @@ -23278,7 +23279,7 @@ /area/engine/atmos) "aWI" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Storage"; req_access_txt = "0"; req_one_access_txt = "24;10" @@ -23469,13 +23470,13 @@ pixel_x = -26; pixel_y = -26 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aXc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aXd" = ( /obj/structure/cable/white{ @@ -23774,7 +23775,7 @@ /turf/open/floor/plating, /area/security/prison) "aXK" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Sanitarium"; req_access_txt = "63" }, @@ -23797,7 +23798,7 @@ /turf/closed/wall, /area/security/prison) "aXN" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 3"; req_access_txt = "2" }, @@ -23809,7 +23810,7 @@ /turf/closed/wall, /area/security/prison) "aXP" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 2"; req_access_txt = "2" }, @@ -23819,7 +23820,7 @@ /turf/open/floor/plasteel/floorgrime, /area/security/prison) "aXQ" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 1"; req_access_txt = "2" }, @@ -24232,7 +24233,7 @@ dir = 4; name = "service camera" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aYF" = ( /obj/machinery/firealarm{ @@ -24242,7 +24243,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aYG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -24797,7 +24798,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" }, @@ -25200,21 +25201,21 @@ pixel_x = -32 }, /obj/item/twohanded/required/kirbyplants/random, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "baE" = ( /obj/structure/chair/stool/bar, /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "baF" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "baG" = ( /obj/structure/extinguisher_cabinet{ @@ -25316,7 +25317,7 @@ /area/quartermaster/miningoffice) "baT" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Mining Office"; req_access_txt = "48" }, @@ -26056,7 +26057,7 @@ /area/quartermaster/office) "bcq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; req_access_txt = "0"; req_one_access_txt = "48;50" @@ -26223,7 +26224,7 @@ /area/security/prison) "bcL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" }, @@ -26246,7 +26247,7 @@ /area/security/prison) "bcN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" }, @@ -27606,7 +27607,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Storage Closet"; req_access_txt = "63" }, @@ -27712,7 +27713,7 @@ /area/engine/atmos) "bga" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Storage"; req_access_txt = "0"; req_one_access_txt = "24;10" @@ -28187,7 +28188,7 @@ /area/security/brig) "bha" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" }, @@ -28217,7 +28218,7 @@ /area/security/brig) "bhc" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" }, @@ -28679,7 +28680,7 @@ "bie" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Mining Office"; req_access_txt = "48" }, @@ -29377,7 +29378,7 @@ /area/hydroponics) "bjw" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Hydroponics"; req_access_txt = "35" }, @@ -29859,7 +29860,7 @@ /obj/structure/cable/white{ icon_state = "1-8" }, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Infirmary" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -31731,7 +31732,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Distribution Loop"; req_access_txt = "24" }, @@ -33268,7 +33269,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, @@ -33371,7 +33372,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -34289,7 +34290,7 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Transferring Control"; req_access_txt = "63" }, @@ -34354,7 +34355,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, @@ -34463,7 +34464,7 @@ /area/security/main) "btw" = ( /obj/effect/landmark/secequipment, -/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -34714,7 +34715,7 @@ /area/engine/atmos) "btZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Desk"; req_access_txt = "24" }, @@ -35149,7 +35150,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -35781,7 +35782,7 @@ pixel_x = 32 }, /obj/effect/landmark/secequipment, -/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -36382,7 +36383,7 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Transferring Control"; req_access_txt = "63" }, @@ -39214,7 +39215,7 @@ /area/engine/break_room) "bCL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 0; name = "Power Tools Storage"; req_access_txt = "19" @@ -39252,7 +39253,7 @@ /area/engine/break_room) "bCN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 0; name = "Power Tools Storage"; req_access_txt = "19" @@ -39708,7 +39709,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 4; name = "Bridge Access"; req_access_txt = "19" @@ -39769,7 +39770,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 8; name = "Bridge Access"; req_access_txt = "19" @@ -39973,7 +39974,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 4; name = "Bridge Access"; req_access_txt = "19" @@ -40008,7 +40009,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 8; name = "Bridge Access"; req_access_txt = "19" @@ -40333,7 +40334,7 @@ /area/engine/gravity_generator) "bEp" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Gravity Generator Chamber"; req_access_txt = "19; 61" }, @@ -40825,7 +40826,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 4; name = "Bridge Access"; req_access_txt = "19" @@ -40867,7 +40868,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 8; name = "Bridge Access"; req_access_txt = "19" @@ -41055,7 +41056,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 8; name = "Bridge Access"; req_access_txt = "19" @@ -41112,7 +41113,7 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "gulagdoor"; name = "Security Transferring Center"; req_access_txt = "63" @@ -42085,7 +42086,7 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security E.V.A. Storage"; req_access_txt = "3" }, @@ -42576,7 +42577,7 @@ /area/storage/primary) "bIE" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Primary Tool Storage"; req_access_txt = "0" }, @@ -42973,12 +42974,18 @@ /turf/open/floor/plating, /area/security/brig) "bJt" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/red/side{ dir = 8 }, /area/security/brig) "bJu" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/red/side{ dir = 4 }, @@ -42990,6 +42997,9 @@ /obj/structure/cable/white{ icon_state = "2-4" }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /obj/machinery/door/window/brigdoor/security/cell/westright{ id = "brig1"; name = "Cell 1" @@ -43492,7 +43502,7 @@ /area/storage/primary) "bKw" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Primary Tool Storage"; req_access_txt = "0" }, @@ -43912,7 +43922,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Warden's Office"; req_access_txt = "3" }, @@ -44303,7 +44313,7 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "engdoor"; name = "Engineering Cell"; req_access_txt = "63" @@ -46754,6 +46764,9 @@ }, /area/security/detectives_office) "bRo" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -46765,6 +46778,9 @@ /obj/structure/cable/white{ icon_state = "2-4" }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /obj/machinery/door/window/brigdoor/security/cell/westright{ id = "brig2"; name = "Cell 2" @@ -47293,7 +47309,7 @@ /area/storage/tech) "bSt" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Primary Tool Storage"; req_access_txt = "0" }, @@ -47308,7 +47324,7 @@ /area/storage/primary) "bSu" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Primary Tool Storage"; req_access_txt = "0" }, @@ -47565,7 +47581,7 @@ /area/storage/tools) "bSU" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Auxiliary Tool Storage"; req_access_txt = "12" }, @@ -50135,7 +50151,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 4; name = "Brig"; req_access_txt = "63" @@ -50197,7 +50213,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 8; name = "Brig"; req_access_txt = "63" @@ -51412,7 +51428,7 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Warden's Office"; req_access_txt = "3" }, @@ -52151,7 +52167,7 @@ /area/hallway/primary/starboard) "cbw" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 4; name = "Brig"; req_access_txt = "63" @@ -52193,7 +52209,7 @@ /area/security/brig) "cbz" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 8; name = "Brig"; req_access_txt = "63" @@ -53420,7 +53436,7 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Power Monitoring"; req_access_txt = "32" }, @@ -54035,6 +54051,9 @@ }, /area/security/brig) "cfd" = ( +/obj/machinery/computer/secure_data{ + dir = 8 + }, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -54105,7 +54124,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Gear Room"; req_access_txt = "63" }, @@ -54902,15 +54921,15 @@ /turf/open/floor/wood, /area/lawoffice) "cgP" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/structure/table/reinforced, /obj/machinery/newscaster/security_unit{ pixel_x = -32 }, -/obj/machinery/computer/secure_data{ - dir = 4 - }, -/obj/structure/cable/white{ - icon_state = "1-4" - }, +/obj/item/clipboard, +/obj/item/toy/figure/secofficer, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -54919,21 +54938,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, /turf/open/floor/plasteel/neutral, /area/security/brig) "cgR" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/structure/filingcabinet/chestdrawer, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/cable/white{ - icon_state = "1-4" - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, /turf/open/floor/plasteel/red/side{ dir = 4 }, @@ -54942,16 +54956,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/cable/white{ - icon_state = "4-8" +/turf/open/floor/plasteel/red/corner{ + dir = 1 }, -/turf/open/floor/plasteel, /area/security/brig) "cgT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable/white{ - icon_state = "4-8" + icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/security/brig) "cgU" = ( @@ -55744,6 +55757,9 @@ /turf/open/floor/wood, /area/lawoffice) "ciz" = ( +/obj/structure/cable/white{ + icon_state = "1-4" + }, /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/machinery/light/small{ @@ -55758,6 +55774,9 @@ }, /area/security/brig) "ciA" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, /obj/structure/sign/nanotrasen{ pixel_y = -32 }, @@ -55769,38 +55788,57 @@ dir = 1; name = "security camera" }, -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/toy/figure/secofficer, /turf/open/floor/plasteel/red/side, /area/security/brig) "ciB" = ( +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /obj/structure/extinguisher_cabinet{ pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/filingcabinet/chestdrawer, /turf/open/floor/plasteel/red/side{ dir = 6 }, /area/security/brig) "ciC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Security Desk"; + req_access_txt = "63" + }, +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/obj/structure/cable/white{ + icon_state = "4-8" }, -/turf/closed/wall, -/area/security/brig) -"ciD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/red/side{ - dir = 10 + dir = 8 }, /area/security/brig) +"ciD" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/red/corner, +/area/security/brig) "ciE" = ( +/obj/structure/cable/white{ + icon_state = "1-8" + }, /obj/structure/chair{ dir = 1 }, @@ -60752,7 +60790,7 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/glass_security/abandoned{ +/obj/machinery/door/airlock/security/glass/abandoned{ name = "Storage Closet"; req_access_txt = "63" }, @@ -65259,7 +65297,7 @@ /area/engine/engineering) "cCw" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engineering Storage"; req_access_txt = "32" }, @@ -66486,7 +66524,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Gateway Chamber"; req_access_txt = "62" }, @@ -70916,6 +70954,15 @@ /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/effect/turf_decal/bot, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, +/obj/machinery/requests_console{ + department = "Medbay Storage"; + name = "Medbay Storage RC"; + pixel_y = 28 + }, /turf/open/floor/plasteel, /area/medical/storage) "cNQ" = ( @@ -72877,7 +72924,7 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Xenobiology Kill Room"; req_access_txt = "47" }, @@ -73098,7 +73145,7 @@ /area/medical/medbay/central) "cSJ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5" @@ -73253,6 +73300,12 @@ pixel_x = -3; pixel_y = -3 }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -73263,7 +73316,6 @@ /area/medical/storage) "cSV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/rnd/protolathe/department/medical, /turf/open/floor/plasteel/cmo, /area/medical/storage) "cSW" = ( @@ -73281,13 +73333,15 @@ pixel_x = -3; pixel_y = -3 }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, /obj/machinery/light{ dir = 4 }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel/neutral/side{ dir = 8; heat_capacity = 1e+006 @@ -74019,7 +74073,7 @@ /area/medical/medbay/central) "cUC" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5" @@ -74128,6 +74182,12 @@ pixel_x = -3; pixel_y = -3 }, +/obj/machinery/door/window/eastleft{ + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access_txt = "5"; + req_one_access_txt = "0" + }, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -74153,11 +74213,10 @@ pixel_x = -3; pixel_y = -3 }, -/obj/machinery/requests_console{ - department = "Medbay Storage"; - departmentType = 0; - name = "Medbay Storage RC"; - pixel_x = 32 +/obj/machinery/door/window/westleft{ + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access_txt = "5" }, /turf/open/floor/plasteel/neutral/side{ dir = 8; @@ -74940,6 +74999,10 @@ /obj/machinery/status_display{ pixel_x = -32 }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -74979,6 +75042,10 @@ dir = 1; pixel_y = -24 }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel/neutral/side{ dir = 8; heat_capacity = 1e+006 @@ -75696,7 +75763,7 @@ /area/medical/medbay/central) "cXY" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage"; req_access_txt = "5" }, @@ -75716,7 +75783,7 @@ /area/medical/storage) "cXZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage"; req_access_txt = "5" }, @@ -78125,7 +78192,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Medbay Desk"; req_access_txt = "5" }, @@ -79318,7 +79385,7 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "meddoor"; name = "Medical Cell"; req_access_txt = "63" @@ -81422,7 +81489,7 @@ /area/medical/chemistry) "dkm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Chemistry Lab"; req_access_txt = "5; 33" }, @@ -83820,7 +83887,7 @@ /area/medical/genetics/cloning) "dps" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "cloningfoyer"; name = "Cloning Lab"; req_access_txt = "5" @@ -84689,7 +84756,7 @@ /area/medical/genetics/cloning) "drg" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "cloningfoyer"; name = "Cloning Lab"; req_access_txt = "5" @@ -87933,7 +88000,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Robotics Lab"; req_access_txt = "29" }, @@ -90663,7 +90730,7 @@ /area/science/research) "dDy" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Robotics Lab"; req_access_txt = "29" }, @@ -92468,7 +92535,7 @@ /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 6 }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Server Access"; req_access_txt = "30" }, @@ -95334,7 +95401,7 @@ dir = 1; pixel_y = -22 }, -/obj/machinery/vending/kink, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood{ icon_state = "wood-broken3" }, @@ -95624,7 +95691,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 0; name = "Customs Desk"; req_access_txt = "19" @@ -99371,10 +99438,10 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/landmark/lightsout, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, +/obj/effect/landmark/xmastree, /turf/open/floor/plasteel/grimy, /area/chapel/main) "dVT" = ( @@ -99501,7 +99568,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "dWk" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0" @@ -99938,7 +100005,7 @@ /area/medical/virology) "dXh" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Virology Lab"; req_access_txt = "39" }, @@ -100015,7 +100082,7 @@ /area/medical/virology) "dXn" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Virology Containment Cell"; req_access_txt = "39" }, @@ -100773,7 +100840,7 @@ /area/medical/virology) "dYZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Virology Access"; req_access_txt = "39" }, @@ -100991,7 +101058,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "dZv" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0" @@ -101401,7 +101468,7 @@ /area/medical/virology) "eaj" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Virology Containment Cell"; req_access_txt = "39" }, @@ -103292,7 +103359,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Checkpoint"; req_access_txt = "63" }, @@ -103359,7 +103426,7 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Holding Area"; req_access_txt = "2" }, @@ -103405,14 +103472,14 @@ /turf/open/floor/plating, /area/security/checkpoint/escape) "eel" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Holding Area"; req_access_txt = "2" }, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "eem" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Cockpit"; req_access_txt = "19" }, @@ -104040,7 +104107,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Holding Area"; req_access_txt = "2" }, @@ -105023,29 +105090,13 @@ /turf/open/floor/plasteel/dark, /area/library) "ehQ" = ( -/obj/machinery/vending/kink, -/turf/open/floor/plating, -/area/maintenance/port/fore) -"ehR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable/white{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ - name = "Security Desk"; - req_access_txt = "63" - }, -/turf/open/floor/plasteel/red/side{ - dir = 8 - }, -/area/security/brig) -"ehS" = ( -/obj/machinery/vending/kink, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/landmark/lightsout, +/turf/open/floor/plasteel/grimy, +/area/chapel/main) (1,1,1) = {" aaa @@ -128577,7 +128628,7 @@ cqr ctp cuQ cjd -cxC +cje cje cAK cCr @@ -129381,7 +129432,7 @@ dry dta duk dvY -ehS +dod dmi dfY aad @@ -135452,7 +135503,7 @@ alf avr awp axK -ehQ +alg aAb aBk aCv @@ -139941,7 +139992,7 @@ dKD dUp dVd dVS -dVd +ehQ dVd dVd dVd @@ -155023,20 +155074,20 @@ bAi bCa bDZ bnG +bHw +bJs +bLk bgZ -bgZ -bgZ -bgZ -bgZ -bgZ -bgZ +bHw +bJs +bLk bgZ bXB bZK cbw bgZ -bNj -ehR +bgZ +bHz ciC bgZ clx @@ -155542,7 +155593,7 @@ bJu bLm bEe bPp -bkq +bmj bTb bNj bXD diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 3480f9d6c4..61a8a9c5c2 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2,19 +2,6 @@ "aaa" = ( /turf/open/space/basic, /area/space) -"aab" = ( -/obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; - id = "syndicate_n"; - name = "north of station"; - turf_type = /turf/open/space; - width = 18 - }, -/turf/open/space, -/area/space/nearstation) "aac" = ( /obj/effect/landmark/carpspawn, /turf/open/space, @@ -311,21 +298,9 @@ }, /turf/open/floor/plasteel/floorgrime, /area/security/prison) -"aaU" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/security/prison) "aaV" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/pod_2) -"aaX" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/security/prison) "aaY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1887,14 +1862,14 @@ /turf/closed/wall, /area/security/prison) "aem" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 3"; req_access_txt = "2" }, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "aen" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 2"; req_access_txt = "2" }, @@ -1905,7 +1880,7 @@ /turf/open/floor/plasteel/floorgrime, /area/security/prison) "aeo" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 1"; req_access_txt = "2" }, @@ -1913,7 +1888,7 @@ /area/security/prison) "aep" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Sanitarium"; req_access_txt = "2" }, @@ -3189,7 +3164,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" }, @@ -3202,7 +3177,7 @@ "agM" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" }, @@ -3952,7 +3927,7 @@ /area/security/brig) "ait" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security E.V.A. Storage"; req_access_txt = "3" }, @@ -4345,7 +4320,7 @@ /area/security/brig) "ajn" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" }, @@ -4362,7 +4337,7 @@ "ajp" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" }, @@ -4648,7 +4623,9 @@ /area/engine/gravity_generator) "aka" = ( /obj/effect/turf_decal/bot_white/right, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 1 + }, /area/engine/gravity_generator) "akb" = ( /obj/structure/sign/securearea{ @@ -4658,11 +4635,15 @@ pixel_y = 32 }, /obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/engine/gravity_generator) "akc" = ( /obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 4 + }, /area/engine/gravity_generator) "akd" = ( /turf/open/space, @@ -5342,7 +5323,9 @@ /area/engine/gravity_generator) "alt" = ( /obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/engine/gravity_generator) "alu" = ( /obj/machinery/light{ @@ -5649,7 +5632,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Gear Room"; req_access_txt = "0"; req_one_access_txt = "1;4" @@ -5683,7 +5666,7 @@ /area/security/warden) "ama" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Secure Gear Storage"; req_access_txt = "3" }, @@ -5838,7 +5821,7 @@ /area/security/main) "amp" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Firing Range"; req_access_txt = "0"; req_one_access_txt = "1;4" @@ -6020,19 +6003,25 @@ dir = 10 }, /obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 4 + }, /area/engine/gravity_generator) "amK" = ( /obj/machinery/gravity_generator/main/station, /obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/engine/gravity_generator) "amL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, /obj/effect/turf_decal/bot_white/right, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/vault{ + dir = 1 + }, /area/engine/gravity_generator) "amM" = ( /obj/machinery/camera{ @@ -6172,7 +6161,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "anc" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "N2O Storage"; req_access_txt = "3" }, @@ -6809,7 +6798,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Secure Gear Storage"; req_access_txt = "3" }, @@ -7191,7 +7180,7 @@ /turf/open/floor/plating, /area/engine/gravity_generator) "apj" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Gravity Generator Area"; req_access_txt = "19; 61" }, @@ -9439,7 +9428,7 @@ /area/security/warden) "atR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Brig Control"; req_access_txt = "3" }, @@ -9454,7 +9443,7 @@ /area/security/warden) "atS" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Gear Room"; req_access_txt = "0"; req_one_access_txt = "1;4" @@ -9471,7 +9460,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "0"; req_one_access_txt = "1;4" @@ -9480,7 +9469,7 @@ /area/security/main) "atV" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "0"; req_one_access_txt = "1;4" @@ -10514,7 +10503,7 @@ /area/security/brig) "avZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Labor Camp Shuttle Airlock"; req_access_txt = "2" }, @@ -11672,6 +11661,9 @@ /turf/open/floor/plating, /area/security/brig) "ayx" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -11695,6 +11687,9 @@ /turf/open/floor/plating, /area/security/brig) "ayz" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -11708,6 +11703,9 @@ /turf/open/floor/plasteel/red/side, /area/security/brig) "ayA" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -11723,7 +11721,7 @@ "ayB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 2; id_tag = "innerbrig"; name = "Brig"; @@ -11740,7 +11738,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 2; id_tag = "innerbrig"; name = "Brig"; @@ -11923,7 +11921,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine"; req_access_txt = "10" }, @@ -12206,6 +12204,9 @@ /turf/open/floor/plasteel/floorgrime, /area/security/brig) "azE" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/floorgrime, /area/security/brig) "azF" = ( @@ -12721,7 +12722,7 @@ /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "aAD" = ( -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Mining Dock"; req_access_txt = "48" }, @@ -13015,18 +13016,15 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /turf/open/floor/plasteel/floorgrime, /area/security/brig) "aBh" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /turf/open/floor/plasteel/floorgrime, /area/security/brig) "aBi" = ( @@ -13548,7 +13546,7 @@ /area/shuttle/labor) "aCj" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Labor Camp Shuttle Airlock"; req_access_txt = "0" }, @@ -13594,7 +13592,7 @@ "aCn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 1; id_tag = "outerbrig"; name = "Brig"; @@ -13628,7 +13626,7 @@ id = "secentranceflasher"; pixel_x = 25 }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 1; id_tag = "outerbrig"; name = "Brig"; @@ -13639,8 +13637,19 @@ }, /area/security/brig) "aCq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Security Desk"; + req_access_txt = "63" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, /area/security/brig) "aCr" = ( /obj/machinery/door/airlock/security{ @@ -13928,7 +13937,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine"; req_access_txt = "10" }, @@ -14124,6 +14133,12 @@ }, /area/hallway/primary/fore) "aDz" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE"; + pixel_y = 32 + }, /obj/machinery/camera{ c_tag = "Fore Primary Hallway Cells"; dir = 2; @@ -14174,6 +14189,7 @@ /turf/open/floor/plating, /area/security/brig) "aDF" = ( +/obj/machinery/computer/secure_data, /obj/machinery/button/flasher{ id = "secentranceflasher"; name = "Brig Entrance Flash Control"; @@ -14221,13 +14237,16 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "aDG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/filingcabinet/chestdrawer{ + pixel_y = 3 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/security/brig) "aDH" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -14250,9 +14269,6 @@ pixel_x = 29; pixel_y = -2 }, -/obj/structure/filingcabinet/chestdrawer{ - pixel_y = 3 - }, /turf/open/floor/plasteel/dark, /area/security/brig) "aDI" = ( @@ -14540,7 +14556,7 @@ /area/engine/engineering) "aEm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engineering Storage"; req_access_txt = "32" }, @@ -14917,15 +14933,18 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "aEX" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /turf/open/floor/plasteel/dark, /area/security/brig) "aEY" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -14933,15 +14952,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/table, -/obj/item/folder/red{ - pixel_x = 3 - }, -/obj/item/folder/white{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/dark, /area/security/brig) "aEZ" = ( @@ -15195,7 +15205,7 @@ /area/engine/engineering) "aFz" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine"; req_access_txt = "10" }, @@ -15645,6 +15655,14 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "aGr" = ( +/obj/structure/table, +/obj/item/folder/red{ + pixel_x = 3 + }, +/obj/item/folder/white{ + pixel_x = -4; + pixel_y = 2 + }, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; dir = 1; @@ -15652,9 +15670,7 @@ network = list("Prison"); pixel_y = -30 }, -/obj/machinery/computer/secure_data{ - dir = 1 - }, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/dark, /area/security/brig) "aGs" = ( @@ -16098,10 +16114,8 @@ /area/quartermaster/storage) "aHj" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - glass = 0; +/obj/machinery/door/airlock/mining{ name = "Cargo Bay"; - opacity = 1; req_access_txt = "0"; req_one_access_txt = "48;50" }, @@ -16138,10 +16152,8 @@ /area/construction/storage/wing) "aHm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - glass = 0; +/obj/machinery/door/airlock/mining{ name = "Cargo Bay"; - opacity = 1; req_access_txt = "0"; req_one_access_txt = "48;50" }, @@ -16642,10 +16654,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/glass_mining{ - glass = 0; +/obj/machinery/door/airlock/mining{ name = "Cargo Bay"; - opacity = 1; req_access_txt = "0"; req_one_access_txt = "48;50" }, @@ -18281,7 +18291,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine"; req_access_txt = "10" }, @@ -18309,7 +18319,7 @@ /turf/open/floor/engine, /area/engine/engineering) "aMj" = ( -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ heat_proof = 1; name = "Supermatter Chamber"; req_access_txt = "10" @@ -19626,7 +19636,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; req_access_txt = "41" }, @@ -21159,7 +21169,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Power Monitoring"; req_access_txt = "32" }, @@ -22764,7 +22774,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Post - Cargo"; req_access_txt = "63" }, @@ -25069,10 +25079,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - glass = 0; +/obj/machinery/door/airlock/mining{ name = "Cargo Bay"; - opacity = 1; req_access_txt = "0"; req_one_access_txt = "48;50" }, @@ -25085,10 +25093,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - glass = 0; +/obj/machinery/door/airlock/mining{ name = "Cargo Bay"; - opacity = 1; req_access_txt = "0"; req_one_access_txt = "48;50" }, @@ -26299,7 +26305,7 @@ }, /area/security/checkpoint/engineering) "bcO" = ( -/obj/machinery/vending/kink, +/obj/structure/easel, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -27804,7 +27810,7 @@ /area/security/checkpoint/engineering) "bfW" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Engineering Security Post"; req_access_txt = "63" }, @@ -28187,7 +28193,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Mailroom"; req_access_txt = "0"; req_one_access_txt = "48;50" @@ -28261,7 +28267,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; req_access_txt = "0"; req_one_access_txt = "48;50" @@ -31327,7 +31333,7 @@ /area/hallway/primary/starboard) "bmY" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engineering Foyer"; req_access_txt = "0"; req_one_access_txt = "32;19" @@ -34375,7 +34381,7 @@ /area/crew_quarters/heads/hop) "bsS" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge"; req_access_txt = "19" }, @@ -34386,7 +34392,7 @@ "bsT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge"; req_access_txt = "19" }, @@ -34462,7 +34468,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge"; req_access_txt = "19" }, @@ -34473,7 +34479,7 @@ "btb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge"; req_access_txt = "19" }, @@ -38521,7 +38527,7 @@ name = "bridge blast door" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; req_access_txt = "19" }, @@ -38534,7 +38540,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; req_access_txt = "19" }, @@ -38629,7 +38635,7 @@ name = "bridge blast door" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; req_access_txt = "19" }, @@ -39562,7 +39568,7 @@ }, /area/engine/atmos) "bDR" = ( -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Monitoring"; req_access_txt = "24" }, @@ -40642,7 +40648,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Distribution Loop"; req_access_txt = "24" }, @@ -42472,7 +42478,7 @@ }, /obj/effect/turf_decal/bot_white/right, /turf/open/floor/plasteel/vault{ - dir = 4 + dir = 1 }, /area/gateway) "bJZ" = ( @@ -42484,7 +42490,7 @@ }, /obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/vault{ - dir = 4 + dir = 8 }, /area/gateway) "bKa" = ( @@ -43194,14 +43200,12 @@ }, /obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/vault{ - dir = 4 + dir = 8 }, /area/gateway) "bLE" = ( /obj/machinery/gateway/centerstation, -/turf/open/floor/plasteel/vault{ - dir = 4 - }, +/turf/open/floor/plasteel/dark, /area/gateway) "bLF" = ( /obj/machinery/gateway{ @@ -43209,7 +43213,7 @@ }, /obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/vault{ - dir = 4 + dir = 8 }, /area/gateway) "bLG" = ( @@ -43785,12 +43789,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) -"bMQ" = ( -/obj/structure/easel, -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXtwentythree, -/turf/open/floor/wood, -/area/library) "bMR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light{ @@ -44085,7 +44083,7 @@ }, /obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/vault{ - dir = 4 + dir = 8 }, /area/gateway) "bNr" = ( @@ -44094,7 +44092,7 @@ }, /obj/effect/turf_decal/bot_white/right, /turf/open/floor/plasteel/vault{ - dir = 4 + dir = 1 }, /area/gateway) "bNs" = ( @@ -44700,26 +44698,20 @@ /turf/open/floor/plating, /area/gateway) "bOK" = ( -/turf/open/floor/plasteel/vault{ - dir = 4 - }, +/turf/open/floor/plasteel/vault, /area/gateway) "bOL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/vault{ - dir = 4 - }, +/turf/open/floor/plasteel/vault, /area/gateway) "bOM" = ( /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 4 - }, +/turf/open/floor/plasteel/vault, /area/gateway) "bON" = ( /obj/structure/sign/securearea{ @@ -46137,9 +46129,6 @@ /obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3 }, -/obj/item/device/radio/intercom{ - pixel_y = -25 - }, /obj/item/kitchen/rollingpin, /obj/machinery/camera{ c_tag = "Kitchen"; @@ -46184,6 +46173,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -46635,7 +46625,7 @@ id = "kitchenhydro"; name = "Service Shutter" }, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Service Door"; req_access_txt = "0"; req_one_access_txt = "35;28" @@ -47304,44 +47294,35 @@ /turf/open/floor/plasteel, /area/hydroponics) "bUl" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/hydroponics) +"bUm" = ( +/obj/effect/turf_decal/stripes/line, /obj/machinery/chem_master/condimaster{ desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; name = "BrewMaster 2199"; pixel_x = -4 }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/hydroponics) -"bUm" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 29 - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/hydroponics) "bUn" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line, /obj/structure/reagent_dispensers/watertank/high, /obj/item/reagent_containers/glass/bucket, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hydroponics) "bUo" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/shovel/spade, -/obj/item/wrench, -/obj/item/reagent_containers/glass/bucket, -/obj/item/cultivator, -/obj/item/wirecutters, /obj/effect/turf_decal/stripes/line, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/hydroponics) "bUp" = ( @@ -50077,7 +50058,7 @@ /area/medical/storage) "cad" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Medbay Security Post"; req_access_txt = "63" }, @@ -50407,7 +50388,7 @@ /area/hallway/primary/central) "caJ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Hydroponics"; req_access_txt = "35" }, @@ -50762,39 +50743,6 @@ dir = 8 }, /area/engine/atmos) -"cbm" = ( -/obj/docking_port/mobile{ - callTime = 250; - dheight = 0; - dir = 2; - dwidth = 11; - height = 15; - id = "whiteship"; - launch_status = 0; - movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); - name = "NT Recovery White-Ship"; - port_direction = 8; - preferred_direction = 4; - roundstart_move = "whiteship_away"; - width = 27 - }, -/obj/machinery/door/airlock/titanium{ - name = "recovery shuttle external airlock" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 15; - id = "whiteship_home"; - name = "SS13: Auxiliary Dock, Station-Port"; - width = 27 - }, -/turf/open/floor/mineral/titanium/blue, -/area/shuttle/abandoned) "cbn" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/binary/pump{ @@ -51013,6 +50961,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, @@ -51021,6 +50972,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/medical/storage) "cbL" = ( @@ -51028,12 +50982,18 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 2 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/medical/storage) "cbM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/medical/storage) "cbN" = ( @@ -51042,6 +51002,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plasteel/white, /area/medical/storage) "cbO" = ( @@ -51762,6 +51725,13 @@ dir = 8 }, /obj/structure/closet/l3closet, +/obj/machinery/power/apc{ + dir = 2; + name = "Medbay Storage APC"; + areastring = "/area/medical/storage"; + pixel_y = -24 + }, +/obj/structure/cable/yellow, /turf/open/floor/plasteel/whiteblue/side{ dir = 10 }, @@ -51795,6 +51765,15 @@ /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, /obj/item/gun/syringe, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, @@ -52274,6 +52253,11 @@ pixel_y = -3 }, /obj/structure/table/glass, +/obj/machinery/door/window/eastleft{ + name = "First-Aid Supplies"; + req_access_txt = "5"; + req_one_access_txt = "0" + }, /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, @@ -52308,6 +52292,13 @@ pixel_y = -3 }, /obj/structure/table/glass, +/obj/machinery/door/window/westleft{ + name = "First-Aid Supplies"; + req_access_txt = "5" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/open/floor/plasteel/whiteblue/side{ dir = 4 }, @@ -52949,28 +52940,20 @@ pixel_x = -3; pixel_y = -3 }, -/obj/machinery/power/apc{ - dir = 2; - name = "Medbay Storage APC"; - areastring = "/area/medical/storage"; - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, /obj/machinery/light_switch{ pixel_x = -26 }, /obj/machinery/light/small, /obj/structure/table/glass, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/plasteel/whiteblue/side{ dir = 10 }, /area/medical/storage) "cfM" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, @@ -52979,9 +52962,6 @@ }, /area/medical/storage) "cfN" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, @@ -53017,6 +52997,10 @@ pixel_y = -3 }, /obj/structure/table/glass, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel/whiteblue/side{ dir = 6 }, @@ -53523,7 +53507,7 @@ /area/medical/sleeper) "cgU" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Medbay Storage"; req_access_txt = "5" @@ -53541,7 +53525,7 @@ "cgW" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Medbay Storage"; req_access_txt = "5" @@ -53551,7 +53535,7 @@ "cgX" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Medbay Desk"; req_access_txt = "5" @@ -53569,7 +53553,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5" @@ -53579,7 +53563,7 @@ "cha" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5" @@ -53722,7 +53706,7 @@ /area/security/checkpoint/science/research) "chq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Post - Research Division"; req_access_txt = "63" }, @@ -54231,7 +54215,7 @@ /area/medical/medbay/central) "civ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Chemistry Lab"; req_access_txt = "5; 33" @@ -54589,7 +54573,7 @@ /turf/closed/wall/r_wall, /area/engine/atmos) "cjm" = ( -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ heat_proof = 1; name = "Auxiliary Chamber"; req_access_txt = "24" @@ -56219,10 +56203,8 @@ "cmN" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/glass_medical{ - glass = 0; +/obj/machinery/door/airlock/medical{ name = "Research Break Room"; - opacity = 1; req_access_txt = "0"; req_one_access_txt = "47" }, @@ -57900,7 +57882,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Surgery Observation"; req_access_txt = "0" }, @@ -59641,10 +59623,10 @@ /turf/open/space, /area/space/nearstation) "ctn" = ( +/obj/machinery/vending/cigarette, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/vending/kink, /turf/open/floor/plating, /area/maintenance/port/aft) "cto" = ( @@ -59654,13 +59636,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"ctp" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" - }, -/turf/open/floor/plating, -/area/medical/surgery) "ctq" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -61961,7 +61936,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "CloningDoor"; name = "Cloning Lab"; req_access_txt = "5; 68" @@ -61999,7 +61974,7 @@ /area/medical/genetics/cloning) "cyc" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Genetics Lab"; req_access_txt = "5; 9; 68" }, @@ -64049,7 +64024,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Robotics Lab"; req_access_txt = "29" }, @@ -65283,7 +65258,7 @@ /area/medical/virology) "cEG" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Test Subject Cell"; req_access_txt = "39" }, @@ -65595,12 +65570,10 @@ /turf/open/floor/engine/vacuum, /area/science/mixing) "cFo" = ( -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ autoclose = 0; frequency = 1449; - glass = 1; heat_proof = 1; - icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; @@ -65618,12 +65591,10 @@ /turf/open/floor/engine, /area/science/mixing) "cFq" = ( -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ autoclose = 0; frequency = 1449; - glass = 1; heat_proof = 1; - icon_state = "door_locked"; id_tag = "tox_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; @@ -66200,7 +66171,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Containment Cells"; req_access_txt = "39" }, @@ -67267,7 +67238,7 @@ "cIq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Isolation B"; req_access_txt = "39" }, @@ -67282,7 +67253,7 @@ "cIr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Isolation A"; req_access_txt = "39" }, @@ -67574,7 +67545,7 @@ /area/science/server) "cIX" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Server Access"; req_access_txt = "30" }, @@ -68049,10 +68020,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/server) -"cJV" = ( -/obj/machinery/rnd/server, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "cJW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 1; @@ -70266,7 +70233,7 @@ /area/hallway/secondary/exit/departure_lounge) "cOv" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Departure Lounge Security Post"; req_access_txt = "63" }, @@ -72651,19 +72618,6 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, /area/science/xenobiology) -"cTX" = ( -/obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; - id = "syndicate_ne"; - name = "northeast of station"; - turf_type = /turf/open/space; - width = 18 - }, -/turf/open/space, -/area/space/nearstation) "cUH" = ( /obj/structure/table/optable, /turf/open/floor/plasteel/white, @@ -74976,7 +74930,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "cZp" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0" @@ -75136,7 +75090,7 @@ /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "cZI" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Brig"; req_access_txt = "2" }, @@ -75187,7 +75141,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "cZQ" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Cockpit"; req_access_txt = "19" }, @@ -75696,7 +75650,7 @@ /turf/open/floor/plating, /area/maintenance/port) "dbl" = ( -/obj/machinery/vending/kink, +/obj/structure/easel, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dbm" = ( @@ -75777,45 +75731,6 @@ }, /turf/open/floor/circuit/killroom, /area/science/xenobiology) -"dbB" = ( -/obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; - id = "syndicate_se"; - name = "southeast of station"; - turf_type = /turf/open/space; - width = 18 - }, -/turf/open/space, -/area/space/nearstation) -"dbC" = ( -/obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; - id = "syndicate_sw"; - name = "southwest of station"; - turf_type = /turf/open/space; - width = 18 - }, -/turf/open/space, -/area/space/nearstation) -"dbD" = ( -/obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; - id = "syndicate_s"; - name = "south of station"; - turf_type = /turf/open/space; - width = 18 - }, -/turf/open/space, -/area/space/nearstation) "dbE" = ( /obj/machinery/plantgenes, /obj/effect/turf_decal/stripes/line{ @@ -77200,7 +77115,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Laser Room"; req_access_txt = "10" }, @@ -77347,10 +77262,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"deZ" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/turf/open/floor/plating, -/area/engine/engineering) "dfa" = ( /obj/machinery/power/supermatter_shard/crystal/engine, /turf/open/floor/engine, @@ -78627,6 +78538,12 @@ /obj/structure/sign/poster/official/random{ pixel_x = 32 }, +/obj/structure/closet/crate/hydroponics, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/reagent_containers/glass/bucket, +/obj/item/cultivator, +/obj/item/wirecutters, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) "dix" = ( @@ -79262,13 +79179,6 @@ /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engine/supermatter) -"dlS" = ( -/obj/machinery/power/rad_collector/anchored, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/engine, -/area/engine/supermatter) "dlV" = ( /turf/closed/wall/r_wall, /area/maintenance/department/science/xenobiology) @@ -79902,13 +79812,6 @@ }, /turf/closed/wall/r_wall, /area/engine/atmos) -"dBD" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/security/brig) "dBF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -79927,16 +79830,12 @@ /turf/open/floor/plating, /area/security/brig) "dBH" = ( +/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ - name = "Security Desk"; - req_access_txt = "63" - }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "0-4" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plating, /area/security/brig) "dBI" = ( /obj/effect/spawner/structure/window/reinforced, @@ -79980,13 +79879,6 @@ /mob/living/carbon/monkey, /turf/open/floor/plasteel/freezer, /area/medical/virology) -"dBR" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/medical/virology) "dBS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -80088,6 +79980,9 @@ }, /area/maintenance/starboard/fore) "dCj" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/floorgrime, /area/security/brig) @@ -80598,14 +80493,14 @@ /area/shuttle/abandoned) "EDa" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_nw"; name = "northwest of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space/basic, /area/space/nearstation) @@ -80613,30 +80508,6 @@ /obj/structure/grille, /turf/open/floor/plating/airless, /area/space/nearstation) -"EDc" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"EDd" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"EDe" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"EDf" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"EDg" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"EDh" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) "EDi" = ( /obj/docking_port/mobile{ callTime = 250; @@ -80698,72 +80569,21 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) -"EDn" = ( -/obj/machinery/porta_turret/aux_base{ - always_up = 1; - desc = "A turret built with substandard parts and run down further with age. Still capable of delivering lethal lasers to the odd space carp, but not much else."; - dir = 4; - has_cover = 0; - icon_state = "standard_lethal"; - lethal_projectile = /obj/item/projectile/beam/weak; - name = "turret" - }, -/turf/closed/wall/mineral/titanium, -/area/shuttle/abandoned) "EDo" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engine/atmos) -"EDp" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/atmos) -"EDq" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/atmos) -"EDr" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/atmos) -"EDs" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/atmos) -"EDt" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/atmos) -"EDu" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engine/atmos) -"EDv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/rnd/protolathe/department/engineering, -/turf/open/floor/plasteel, -/area/engine/engineering) "EDw" = ( /obj/machinery/rnd/protolathe/department/service, +/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/hydroponics) "EDx" = ( /turf/closed/wall/mineral/plastitanium, /area/hallway/secondary/entry) -"EDy" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/hallway/secondary/entry) "EDz" = ( /turf/closed/wall/mineral/plastitanium, /area/security/prison) -"EDA" = ( -/turf/closed/wall/mineral/plastitanium, -/area/security/prison) "EDB" = ( /turf/closed/wall/mineral/plastitanium, /area/crew_quarters/fitness/recreation) @@ -80806,6 +80626,10 @@ /obj/machinery/droneDispenser, /turf/open/floor/plating, /area/maintenance/aft) +"Ljw" = ( +/obj/structure/sign/poster/official/random, +/turf/closed/wall, +/area/hydroponics) (1,1,1) = {" aaa @@ -105574,7 +105398,7 @@ awZ ayw azD aAY -ajm +aCk aDw aDC aGb @@ -105831,8 +105655,8 @@ axa ayx azE azE -ajm -aDw +aCl +aDx aEK aGc aHx @@ -106088,7 +105912,7 @@ axb ayy azF aAZ -ajm +aCm aDw aEL aGd @@ -106346,7 +106170,7 @@ ahx ahx ahx ajm -aDw +aDy aEM aGe aHx @@ -106602,7 +106426,7 @@ axd ayw azG aAY -ajm +aCk aDw aEN aGf @@ -106859,8 +106683,8 @@ axe ayz dCj azE -ajm -aDw +aCl +aDx dCo aGg aHx @@ -107116,7 +106940,7 @@ axb ayy azF aBa -ajm +aCm aDw aEO aGh @@ -107630,7 +107454,7 @@ axd ayw azH aAY -ajm +aCk aDw aEO aGg @@ -107887,8 +107711,8 @@ axa ayA azE azE -ajm -aDw +aCl +aDx aEQ aGj aHz @@ -108144,7 +107968,7 @@ axg ayy azF aBb -ajm +aCm aDw aEN aGk @@ -109686,7 +109510,7 @@ axm aiq azL aBf -ahx +ajm aDF aEW aGq @@ -114870,7 +114694,7 @@ bNA bOU bQD bRS -EDw +Ljw bUi bVu bWO @@ -115898,7 +115722,7 @@ bNC bOW bQH bRV -bST +EDw bUl bVx bWS diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index bbf998aaba..0484f38648 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -111,6 +111,7 @@ /obj/item/pickaxe, /obj/item/device/flashlight, /obj/item/clothing/glasses/meson, +/obj/item/device/mining_scanner, /turf/open/floor/plasteel, /area/mine/laborcamp) "av" = ( @@ -119,6 +120,7 @@ /obj/item/device/flashlight, /obj/item/pickaxe, /obj/item/clothing/glasses/meson, +/obj/item/device/mining_scanner, /turf/open/floor/plasteel, /area/mine/laborcamp) "aw" = ( @@ -144,7 +146,7 @@ /turf/open/floor/plasteel, /area/mine/laborcamp) "aB" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Infirmary"; req_access_txt = "0" @@ -286,7 +288,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/explored) "aY" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 4; name = "Labor Camp Shuttle Security Airlock"; req_access_txt = "2" @@ -450,7 +452,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/mine/eva) "bx" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 4; name = "Labor Camp Shuttle Prisoner Airlock"; req_access_txt = "0" @@ -470,7 +472,7 @@ /turf/open/floor/plasteel, /area/mine/laborcamp) "bA" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Labor Camp Backroom"; req_access_txt = "2" }, @@ -557,7 +559,7 @@ /turf/open/floor/plasteel/purple/corner, /area/mine/eva) "bL" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Labor Camp Monitoring"; req_access_txt = "2" }, @@ -617,7 +619,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Mining Station EVA"; req_access_txt = "54" }, @@ -1371,7 +1373,7 @@ /turf/open/floor/plating, /area/mine/living_quarters) "dR" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Infirmary"; req_access_txt = "0" @@ -1511,7 +1513,7 @@ /turf/open/floor/plasteel/purple/corner, /area/mine/living_quarters) "el" = ( -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Processing Area"; req_access_txt = "48" }, @@ -1614,7 +1616,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Mining Station Bridge"; req_access_txt = "48" }, @@ -1647,7 +1649,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Mining Station Bridge"; req_access_txt = "48" }, @@ -1689,7 +1691,7 @@ }, /area/mine/production) "eF" = ( -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Processing Area"; req_access_txt = "48" }, @@ -3328,7 +3330,7 @@ /turf/open/floor/plasteel, /area/mine/laborcamp) "WB" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 8; name = "Labor Camp Shuttle Security Airlock"; req_access_txt = "2" @@ -3336,7 +3338,7 @@ /turf/open/floor/plasteel, /area/mine/laborcamp) "WC" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 8; name = "Labor Camp Shuttle Prisoner Airlock"; req_access_txt = "0" @@ -21563,7 +21565,7 @@ am am am am -ao +ai ab ab ab @@ -22070,7 +22072,7 @@ am am am am -ao +ai ab ab ai @@ -22854,7 +22856,7 @@ ab ab ab ab -ao +ai ab ab ab @@ -24644,7 +24646,7 @@ am am am am -ao +ai ab ab ab @@ -24901,7 +24903,7 @@ am am am am -ao +ai ab ab ab @@ -25178,7 +25180,7 @@ ab ab ab ab -ao +ai am am ai @@ -25422,7 +25424,7 @@ ab ab ab ai -ao +ai ab ab ab @@ -25672,7 +25674,7 @@ am am am am -ao +ai ab ab ab @@ -25956,7 +25958,7 @@ am am am am -ao +ai ab ab ab @@ -26199,7 +26201,7 @@ ab ab ab ab -ao +ai am am am @@ -26213,7 +26215,7 @@ am am am am -ao +ai ab ab ab @@ -26972,7 +26974,7 @@ ab ab ab ab -ao +ai am am am @@ -28511,7 +28513,7 @@ ab ab ab ai -ao +ai ab ab ab @@ -29021,7 +29023,7 @@ ab ab ab ab -ao +ai ab ab ai @@ -29030,13 +29032,13 @@ am am am am -ao +ai ab ab ab ab -ao -ao +ai +ai ab ab ab @@ -29278,8 +29280,8 @@ ab ab ab ab -ao -ao +ai +ai ab ai am @@ -30060,8 +30062,8 @@ ab ab ab ab -ao -ao +ai +ai ab ab ab @@ -30573,7 +30575,7 @@ ai ai ab ab -ao +ai am am am diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 787c2a72e2..1a71c5e30a 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -486,8 +486,8 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/bridge) "aaY" = ( @@ -497,8 +497,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/bridge) "aaZ" = ( @@ -518,8 +518,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/bridge) "aba" = ( @@ -527,8 +527,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/bridge) "abc" = ( @@ -541,7 +541,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 5 }, /area/bridge) @@ -573,8 +573,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/bridge) "abf" = ( @@ -590,8 +590,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/bridge) "abg" = ( @@ -602,8 +602,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/bridge) "abh" = ( @@ -619,8 +619,8 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/bridge) "abi" = ( @@ -636,7 +636,7 @@ }) "abk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 0; name = "Bridge Access"; req_access_txt = "19" @@ -661,7 +661,7 @@ /area/bridge) "abl" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 0; name = "Bridge Access"; req_access_txt = "19" @@ -691,8 +691,8 @@ }, /area/bridge) "abo" = ( -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "abp" = ( @@ -705,7 +705,7 @@ /area/bridge) "abq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 0; name = "Bridge Access"; req_access_txt = "19" @@ -721,7 +721,7 @@ /area/bridge) "abr" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 0; name = "Bridge Access"; req_access_txt = "19" @@ -777,7 +777,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/bridge) @@ -786,8 +786,8 @@ /obj/machinery/light_switch{ pixel_x = 24 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "abA" = ( @@ -804,8 +804,8 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "abC" = ( @@ -825,7 +825,9 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/bridge) "abE" = ( /obj/structure/cable/white{ @@ -865,7 +867,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/bridge) @@ -874,7 +876,7 @@ /obj/machinery/light_switch{ pixel_x = -24 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/bridge) @@ -886,8 +888,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "abJ" = ( @@ -914,20 +916,19 @@ /area/crew_quarters/heads/hop) "abL" = ( /obj/structure/rack, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" }, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "abM" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "abN" = ( @@ -935,12 +936,11 @@ /turf/closed/wall, /area/hallway/primary/central) "abO" = ( -/obj/structure/closet/emcloset/anchored, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/space_heater, +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plasteel, /area/hallway/primary/central) "abP" = ( @@ -959,7 +959,6 @@ name = "Asteroid" }) "abS" = ( -/obj/effect/decal/cleanable/dirt, /obj/item/ore/glass, /turf/open/floor/plating/astplate, /area/ruin/unpowered{ @@ -994,7 +993,6 @@ /turf/open/floor/plasteel/white, /area/security/detectives_office) "abW" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, /obj/machinery/light/small{ dir = 1 @@ -1091,14 +1089,18 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/bridge) "ace" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/bridge) "acf" = ( /obj/structure/cable/white{ @@ -1115,8 +1117,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "ach" = ( @@ -1157,7 +1159,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/bridge) @@ -1165,14 +1167,18 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/bridge) "acn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/bridge) "aco" = ( /obj/structure/table/wood, @@ -1193,8 +1199,8 @@ dir = 2; name = "command camera" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/crew_quarters/heads/hop) "acp" = ( @@ -1256,11 +1262,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard/fore) "acv" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -1268,7 +1272,26 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "acw" = ( -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"acx" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/landmark/xeno_spawn, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"acy" = ( /obj/machinery/door/airlock/external{ name = "External Airlock"; req_access_txt = "13" @@ -1276,31 +1299,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"acx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/landmark/xeno_spawn, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"acy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/external{ - name = "External Airlock"; - req_access_txt = "13" - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -1310,7 +1311,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "acz" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -1342,10 +1342,11 @@ name = "Asteroid" }) "acE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, /area/ruin/unpowered{ name = "Asteroid" }) @@ -1356,7 +1357,6 @@ }) "acG" = ( /obj/structure/door_assembly/door_assembly_mhatch, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -1369,7 +1369,6 @@ }) "acH" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/unpowered{ name = "Asteroid" @@ -1426,10 +1425,7 @@ /area/security/detectives_office) "acN" = ( /obj/effect/landmark/blobstart, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/fore) "acO" = ( /obj/structure/mirror{ @@ -1498,8 +1494,8 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/bridge) "acV" = ( @@ -1507,8 +1503,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "acW" = ( @@ -1541,8 +1537,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/bridge) "acY" = ( @@ -1644,8 +1640,8 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/bridge) "adf" = ( @@ -1658,8 +1654,8 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "adg" = ( @@ -1672,8 +1668,8 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/crew_quarters/heads/hop) "adh" = ( @@ -1739,7 +1735,7 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hop) "adm" = ( -/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "0-2" @@ -1750,9 +1746,9 @@ areastring = "/area/maintenance/starboard/fore"; pixel_x = 26 }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 8; - heat_capacity = 1e+006 +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" }, /area/maintenance/starboard/fore) "adn" = ( @@ -1798,7 +1794,6 @@ /turf/open/floor/plasteel, /area/shuttle/supply) "adv" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate{ icon_state = "crateopen"; opened = 1 @@ -1809,17 +1804,18 @@ name = "Asteroid" }) "adw" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/ruin/unpowered{ name = "Asteroid" }) "adx" = ( -/obj/effect/decal/cleanable/dirt, /obj/item/clothing/suit/space/orange, /obj/item/clothing/head/helmet/space/orange, /obj/effect/landmark/revenantspawn, -/turf/open/floor/plasteel/neutral, +/turf/open/floor/plating, /area/ruin/unpowered{ name = "Asteroid" }) @@ -1879,10 +1875,12 @@ /turf/open/floor/plasteel/white, /area/security/detectives_office) "adF" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/landmark/xeno_spawn, -/turf/open/floor/plating, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, /area/maintenance/fore) "adG" = ( /obj/structure/toilet{ @@ -1940,6 +1938,7 @@ dir = 1 }, /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken" }, /area/crew_quarters/heads/captain/private) @@ -1985,8 +1984,8 @@ name = "Station Intercom"; pixel_x = 28 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "adO" = ( @@ -2027,8 +2026,8 @@ /obj/structure/sign/nanotrasen{ pixel_x = -32 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/bridge) "adT" = ( @@ -2038,8 +2037,8 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "adU" = ( @@ -2111,7 +2110,6 @@ /obj/structure/sign/nanotrasen{ pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -2159,7 +2157,6 @@ dir = 8; id = "cargounload" }, -/obj/effect/decal/cleanable/dirt, /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; @@ -2234,20 +2231,20 @@ /turf/open/floor/plasteel, /area/shuttle/supply) "ael" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" }, -/turf/open/floor/plasteel/neutral/side{ - dir = 10 - }, +/turf/open/floor/plating, /area/ruin/unpowered{ name = "Asteroid" }) "aem" = ( -/turf/open/floor/plasteel/neutral/side, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, /area/ruin/unpowered{ name = "Asteroid" }) @@ -2270,9 +2267,10 @@ name = "Asteroid" }) "aep" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/neutral/corner{ - dir = 4 +/turf/open/floor/plating, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" }, /area/ruin/unpowered{ name = "Asteroid" @@ -2306,11 +2304,7 @@ /turf/open/floor/plating, /area/security/detectives_office) "aet" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/power/apc{ dir = 8; name = "Fore Maintenace APC"; @@ -2321,7 +2315,10 @@ /obj/structure/cable/white{ icon_state = "0-2" }, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, /area/maintenance/fore) "aeu" = ( /obj/structure/sign/nanotrasen, @@ -2365,8 +2362,8 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "aez" = ( @@ -2384,14 +2381,21 @@ /obj/structure/sign/nanotrasen{ pixel_x = -32 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/ai_monitored/turret_protected/ai) "aeA" = ( /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault, /area/ai_monitored/turret_protected/ai) "aeB" = ( @@ -2406,6 +2410,9 @@ pixel_x = 4; pixel_y = 33 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/vault{ dir = 6 }, @@ -2453,9 +2460,6 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/obj/machinery/ai_slipper{ - uses = 10 - }, /obj/machinery/requests_console{ department = "AI"; departmentType = 5; @@ -2463,6 +2467,7 @@ pixel_x = 30; pixel_y = 30 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "aeD" = ( @@ -2476,6 +2481,9 @@ /obj/structure/cable/white{ icon_state = "4-8" }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/vault{ dir = 10 }, @@ -2487,6 +2495,10 @@ /obj/structure/cable/white{ icon_state = "2-8" }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault, /area/ai_monitored/turret_protected/ai) "aeF" = ( @@ -2504,7 +2516,10 @@ pixel_x = -3; pixel_y = -3 }, -/turf/open/floor/plasteel/vault{ +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/ai_monitored/turret_protected/ai) @@ -2516,8 +2531,8 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/bridge) "aeH" = ( @@ -2527,8 +2542,8 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "aeI" = ( @@ -2545,9 +2560,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/bed/dogbed/ian, /mob/living/simple_animal/pet/dog/corgi/Ian, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, +/turf/open/floor/plasteel/vault/side, /area/crew_quarters/heads/hop) "aeK" = ( /obj/structure/cable/white{ @@ -2557,25 +2570,19 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, +/turf/open/floor/plasteel/vault/side, /area/crew_quarters/heads/hop) "aeL" = ( /obj/machinery/photocopier, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, +/turf/open/floor/plasteel/vault/side, /area/crew_quarters/heads/hop) "aeM" = ( /obj/structure/filingcabinet/security, /obj/item/folder/documents, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, +/turf/open/floor/plasteel/vault/side, /area/crew_quarters/heads/hop) "aeN" = ( /obj/structure/table/wood, @@ -2593,9 +2600,7 @@ areastring = "/area/crew_quarters/heads/hop"; pixel_y = 25 }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, +/turf/open/floor/plasteel/vault/side, /area/crew_quarters/heads/hop) "aeO" = ( /obj/structure/table/wood, @@ -2612,7 +2617,7 @@ pixel_x = 28; pixel_y = 24 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/corner{ dir = 8 }, /area/crew_quarters/heads/hop) @@ -2622,7 +2627,6 @@ pixel_x = -32; supply_display = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -2647,7 +2651,6 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "aeU" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/brown{ dir = 4 }, @@ -2672,8 +2675,6 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "aeX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -2685,7 +2686,6 @@ name = "Supply Shuttle Airlock"; req_access_txt = "31" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/shuttle/supply) "afa" = ( @@ -2696,15 +2696,13 @@ /area/shuttle/supply) "afb" = ( /obj/structure/door_assembly/door_assembly_mhatch, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/ruin/unpowered{ name = "Asteroid" }) @@ -2720,8 +2718,8 @@ /obj/structure/table/wood, /obj/item/device/taperecorder, /obj/item/restraints/handcuffs, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/security/detectives_office) "afe" = ( @@ -2778,16 +2776,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/fore) "afj" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/delivery, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/fore) "afk" = ( /obj/structure/extinguisher_cabinet{ @@ -2795,7 +2791,9 @@ }, /obj/machinery/suit_storage_unit/captain, /obj/effect/turf_decal/stripes/end, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/crew_quarters/heads/captain/private) "afl" = ( /obj/item/twohanded/required/kirbyplants{ @@ -2839,6 +2837,7 @@ dir = 8 }, /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken2" }, /area/crew_quarters/heads/captain/private) @@ -2846,7 +2845,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; pixel_x = 24 }, /obj/machinery/camera{ @@ -2854,8 +2852,8 @@ dir = 8; name = "command camera" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "afq" = ( @@ -2882,8 +2880,11 @@ network = list("Sat"); start_active = 1 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/ai_monitored/turret_protected/ai) "afr" = ( @@ -2909,7 +2910,10 @@ pixel_x = -3; pixel_y = -3 }, -/turf/open/floor/plasteel/vault{ +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/ai_monitored/turret_protected/ai) @@ -2926,8 +2930,8 @@ dir = 4; name = "command camera" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/bridge) "afu" = ( @@ -2941,8 +2945,8 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "afv" = ( @@ -2979,9 +2983,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, +/turf/open/floor/wood, /area/crew_quarters/heads/hop) "afx" = ( /obj/structure/cable/white{ @@ -2994,8 +2996,9 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken" }, /area/crew_quarters/heads/hop) "afy" = ( @@ -3009,9 +3012,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, +/turf/open/floor/wood, /area/crew_quarters/heads/hop) "afz" = ( /obj/structure/cable/white{ @@ -3028,9 +3029,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, +/turf/open/floor/wood, /area/crew_quarters/heads/hop) "afA" = ( /obj/machinery/computer/secure_data{ @@ -3044,7 +3043,7 @@ dir = 8; name = "command camera" }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/crew_quarters/heads/hop) @@ -3066,7 +3065,6 @@ }, /area/quartermaster/storage) "afD" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/neutral, /area/quartermaster/storage) @@ -3082,7 +3080,6 @@ /turf/open/floor/plasteel/neutral, /area/quartermaster/storage) "afH" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/conveyor_switch{ id = "cargounload" }, @@ -3141,7 +3138,6 @@ name = "Asteroid" }) "afM" = ( -/obj/effect/decal/cleanable/dirt, /obj/item/ore/iron, /obj/structure/barricade/wooden, /turf/open/floor/plating/astplate, @@ -3149,8 +3145,6 @@ name = "Asteroid" }) "afN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/astplate, /area/ruin/unpowered{ @@ -3172,8 +3166,8 @@ name = "Station Intercom"; pixel_x = -26 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/security/detectives_office) "afQ" = ( @@ -3223,14 +3217,12 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/delivery, /obj/effect/landmark/event_spawn, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/fore) "afW" = ( /obj/machinery/door/firedoor, @@ -3255,7 +3247,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/crew_quarters/heads/captain/private) "afY" = ( /obj/machinery/requests_console{ @@ -3321,16 +3315,16 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/bridge) "agf" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "agg" = ( @@ -3357,9 +3351,12 @@ }, /obj/item/clothing/neck/stethoscope, /obj/item/stack/sheet/mineral/diamond, -/obj/item/gun/ballistic/automatic/pistol/deagle, -/turf/open/floor/plasteel/vault{ - dir = 5 +/obj/item/areaeditor/blueprints, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/ai_monitored/turret_protected/ai) "agh" = ( @@ -3369,7 +3366,6 @@ }, /area/ai_monitored/turret_protected/ai) "agi" = ( -/obj/machinery/doomsday_device, /obj/structure/cable/white{ icon_state = "0-2" }, @@ -3380,6 +3376,7 @@ areastring = "/area/ai_monitored/turret_protected/ai"; pixel_y = 24 }, +/obj/machinery/nuclearbomb/selfdestruct, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "agj" = ( @@ -3396,14 +3393,17 @@ /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/ai_monitored/turret_protected/ai) "agl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/bridge) "agm" = ( @@ -3434,25 +3434,19 @@ /obj/item/stack/packageWrap, /obj/item/book/manual/wiki/security_space_law, /obj/item/hand_labeler, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, +/turf/open/floor/wood, /area/crew_quarters/heads/hop) "agp" = ( /obj/machinery/pdapainter, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, +/turf/open/floor/wood, /area/crew_quarters/heads/hop) "agq" = ( /obj/machinery/vending/cart, /obj/machinery/light, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, +/turf/open/floor/wood, /area/crew_quarters/heads/hop) "agr" = ( /obj/structure/table/wood, @@ -3466,8 +3460,9 @@ c_tag = "Head of Personnel's Office"; dir = 1 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken5" }, /area/crew_quarters/heads/hop) "ags" = ( @@ -3477,8 +3472,9 @@ pixel_y = -42 }, /obj/effect/landmark/start/head_of_personnel, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken6" }, /area/crew_quarters/heads/hop) "agt" = ( @@ -3506,26 +3502,24 @@ pixel_y = -24; req_access_txt = "57" }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/crew_quarters/heads/hop) "agu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 8; - heat_capacity = 1e+006 +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" }, /area/maintenance/starboard/fore) "agv" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/brown{ dir = 8 }, @@ -3578,7 +3572,6 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "agC" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 }, @@ -3604,7 +3597,6 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/supply) "agE" = ( -/obj/effect/decal/cleanable/dirt, /obj/item/ore/silver, /obj/item/ore/iron, /turf/open/floor/plating/astplate, @@ -3615,7 +3607,6 @@ /turf/closed/wall/r_wall, /area/security/brig) "agG" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, /area/ruin/unpowered{ @@ -3644,8 +3635,8 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/security/detectives_office) "agJ" = ( @@ -3688,13 +3679,15 @@ /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "agN" = ( +/turf/open/floor/plating, /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" + }, /area/maintenance/fore) "agO" = ( /obj/machinery/light{ @@ -3711,7 +3704,9 @@ icon_state = "0-4" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/crew_quarters/heads/captain/private) "agP" = ( /obj/structure/cable/white{ @@ -3811,8 +3806,8 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/bridge) "agW" = ( @@ -3820,8 +3815,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "agX" = ( @@ -3831,8 +3826,11 @@ name = "Station Intercom"; pixel_x = -26 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/ai_monitored/turret_protected/ai) "agY" = ( @@ -3864,6 +3862,7 @@ icon_state = "2-4" }, /obj/effect/landmark/start/cyborg, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -3900,7 +3899,10 @@ network = list("Sat"); start_active = 1 }, -/turf/open/floor/plasteel/vault{ +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/ai_monitored/turret_protected/ai) @@ -3908,8 +3910,8 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/bridge) "ahf" = ( @@ -3920,8 +3922,8 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "ahg" = ( @@ -3959,12 +3961,14 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "ahj" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/neutral/corner, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, /area/maintenance/starboard/fore) "ahk" = ( /obj/machinery/firealarm{ @@ -3975,7 +3979,6 @@ pixel_x = -24; pixel_y = -24 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -3999,8 +4002,6 @@ dir = 4; id = "cargoload" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -4013,7 +4014,6 @@ dir = 4; id = "cargoload" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -4028,7 +4028,6 @@ dir = 4; id = "cargoload" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -4042,7 +4041,6 @@ dir = 4; id = "cargoload" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor{ id = "cargoload"; name = "supply dock loading door" @@ -4061,7 +4059,6 @@ id = "cargoload" }, /obj/structure/plasticflaps, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -4094,14 +4091,13 @@ /obj/structure/sign/nanotrasen{ pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/security/brig) "ahw" = ( /obj/structure/reagent_dispensers/peppertank{ @@ -4111,7 +4107,7 @@ dir = 10 }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/security/brig) "ahx" = ( /obj/machinery/ai_status_display{ @@ -4124,7 +4120,7 @@ dir = 6 }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/security/brig) "ahy" = ( /obj/machinery/suit_storage_unit/security, @@ -4138,10 +4134,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/security/brig) "ahz" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -4155,8 +4150,6 @@ /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -4173,7 +4166,9 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/security/detectives_office) "ahC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -4236,10 +4231,8 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/fore) "ahH" = ( /obj/structure/sign/securearea{ @@ -4249,7 +4242,10 @@ /obj/effect/turf_decal/stripes/end{ dir = 1 }, -/turf/open/floor/plasteel, +/obj/item/gun/energy/e_gun/hos, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/crew_quarters/heads/captain/private) "ahI" = ( /obj/machinery/computer/communications{ @@ -4318,15 +4314,18 @@ pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "ahP" = ( /obj/structure/table/reinforced, /obj/item/aiModule/supplied/freeform, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/ai_monitored/turret_protected/ai) "ahQ" = ( @@ -4366,7 +4365,10 @@ lootdoubles = 0; lootcount = 3 }, -/turf/open/floor/plasteel/vault{ +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/ai_monitored/turret_protected/ai) @@ -4385,8 +4387,8 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/bridge) "ahY" = ( @@ -4425,7 +4427,6 @@ req_access_txt = "0"; req_one_access_txt = "48;50" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -4439,7 +4440,6 @@ dir = 1; id = "cargoload" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/plasticflaps, /obj/effect/turf_decal/stripes/line{ @@ -4456,7 +4456,6 @@ /turf/open/floor/plating, /area/quartermaster/storage) "aig" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -4478,7 +4477,6 @@ /turf/open/floor/plasteel, /area/shuttle/supply) "aik" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden, /turf/open/floor/plating/astplate, /area/ruin/unpowered{ @@ -4511,8 +4509,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/darkred/corner{ + dir = 1 }, /area/security/brig) "ain" = ( @@ -4527,6 +4526,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/brig) "aio" = ( @@ -4556,8 +4558,9 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/darkred/corner{ + dir = 4 }, /area/security/brig) "aip" = ( @@ -4576,7 +4579,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security E.V.A. Storage"; req_access_txt = "63" }, @@ -4597,7 +4600,7 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security E.V.A. Storage"; req_access_txt = "63" }, @@ -4670,11 +4673,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/fore) "aiy" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 0; name = "Bridge Access"; req_access_txt = "19" @@ -4734,7 +4737,7 @@ /area/ai_monitored/turret_protected/ai) "aiC" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 0; name = "Bridge Access"; req_access_txt = "19" @@ -4795,7 +4798,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard/fore) "aiI" = ( /obj/structure/filingcabinet/filingcabinet, @@ -4808,7 +4811,6 @@ }, /area/quartermaster/storage) "aiJ" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/brown{ dir = 1 }, @@ -4820,7 +4822,6 @@ }, /area/quartermaster/storage) "aiL" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/conveyor_switch{ id = "cargoload" }, @@ -4836,7 +4837,6 @@ dir = 1; id = "cargoload" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/end, /turf/open/floor/plating, @@ -4885,8 +4885,9 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/darkred/corner{ + dir = 1 }, /area/security/brig) "aiS" = ( @@ -4894,6 +4895,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/brig) "aiT" = ( @@ -4902,8 +4906,9 @@ /obj/item/clothing/suit/armor/laserproof, /obj/item/gun/energy/temperature/security, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/darkred/corner{ + dir = 4 }, /area/security/brig) "aiU" = ( @@ -5336,11 +5341,9 @@ }, /area/hallway/primary/central) "ajH" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/plasticflaps{ opacity = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -5357,7 +5360,6 @@ }, /area/quartermaster/storage) "ajK" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -5406,7 +5408,6 @@ /turf/open/floor/plating/airless, /area/shuttle/supply) "ajQ" = ( -/obj/effect/decal/cleanable/dirt, /obj/item/ore/iron, /turf/open/floor/plating/astplate, /area/ruin/unpowered{ @@ -5427,8 +5428,9 @@ name = "Station Intercom"; pixel_x = -26 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/darkred/corner{ + dir = 1 }, /area/security/brig) "ajS" = ( @@ -5439,6 +5441,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/brig) "ajT" = ( @@ -5474,8 +5479,9 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/darkred/corner{ + dir = 4 }, /area/security/brig) "ajU" = ( @@ -6224,7 +6230,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "alf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -6410,7 +6416,6 @@ id = "evashutters"; name = "E.V.A. Storage Shutters" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -6464,7 +6469,6 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "alC" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, @@ -6500,8 +6504,6 @@ }, /area/quartermaster/storage) "alG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/effect/landmark/revenantspawn, /turf/open/floor/plating, @@ -6558,7 +6560,7 @@ /area/security/brig) "alK" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, @@ -6670,7 +6672,6 @@ }, /area/hallway/primary/central) "alT" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/storage/firstaid/regular, /obj/structure/extinguisher_cabinet{ @@ -6680,14 +6681,12 @@ pixel_y = 32 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "alU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "alV" = ( /obj/structure/urinal{ @@ -6697,26 +6696,23 @@ dir = 1 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "alW" = ( /obj/structure/urinal{ pixel_y = 28 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "alX" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/bin, /obj/machinery/light_switch{ pixel_y = 24 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "alY" = ( /obj/machinery/shieldwallgen, -/obj/effect/decal/cleanable/dirt, /obj/machinery/button/door{ id = "teleportershutters"; name = "Teleporter Shutters"; @@ -6724,10 +6720,11 @@ req_access_txt = "19" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/teleporter) "alZ" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, @@ -6764,7 +6761,9 @@ c_tag = "Teleporter" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/teleporter) "amd" = ( /obj/structure/cable/white{ @@ -6789,7 +6788,9 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 5 + }, /area/hallway/primary/central) "amg" = ( /turf/open/floor/plasteel/neutral/corner{ @@ -6826,7 +6827,9 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 9 + }, /area/hallway/primary/central) "amm" = ( /obj/structure/cable/white{ @@ -6852,12 +6855,11 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/ai_monitored/storage/eva) "amp" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-8" }, @@ -6892,14 +6894,13 @@ /obj/item/storage/toolbox/mechanical, /obj/item/stack/cable_coil/white, /obj/item/device/multitool, -/obj/effect/decal/cleanable/dirt, /obj/machinery/button/door{ id = "evashutters"; name = "E.V.A. Shutters"; pixel_x = 26; req_access_txt = "19" }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/ai_monitored/storage/eva) @@ -6999,7 +7000,6 @@ /turf/open/floor/plating, /area/shuttle/mining) "amG" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, @@ -7113,7 +7113,7 @@ pixel_x = -12 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "amP" = ( /obj/machinery/firealarm{ @@ -7124,11 +7124,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plasteel/neutral/side, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "amQ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/neutral/side, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "amR" = ( /obj/machinery/airalarm{ @@ -7136,16 +7135,15 @@ pixel_y = -22 }, /obj/machinery/light/small, -/turf/open/floor/plasteel/neutral/side, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "amS" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Locker Room Toilets"; dir = 8; network = list("SS13") }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "amT" = ( /obj/structure/table/reinforced, @@ -7161,8 +7159,8 @@ dir = 4; name = "command camera" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/teleporter) "amU" = ( @@ -7193,7 +7191,7 @@ /area/teleporter) "amX" = ( /obj/machinery/teleport/hub, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/teleporter) @@ -7202,7 +7200,7 @@ /turf/closed/wall/r_wall, /area/teleporter) "amZ" = ( -/obj/machinery/vending/snack, +/obj/machinery/vending/snack/random, /obj/structure/sign/nanotrasen{ pixel_y = -32 }, @@ -7210,7 +7208,9 @@ icon_state = "1-8" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/hallway/primary/central) "ana" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -7238,7 +7238,9 @@ icon_state = "1-4" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/primary/central) "ane" = ( /obj/structure/sign/electricshock, @@ -7252,7 +7254,6 @@ /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "ang" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -7283,10 +7284,8 @@ /area/ai_monitored/storage/eva) "anj" = ( /obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; pixel_x = 24 }, /obj/effect/turf_decal/stripes/end{ @@ -7339,7 +7338,7 @@ /area/quartermaster/storage) "ano" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; req_access_txt = "48;50" }, @@ -7365,7 +7364,6 @@ name = "Station Intercom"; pixel_y = 26 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -7373,8 +7371,6 @@ /area/quartermaster/miningdock) "anr" = ( /obj/machinery/mineral/equipment_vendor, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/quartermaster/miningdock) @@ -7389,7 +7385,6 @@ pixel_y = 26 }, /obj/structure/closet/secure_closet/miner, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "0-2" }, @@ -7416,7 +7411,6 @@ /area/shuttle/mining) "anv" = ( /obj/machinery/computer/shuttle/mining, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -7424,7 +7418,6 @@ /area/shuttle/mining) "anw" = ( /obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt, /obj/item/crowbar/red, /obj/item/wrench, /obj/item/tank/internals/emergency_oxygen/engi, @@ -7604,7 +7597,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "anK" = ( /obj/machinery/door/airlock{ @@ -7633,8 +7626,8 @@ }, /obj/structure/closet/crate/engineering, /obj/item/hand_tele, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/teleporter) "anM" = ( @@ -7667,7 +7660,7 @@ /obj/machinery/status_display{ pixel_x = 32 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/teleporter) @@ -7765,7 +7758,6 @@ name = "E.V.A. RC"; pixel_x = 32 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "Bridge - E.V.A. Storage"; @@ -7778,7 +7770,7 @@ /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "anY" = ( -/turf/closed/wall, +/turf/closed/wall/rust, /area/ai_monitored/storage/eva) "anZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -7863,8 +7855,6 @@ /area/hallway/primary/central) "aoh" = ( /obj/machinery/door/firedoor, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -7882,8 +7872,6 @@ pixel_x = -24; pixel_y = 24 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -7894,7 +7882,6 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "aoj" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -7903,7 +7890,6 @@ }, /area/quartermaster/miningdock) "aok" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -7913,13 +7899,11 @@ }, /area/quartermaster/miningdock) "aol" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/ore_box, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "aom" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, /obj/machinery/light/small{ dir = 1 @@ -7944,7 +7928,6 @@ /turf/open/floor/plasteel/neutral, /area/shuttle/mining) "aop" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -8010,7 +7993,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/security/brig) "aow" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -8022,7 +8007,7 @@ /area/security/brig) "aox" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "secinterior"; name = "Brig"; req_access_txt = "63" @@ -8062,7 +8047,7 @@ /area/security/brig) "aoA" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "secexterior"; name = "Brig"; req_access_txt = "63" @@ -8087,7 +8072,6 @@ }, /area/hallway/primary/central) "aoC" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, /obj/structure/toilet{ dir = 8 @@ -8097,10 +8081,9 @@ }, /obj/machinery/light/small, /obj/effect/landmark/revenantspawn, -/turf/open/floor/plating, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "aoD" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/toilet{ dir = 8 }, @@ -8110,10 +8093,9 @@ /obj/machinery/light/small, /obj/effect/landmark/blobstart, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "aoE" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/toilet{ dir = 8 }, @@ -8123,7 +8105,7 @@ /obj/machinery/light/small, /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/hallway/primary/central) "aoF" = ( /obj/structure/table/reinforced, @@ -8134,8 +8116,8 @@ dir = 4; pixel_x = -22 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/teleporter) "aoG" = ( @@ -8162,13 +8144,12 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/teleporter) "aoJ" = ( /obj/machinery/droneDispenser, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -8176,15 +8157,12 @@ /area/maintenance/port/central) "aoK" = ( /obj/structure/table, -/obj/effect/decal/cleanable/dirt, /obj/item/stack/sheet/metal{ amount = 30 }, /obj/item/stack/sheet/glass{ amount = 30 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -8196,7 +8174,6 @@ /obj/item/crowbar/red, /obj/item/wrench, /obj/item/tank/internals/emergency_oxygen/engi, -/obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -8217,6 +8194,14 @@ dir = 1 }, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table, +/obj/item/stack/packageWrap, +/obj/item/stack/cable_coil/white, +/obj/item/hand_labeler, +/obj/item/hand_labeler_refill, /turf/open/floor/plasteel, /area/crew_quarters/bar/atrium) "aoO" = ( @@ -8264,6 +8249,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel, /area/crew_quarters/bar/atrium) "aoS" = ( @@ -8271,7 +8259,6 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -8284,18 +8271,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard/central) "aoT" = ( -/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" + }, /area/maintenance/starboard/central) "aoU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -8304,22 +8293,21 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/turf/open/floor/plasteel/caution{ - dir = 1 - }, +/turf/open/floor/plating, /area/maintenance/starboard/central) "aoV" = ( -/obj/machinery/shieldgen, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/structure/rack, +/obj/item/storage/box/lights/mixed, +/obj/item/stack/rods{ + amount = 25 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/central) "aoW" = ( /obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 @@ -8442,7 +8430,6 @@ /turf/open/floor/plasteel/brown/corner, /area/hallway/primary/central) "aph" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -8494,7 +8481,6 @@ }, /area/quartermaster/miningdock) "apl" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-8" }, @@ -8503,7 +8489,6 @@ }, /area/quartermaster/miningdock) "apm" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; @@ -8519,10 +8504,12 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "apn" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "apo" = ( @@ -8626,7 +8613,7 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "63" }, @@ -8652,7 +8639,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/security/brig) "apz" = ( /obj/effect/landmark/start/security_officer, @@ -8689,7 +8678,7 @@ /area/security/brig) "apC" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "secinterior"; name = "Brig"; req_access_txt = "63" @@ -8732,7 +8721,7 @@ /area/security/brig) "apF" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ id_tag = "secexterior"; name = "Brig"; req_access_txt = "63" @@ -8789,7 +8778,6 @@ /area/storage/primary) "apK" = ( /obj/machinery/shieldwallgen, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ pixel_x = -24 }, @@ -8797,10 +8785,11 @@ pixel_y = -28 }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/teleporter) "apL" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/status_display{ pixel_y = -32 }, @@ -8810,7 +8799,6 @@ /turf/open/floor/plasteel, /area/teleporter) "apM" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ dir = 2; name = "Teleporter APC"; @@ -8837,7 +8825,6 @@ /area/teleporter) "apO" = ( /obj/machinery/shieldwallgen, -/obj/effect/decal/cleanable/dirt, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = 28 @@ -8846,15 +8833,17 @@ pixel_y = -32 }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/teleporter) "apP" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plasteel/yellow/side{ - dir = 9 +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" }, /area/maintenance/port/central) "apQ" = ( @@ -8866,9 +8855,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/storage/box/lights/mixed, -/turf/open/floor/plasteel/yellow/side{ - dir = 5 - }, +/turf/open/floor/plating, /area/maintenance/port/central) "apR" = ( /obj/effect/decal/cleanable/dirt, @@ -8886,7 +8873,6 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -8902,7 +8888,6 @@ /turf/open/floor/plasteel, /area/maintenance/port/central) "apT" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -8913,6 +8898,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/bar/atrium) "apU" = ( @@ -8942,12 +8930,20 @@ /area/crew_quarters/bar/atrium) "apW" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/neutral/corner, /area/crew_quarters/bar/atrium) "apX" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/delivery, /obj/machinery/rnd/protolathe/department/service, +/obj/effect/turf_decal/stripes/box, /turf/open/floor/plasteel, /area/crew_quarters/bar/atrium) "apY" = ( @@ -8957,15 +8953,12 @@ /turf/closed/wall, /area/maintenance/starboard/central) "apZ" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard/central) "aqa" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -8973,17 +8966,28 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/caution, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/starboard/central) "aqb" = ( -/obj/machinery/shieldgen, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/structure/closet/crate{ + name = "emergency supplies crate" + }, +/obj/item/storage/toolbox/emergency, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, /turf/open/floor/plasteel, /area/maintenance/starboard/central) "aqc" = ( @@ -8994,7 +8998,6 @@ }, /obj/item/tank/jetpack/carbondioxide, /obj/item/wrench, -/obj/effect/decal/cleanable/dirt, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = -28 @@ -9002,12 +9005,11 @@ /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/ai_monitored/storage/eva) "aqd" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/status_display{ pixel_y = -32 }, @@ -9065,7 +9067,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -28 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/ai_monitored/storage/eva) @@ -9094,7 +9096,6 @@ /obj/structure/chair{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -9142,7 +9143,6 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -26 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Fore Primary Hallway East"; dir = 1 @@ -9199,7 +9199,6 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "aqv" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /obj/structure/closet/crate, /obj/item/device/flashlight, @@ -9215,7 +9214,6 @@ /obj/structure/chair{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/end{ dir = 8 }, @@ -9225,7 +9223,6 @@ /obj/structure/chair{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -9235,7 +9232,6 @@ /obj/structure/chair{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/end{ dir = 4 }, @@ -9284,8 +9280,6 @@ /area/engine/atmos) "aqG" = ( /obj/structure/door_assembly/door_assembly_mhatch, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -9306,8 +9300,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/security/brig) "aqJ" = ( @@ -9348,7 +9342,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/security/brig) "aqN" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -9419,7 +9415,6 @@ /obj/item/storage/belt/utility, /obj/item/weldingtool, /obj/item/clothing/head/welding, -/obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ dir = 8; name = "Primary Tool Storage APC"; @@ -9464,7 +9459,6 @@ /area/storage/primary) "aqW" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /obj/structure/extinguisher_cabinet{ pixel_y = 26 @@ -9481,7 +9475,6 @@ /turf/open/floor/plasteel, /area/storage/primary) "aqY" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/port/central) @@ -9490,8 +9483,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/yellow/side{ - dir = 4 +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" }, /area/maintenance/port/central) "ara" = ( @@ -9556,18 +9550,14 @@ /turf/open/floor/plating, /area/crew_quarters/bar/atrium) "arg" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, /area/maintenance/starboard/central) "arh" = ( /obj/structure/girder, @@ -9712,7 +9702,6 @@ pixel_y = 9 }, /obj/structure/closet/crate/internals, -/obj/effect/decal/cleanable/dirt, /obj/item/pickaxe/emergency, /obj/item/pickaxe/emergency, /obj/effect/turf_decal/delivery, @@ -9737,7 +9726,6 @@ /area/shuttle/mining) "arp" = ( /obj/structure/ore_box, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /obj/machinery/light/small{ dir = 4 @@ -9755,6 +9743,9 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/vault, /area/engine/atmos) "ars" = ( @@ -9765,7 +9756,7 @@ /obj/structure/sign/fire{ pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -9774,8 +9765,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -9800,7 +9789,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -9811,8 +9799,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Atmospherics Tank 4"; network = list("thunder"); @@ -9833,7 +9819,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/green/side{ dir = 1 }, @@ -9851,7 +9837,6 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/atmos) @@ -9862,8 +9847,6 @@ /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmos) @@ -9885,8 +9868,8 @@ dir = 1 }, /obj/structure/closet/l3closet/security, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/security/brig) "arE" = ( @@ -9915,7 +9898,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Gear Room"; req_access_txt = "63" }, @@ -9994,7 +9977,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Desk"; req_access_txt = "63" }, @@ -10093,7 +10076,6 @@ /turf/open/floor/plating, /area/storage/primary) "arQ" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -10114,14 +10096,12 @@ }, /area/storage/primary) "arT" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/yellow/side{ dir = 5 }, /area/storage/primary) "arU" = ( /obj/machinery/holopad, -/obj/effect/decal/cleanable/dirt, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = 26 @@ -10136,12 +10116,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plasteel/yellow/side{ - dir = 4 - }, +/turf/open/floor/plating, /area/maintenance/port/central) "arW" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -10158,7 +10135,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port/central) "arX" = ( /obj/structure/cable/white{ @@ -10191,7 +10168,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/neutral/corner, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, /area/maintenance/port/central) "asa" = ( /obj/effect/decal/cleanable/dirt, @@ -10221,7 +10201,6 @@ /turf/open/floor/plating, /area/maintenance/port/central) "asc" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-8" }, @@ -10241,42 +10220,42 @@ dir = 4; network = list("MINE") }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/crew_quarters/bar/atrium) "ase" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "asf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "asg" = ( -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "ash" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "asi" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "asj" = ( -/obj/machinery/vending/cola, +/obj/machinery/vending/cola/random, /obj/machinery/newscaster{ pixel_x = 32 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/crew_quarters/bar/atrium) @@ -10294,7 +10273,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/neutral/corner, +/turf/open/floor/plating, /area/maintenance/starboard/central) "asm" = ( /obj/effect/decal/cleanable/dirt, @@ -10318,14 +10297,16 @@ /turf/open/floor/plasteel/neutral/corner, /area/maintenance/starboard/central) "aso" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plating, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/starboard/central) "asp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -10347,25 +10328,27 @@ /turf/open/floor/plasteel/neutral/corner, /area/maintenance/starboard/central) "asr" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/loading_area{ dir = 4 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hallway/primary/central) "ass" = ( /obj/machinery/mineral/mint, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/end, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hallway/primary/central) "ast" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/loading_area, +/obj/effect/decal/cleanable/oil, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "asu" = ( @@ -10420,6 +10403,7 @@ dir = 1; pixel_y = 1 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/red/side{ dir = 9 }, @@ -10433,7 +10417,6 @@ /turf/open/floor/plasteel, /area/engine/atmos) "asB" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "asC" = ( @@ -10462,7 +10445,6 @@ /obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "asF" = ( @@ -10471,7 +10453,6 @@ dir = 8; name = "Air to Mix" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "asG" = ( @@ -10479,20 +10460,17 @@ dir = 2 }, /obj/machinery/meter, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "asH" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/caution{ dir = 4 }, /area/engine/atmos) "asI" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/sign/vacuum{ pixel_x = -32 }, @@ -10510,8 +10488,8 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_y = -32 }, -/turf/open/floor/plasteel/vault{ - dir = 1 +/turf/open/floor/plasteel/vault/corner{ + dir = 4 }, /area/security/brig) "asK" = ( @@ -10547,8 +10525,8 @@ dir = 1; name = "security camera" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/security/brig) "asL" = ( @@ -10557,8 +10535,8 @@ dir = 1; pixel_y = -26 }, -/turf/open/floor/plasteel/vault{ - dir = 4 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/security/brig) "asM" = ( @@ -10591,7 +10569,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/security/brig) "asP" = ( /obj/structure/table/reinforced, @@ -10610,7 +10590,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/security/brig) "asQ" = ( /obj/structure/table/reinforced, @@ -10623,7 +10605,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/security/brig) "asR" = ( /obj/machinery/computer/security{ @@ -10645,8 +10629,8 @@ dir = 1; name = "security camera" }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/security/brig) "asS" = ( @@ -10663,8 +10647,8 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/security/brig) "asT" = ( @@ -10683,7 +10667,7 @@ /area/hallway/primary/central) "asU" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Primary Tool Storage"; req_access_txt = "0" }, @@ -10719,7 +10703,6 @@ /obj/structure/table/reinforced, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -10750,8 +10733,6 @@ }, /area/storage/primary) "asZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -10762,15 +10743,15 @@ /turf/open/floor/plasteel, /area/storage/primary) "atb" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/turf/open/floor/plasteel/yellow/side{ - dir = 4 +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" }, /area/maintenance/port/central) "atc" = ( @@ -10778,12 +10759,14 @@ /turf/closed/wall, /area/maintenance/port/central) "atd" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/port/central) "ate" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -10802,7 +10785,6 @@ name = "Theatre Backstage"; req_access_txt = "46" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" @@ -10829,22 +10811,21 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 6 }, /area/crew_quarters/bar/atrium) "atj" = ( /obj/machinery/vending/coffee, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; pixel_x = 24 }, /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 10 }, /area/crew_quarters/bar/atrium) "atl" = ( @@ -10870,8 +10851,9 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" }, /area/maintenance/starboard/central) "atp" = ( @@ -10887,7 +10869,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -10904,25 +10885,25 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/hallway/primary/central) "ats" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/bot, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, /area/hallway/primary/central) "att" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/hallway/primary/central) "atv" = ( /obj/effect/decal/cleanable/dirt, @@ -10977,6 +10958,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -10989,7 +10971,6 @@ /area/engine/atmos) "atC" = ( /obj/machinery/holopad, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmos) @@ -11042,7 +11023,6 @@ /obj/structure/cable/white{ icon_state = "0-2" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -11054,18 +11034,18 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/closed/wall/r_wall, +/turf/closed/wall/r_wall/rust, /area/engine/atmos) "atK" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, -/turf/open/floor/plasteel/caution/corner{ - dir = 1 +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" }, /area/maintenance/port/fore) "atL" = ( @@ -11076,7 +11056,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -11111,7 +11090,7 @@ /area/hallway/primary/central) "atO" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Primary Tool Storage"; req_access_txt = "0" }, @@ -11237,7 +11216,6 @@ pixel_y = 9 }, /obj/structure/closet/crate/internals, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -11245,11 +11223,9 @@ /turf/open/floor/plasteel, /area/storage/primary) "atU" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/plasticflaps{ opacity = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -11257,13 +11233,10 @@ /turf/open/floor/plasteel, /area/storage/primary) "atV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port/central) "atW" = ( /obj/effect/landmark/blobstart, @@ -11274,7 +11247,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/neutral/corner, +/turf/open/floor/plating, /area/maintenance/port/central) "atX" = ( /obj/structure/table/wood, @@ -11294,14 +11267,17 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/crew_quarters/theatre) "atZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken6" + }, /area/crew_quarters/theatre) "aua" = ( /obj/structure/window/reinforced{ @@ -11316,12 +11292,12 @@ pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/crew_quarters/theatre) "aub" = ( /obj/machinery/vending/cigarette, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/crew_quarters/bar/atrium) "auc" = ( @@ -11334,16 +11310,16 @@ }, /obj/structure/table/wood, /obj/item/kitchen/fork, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aud" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aue" = ( /obj/structure/chair/stool/bar, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "auf" = ( /obj/structure/table/reinforced, @@ -11428,12 +11404,16 @@ /turf/closed/wall, /area/crew_quarters/bar/atrium) "aun" = ( +/turf/open/floor/plating, /obj/effect/landmark/blobstart, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" + }, /area/maintenance/starboard/central) "auo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -11494,7 +11474,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/red/side{ dir = 10 }, @@ -11547,7 +11527,6 @@ name = "Mix to Distro"; on = 0 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "auB" = ( @@ -11578,7 +11557,6 @@ "auE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/space_heater, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -11597,7 +11575,6 @@ /area/maintenance/port/fore) "auG" = ( /obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -11607,25 +11584,26 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/red/corner, +/turf/open/floor/plating, /area/maintenance/port/fore) "auI" = ( /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/port/fore) "auJ" = ( +/turf/open/floor/plating, /obj/structure/cable/white{ icon_state = "1-8" }, @@ -11635,20 +11613,20 @@ /obj/effect/decal/cleanable/blood/splatter, /obj/effect/landmark/revenantspawn, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plating, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" + }, /area/maintenance/port/fore) "auK" = ( /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 - }, +/turf/open/floor/plating, /area/maintenance/port/fore) "auL" = ( /obj/effect/landmark/blobstart, @@ -11661,13 +11639,15 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/turf/open/floor/plasteel/red/corner, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/port/fore) "auM" = ( /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -11690,8 +11670,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/hallway/primary/central) "auO" = ( @@ -11761,7 +11742,6 @@ }, /area/hallway/primary/central) "auT" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/yellow/side{ dir = 10 }, @@ -11777,7 +11757,6 @@ /turf/open/floor/plasteel/yellow/side, /area/storage/primary) "auW" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/yellow/side{ dir = 6 @@ -11793,8 +11772,10 @@ /turf/open/floor/plasteel, /area/storage/primary) "auY" = ( -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/port/central) "auZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -11833,14 +11814,14 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/crew_quarters/theatre) "ave" = ( /obj/structure/table/wood, /obj/item/clothing/head/fedora, /obj/item/clothing/mask/cigarette/pipe, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/crew_quarters/bar/atrium) "avf" = ( @@ -11851,7 +11832,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "avg" = ( /obj/structure/table/wood, @@ -11859,7 +11840,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "avh" = ( /obj/structure/chair/stool, @@ -11867,20 +11848,20 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "avi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "avj" = ( /obj/structure/chair/stool/bar, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "avk" = ( /obj/structure/table/reinforced, @@ -11958,12 +11939,14 @@ /turf/closed/wall, /area/crew_quarters/bar/atrium) "avs" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, /area/maintenance/starboard/central) "avt" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -11986,12 +11969,13 @@ /area/hallway/primary/central) "avv" = ( /obj/machinery/shieldgen, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, /area/hallway/primary/central) "avw" = ( /obj/machinery/shieldgen, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -12009,7 +11993,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -12020,6 +12003,7 @@ dir = 4; name = "N2 to Pure" }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -12028,7 +12012,6 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 10 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -12053,7 +12036,6 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 6 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "avE" = ( @@ -12099,12 +12081,13 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/plasteel/caution, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, /area/maintenance/port/fore) "avJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -12114,13 +12097,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/caution, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/port/fore) "avK" = ( /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -12140,7 +12125,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -12159,14 +12143,16 @@ /obj/structure/cable/white{ icon_state = "1-8" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, /area/maintenance/port/fore) "avN" = ( /obj/structure/girder, @@ -12181,8 +12167,6 @@ /obj/item/crowbar/red, /obj/item/wrench, /obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -12199,8 +12183,6 @@ /obj/item/clothing/shoes/jackboots, /obj/item/device/radio, /obj/item/storage/secure/briefcase, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -12215,7 +12197,6 @@ /obj/structure/table, /obj/item/clothing/under/rank/security, /obj/item/restraints/handcuffs, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -12240,8 +12221,9 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/hallway/primary/central) "avT" = ( @@ -12296,7 +12278,6 @@ /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, -/obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -12310,8 +12291,6 @@ /area/storage/primary) "avZ" = ( /obj/machinery/vending/tool, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/status_display{ pixel_y = -32 }, @@ -12336,7 +12315,6 @@ /obj/item/stack/sheet/glass{ amount = 30 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/storage/primary) @@ -12350,7 +12328,6 @@ pixel_y = 3 }, /obj/item/stack/cable_coil/white, -/obj/effect/decal/cleanable/dirt, /obj/machinery/newscaster{ pixel_x = 32 }, @@ -12359,7 +12336,6 @@ /area/storage/primary) "awd" = ( /obj/structure/closet/firecloset, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -12392,14 +12368,17 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken" + }, /area/crew_quarters/theatre) "awj" = ( /obj/structure/chair/comfy/brown{ dir = 8 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/crew_quarters/bar/atrium) "awk" = ( @@ -12409,32 +12388,32 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "awl" = ( /obj/structure/table/wood, /obj/item/storage/bag/tray, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "awm" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "awn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "awo" = ( /obj/structure/chair/stool/bar, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "awp" = ( /obj/structure/table/reinforced, @@ -12524,7 +12503,6 @@ }, /area/crew_quarters/bar/atrium) "aww" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Bar Maintenance"; req_access_txt = "25" @@ -12542,7 +12520,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard/central) "awx" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -12572,9 +12550,6 @@ }, /area/hallway/primary/central) "awz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -12613,6 +12588,7 @@ dir = 1; pixel_y = 1 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/blue/side{ dir = 9 }, @@ -12640,11 +12616,9 @@ name = "Mix to Filter"; on = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "awI" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, @@ -12709,7 +12683,6 @@ /turf/open/floor/plasteel, /area/maintenance/port/fore) "awN" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/plasticflaps{ opacity = 1 }, @@ -12761,7 +12734,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "awU" = ( /obj/structure/chair/stool, @@ -12772,7 +12745,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "awV" = ( /obj/structure/table/wood, @@ -12780,13 +12753,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "awW" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "awX" = ( /obj/structure/table/reinforced, @@ -12865,7 +12838,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "axf" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -12873,12 +12845,13 @@ /area/hallway/primary/central) "axg" = ( /obj/structure/rack, -/obj/item/crowbar/red, -/obj/item/wrench, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/item/wrench, +/obj/item/wirecutters, +/turf/open/floor/plasteel, /area/hallway/primary/central) "axh" = ( /obj/machinery/portable_atmospherics/canister/oxygen, @@ -12895,7 +12868,6 @@ /turf/open/floor/engine/o2, /area/engine/atmos) "axj" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Atmospherics Tank 2"; dir = 4; @@ -12918,6 +12890,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/blue/side{ dir = 8 }, @@ -12947,7 +12920,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 2 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "axp" = ( @@ -12971,7 +12943,6 @@ /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -12982,7 +12953,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, @@ -12996,7 +12966,6 @@ pixel_x = 24; pixel_y = 24 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -13028,13 +12997,11 @@ /area/engine/atmos) "axw" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmos) "axx" = ( /obj/machinery/portable_atmospherics/canister/air, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmos) @@ -13042,11 +13009,12 @@ /obj/item/weldingtool, /obj/item/clothing/head/welding, /obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt, /obj/machinery/status_display{ pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/caution{ dir = 9 }, @@ -13082,7 +13050,6 @@ pixel_x = 26; pixel_y = 26 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/caution{ dir = 5 }, @@ -13113,30 +13080,34 @@ name = "Station Intercom"; pixel_x = -26 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/crew_quarters/dorms) "axE" = ( -/obj/structure/closet/secure_closet/personal, /obj/machinery/status_display{ pixel_y = 32 }, +/obj/effect/turf_decal/bot, +/obj/structure/closet/wardrobe/white, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/crew_quarters/dorms) "axF" = ( -/obj/structure/closet/secure_closet/personal, /obj/machinery/light_switch{ pixel_y = 24 }, +/obj/effect/turf_decal/bot, +/obj/structure/closet/wardrobe/grey, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/crew_quarters/dorms) "axG" = ( -/obj/structure/closet/secure_closet/personal, +/obj/effect/turf_decal/bot, +/obj/structure/closet/wardrobe/black, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -13226,20 +13197,20 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "axP" = ( /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "axQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "axR" = ( /obj/structure/cable/white{ @@ -13345,6 +13316,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/blue/side{ dir = 10 }, @@ -13368,7 +13340,6 @@ on = 1; target_pressure = 4500 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "ayf" = ( @@ -13378,7 +13349,6 @@ name = "waste filter"; on = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -13432,7 +13402,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -13446,7 +13415,6 @@ dir = 4; pixel_x = 24 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -13458,7 +13426,6 @@ dir = 8; pixel_x = -24 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/atmos) @@ -13479,9 +13446,11 @@ /area/engine/atmos) "ayq" = ( /obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt, /obj/item/paper_bin, /obj/item/pen, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/caution{ dir = 8 }, @@ -13493,7 +13462,6 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/caution{ dir = 4 }, @@ -13560,14 +13528,6 @@ pixel_x = 32 }, /obj/item/bedsheet/blue, -/obj/machinery/button/door{ - id = "Dorm3"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - req_access_txt = "0"; - specialfunctions = 4 - }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "ayB" = ( @@ -13579,14 +13539,6 @@ pixel_x = 32 }, /obj/item/bedsheet/red, -/obj/machinery/button/door{ - id = "Dorm4"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_y = -25; - req_access_txt = "0"; - specialfunctions = 4 - }, /turf/open/floor/carpet, /area/crew_quarters/dorms) "ayD" = ( @@ -13627,7 +13579,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/crew_quarters/theatre) "ayI" = ( /obj/structure/table/wood, @@ -13640,8 +13592,8 @@ dir = 4; network = list("MINE") }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/crew_quarters/bar/atrium) "ayJ" = ( @@ -13649,24 +13601,24 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "ayK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "ayL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "ayM" = ( /obj/machinery/holopad, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "ayN" = ( /obj/item/storage/fancy/cigarettes/cigars{ @@ -13696,7 +13648,6 @@ /area/maintenance/starboard/central) "ayQ" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -13707,8 +13658,6 @@ /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 }, @@ -13749,7 +13698,9 @@ "ayV" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/primary/central) "ayW" = ( /obj/structure/table/reinforced, @@ -13892,7 +13843,7 @@ dir = 4; name = "O2 to Pure" }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -13947,7 +13898,6 @@ /turf/open/floor/plasteel/neutral, /area/engine/atmos) "azr" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, @@ -14013,6 +13963,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel/caution{ dir = 8 }, @@ -14062,7 +14015,6 @@ "azD" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - id_tag = "Dorm3"; name = "Cabin" }, /obj/effect/turf_decal/stripes/line{ @@ -14090,7 +14042,10 @@ pixel_y = -22 }, /obj/machinery/light, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken5" + }, /area/crew_quarters/theatre) "azG" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -14099,7 +14054,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/crew_quarters/theatre) "azH" = ( /obj/machinery/door/window/eastright{ @@ -14114,14 +14069,14 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/crew_quarters/theatre) "azI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/crew_quarters/bar/atrium) "azJ" = ( @@ -14132,7 +14087,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "azK" = ( /obj/structure/table/wood, @@ -14140,7 +14095,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "azL" = ( /obj/structure/closet/crate/bin, @@ -14150,7 +14105,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "azM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -14159,40 +14114,38 @@ /turf/closed/wall, /area/maintenance/starboard/central) "azN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard/central) "azO" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/neutral/side, +/turf/open/floor/plating, /area/maintenance/starboard/central) "azP" = ( /obj/effect/landmark/blobstart, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/neutral/side, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, /area/maintenance/starboard/central) "azQ" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" }, -/turf/open/floor/plasteel, /area/maintenance/starboard/central) "azR" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -14203,7 +14156,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "azS" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -14217,7 +14169,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hallway/primary/central) "azT" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -14229,9 +14181,13 @@ }, /area/hallway/primary/central) "azU" = ( -/obj/structure/closet/crate/bin, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/primary/central) "azV" = ( /obj/structure/table/reinforced, @@ -14348,7 +14304,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -14365,7 +14320,7 @@ dir = 1; pixel_y = 1 }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/arrival{ dir = 9 }, @@ -14374,7 +14329,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 9 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "aAn" = ( @@ -14588,6 +14542,7 @@ dir = 8; network = list("SS13") }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/arrival{ dir = 4 }, @@ -14615,7 +14570,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault, /area/crew_quarters/theatre) "aAN" = ( /obj/machinery/power/apc{ @@ -14628,7 +14583,7 @@ /obj/structure/cable/white{ icon_state = "0-4" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aAO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -14647,7 +14602,7 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aAP" = ( /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -14663,7 +14618,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aAQ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -14672,7 +14627,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aAR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14681,7 +14636,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aAS" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -14690,7 +14645,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aAT" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -14709,7 +14664,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard/central) "aAU" = ( /obj/effect/decal/cleanable/dirt, @@ -14732,13 +14687,12 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/turf/open/floor/plasteel/neutral/side{ - dir = 1; - heat_capacity = 1e+006 +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" }, /area/maintenance/starboard/central) "aAW" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -14746,10 +14700,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard/central) "aAX" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, @@ -14790,8 +14741,9 @@ /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/central) "aBb" = ( -/obj/machinery/vending/cola, -/turf/open/floor/plasteel/vault{ +/obj/machinery/vending/cola/random, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/hallway/primary/central) @@ -14842,9 +14794,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "aBi" = ( @@ -14929,6 +14878,8 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced, /turf/open/floor/plasteel/arrival{ dir = 8 }, @@ -15036,7 +14987,6 @@ dir = 4 }, /obj/structure/closet/crate/bin, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/caution{ dir = 10 }, @@ -15200,6 +15150,7 @@ /area/crew_quarters/dorms) "aBT" = ( /obj/machinery/washing_machine, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/arrival{ dir = 4 }, @@ -15228,12 +15179,15 @@ /obj/machinery/camera{ c_tag = "Theatre Storage" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/crew_quarters/theatre) "aBW" = ( -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken7" + }, /area/crew_quarters/theatre) "aBX" = ( /obj/machinery/vending/autodrobe, @@ -15265,12 +15219,12 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aBZ" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/cheesiehonkers, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aCa" = ( /obj/machinery/light{ @@ -15279,7 +15233,7 @@ /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aCb" = ( /obj/machinery/status_display, @@ -15322,13 +15276,13 @@ }, /area/hallway/primary/central) "aCh" = ( -/obj/machinery/vending/snack, +/obj/machinery/vending/snack/random, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; pixel_x = 24 }, -/turf/open/floor/plasteel/vault{ +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/hallway/primary/central) @@ -15382,10 +15336,6 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/obj/machinery/door/airlock/glass_security{ - name = "Holding Area"; - req_access_txt = "2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" @@ -15396,6 +15346,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/door/airlock/security/glass{ + name = "Security Checkpoint"; + req_access_txt = "63" + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "aCm" = ( @@ -15411,7 +15365,7 @@ /turf/open/floor/plating, /area/hallway/secondary/exit) "aCo" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Holding Area"; req_access_txt = "2" }, @@ -15422,7 +15376,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) "aCq" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Cockpit"; req_access_txt = "19" }, @@ -15458,9 +15412,8 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/engine/atmos) "aCu" = ( @@ -15471,16 +15424,17 @@ /obj/structure/sign/fire{ pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault{ - dir = 8 +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/engine/atmos) "aCv" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible, /obj/machinery/meter, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/engine/atmos) "aCw" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -15491,7 +15445,9 @@ pixel_y = -32 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/engine/atmos) "aCx" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -15501,19 +15457,20 @@ /obj/structure/fireaxecabinet{ pixel_y = -28 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/engine/atmos) "aCy" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 9 }, /obj/structure/closet/secure_closet/atmospherics, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/engine/atmos) "aCz" = ( /obj/structure/table/reinforced, @@ -15529,7 +15486,6 @@ pixel_y = -22 }, /obj/machinery/light, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -15550,8 +15506,6 @@ /obj/machinery/newscaster{ pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/arrival, /area/engine/atmos) "aCC" = ( @@ -15563,7 +15517,6 @@ dir = 1; pixel_y = -26 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/escape, /area/engine/atmos) "aCD" = ( @@ -15571,8 +15524,9 @@ dir = 1 }, /obj/machinery/portable_atmospherics/scrubber, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/escape, /area/engine/atmos) "aCE" = ( @@ -15583,7 +15537,9 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/engine/atmos) "aCF" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -15597,7 +15553,9 @@ dir = 1 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/engine/atmos) "aCG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -15625,7 +15583,7 @@ name = "Atmospherics Lockdown Blast door" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Desk"; req_access_txt = "24" }, @@ -15726,8 +15684,8 @@ /obj/structure/sign/poster/contraband/clown{ pixel_x = -32 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/crew_quarters/theatre) "aCQ" = ( @@ -15735,7 +15693,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/crew_quarters/theatre) "aCR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -15745,7 +15703,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/crew_quarters/theatre) "aCS" = ( /obj/structure/dresser, @@ -15771,7 +15729,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aCV" = ( /obj/structure/table/reinforced, @@ -15785,11 +15743,11 @@ c_tag = "Kitchen"; dir = 2 }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side, /area/crew_quarters/kitchen) "aCW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side, /area/crew_quarters/kitchen) "aCX" = ( /obj/structure/sink/kitchen{ @@ -15797,7 +15755,7 @@ name = "sink"; pixel_y = 28 }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side, /area/crew_quarters/kitchen) "aCY" = ( /obj/structure/closet/secure_closet/freezer/fridge, @@ -15810,14 +15768,14 @@ name = "Kitchen RC"; pixel_y = 32 }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side, /area/crew_quarters/kitchen) "aCZ" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side, /area/crew_quarters/kitchen) "aDa" = ( /obj/structure/table/reinforced, @@ -15831,18 +15789,15 @@ /obj/structure/sign/nanotrasen{ pixel_x = 32 }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side, /area/crew_quarters/kitchen) "aDb" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 - }, +/turf/open/floor/plating, /area/maintenance/starboard/central) "aDc" = ( /obj/machinery/status_display, @@ -15875,6 +15830,9 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/escape{ dir = 1 }, @@ -15890,9 +15848,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "aDj" = ( @@ -16011,7 +15966,6 @@ dir = 4 }, /obj/machinery/portable_atmospherics/scrubber, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/escape{ dir = 8 }, @@ -16096,14 +16050,6 @@ pixel_x = 32 }, /obj/item/bedsheet/brown, -/obj/machinery/button/door{ - id = "Dorm1"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - req_access_txt = "0"; - specialfunctions = 4 - }, /turf/open/floor/wood, /area/crew_quarters/dorms) "aDI" = ( @@ -16112,14 +16058,6 @@ pixel_x = 32 }, /obj/item/bedsheet/black, -/obj/machinery/button/door{ - id = "Dorm2"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - req_access_txt = "0"; - specialfunctions = 4 - }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "aDJ" = ( @@ -16136,13 +16074,13 @@ /obj/structure/mirror{ pixel_x = -28 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/crew_quarters/theatre) "aDK" = ( /obj/effect/landmark/start/mime, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/crew_quarters/theatre) "aDL" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -16151,7 +16089,10 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken5" + }, /area/crew_quarters/theatre) "aDM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -16201,21 +16142,21 @@ /obj/structure/cable/white{ icon_state = "1-8" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aDP" = ( /obj/effect/landmark/xmastree, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aDQ" = ( /obj/structure/chair/stool/bar, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aDR" = ( /obj/structure/table/reinforced, @@ -16323,6 +16264,9 @@ /area/hallway/secondary/exit) "aEe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/neutral, /area/hallway/secondary/exit) "aEf" = ( @@ -16457,8 +16401,6 @@ /area/shuttle/escape) "aEn" = ( /obj/machinery/shieldgen, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, @@ -16472,24 +16414,22 @@ network = list("SS13") }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/engine/engineering) "aEo" = ( /obj/machinery/shieldgen, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault, /area/engine/engineering) "aEp" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/plasteel, /area/engine/engineering) "aEq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/power/port_gen/pacman, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -16498,14 +16438,15 @@ /area/engine/engineering) "aEr" = ( /obj/machinery/portable_atmospherics/canister/toxins, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault, /area/engine/engineering) "aEs" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/engine/engineering) "aEt" = ( /turf/closed/wall/r_wall, @@ -16526,7 +16467,8 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plasteel/vault, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side, /area/engine/engineering) "aEv" = ( /obj/structure/cable/white{ @@ -16558,7 +16500,6 @@ /area/engine/engineering) "aEx" = ( /obj/structure/closet/radiation, -/obj/effect/decal/cleanable/dirt, /obj/item/clothing/glasses/meson, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -16569,7 +16510,6 @@ /turf/open/floor/plasteel, /area/engine/engineering) "aEy" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -16583,7 +16523,6 @@ "aEz" = ( /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -16680,26 +16619,31 @@ /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/central) "aEK" = ( +/obj/machinery/vending/clothing, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/crew_quarters/dorms) "aEL" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-21" + }, /obj/machinery/status_display{ pixel_y = -32 }, -/obj/machinery/vending/kink, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/crew_quarters/dorms) "aEM" = ( -/obj/machinery/vending/clothing, +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -16716,6 +16660,7 @@ dir = 8; network = list("SS13") }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -16741,6 +16686,7 @@ pixel_y = -32 }, /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken7" }, /area/crew_quarters/dorms) @@ -16773,8 +16719,8 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/corner{ + dir = 4 }, /area/crew_quarters/theatre) "aET" = ( @@ -16787,8 +16733,8 @@ name = "Station Intercom"; pixel_y = -26 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/crew_quarters/theatre) "aEU" = ( @@ -16799,8 +16745,8 @@ pixel_y = -32 }, /obj/structure/closet/crate/wooden/toy, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/crew_quarters/theatre) "aEV" = ( @@ -16812,8 +16758,8 @@ dir = 8; pixel_x = 24 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/crew_quarters/theatre) "aEW" = ( @@ -16822,12 +16768,12 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aEX" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/chips, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aEY" = ( /obj/structure/table/reinforced, @@ -16852,6 +16798,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/white, /area/crew_quarters/kitchen) "aFb" = ( @@ -16867,6 +16814,7 @@ /obj/structure/cable/white{ icon_state = "2-4" }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/red, /area/crew_quarters/kitchen) "aFc" = ( @@ -16885,6 +16833,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/white, /area/crew_quarters/kitchen) "aFd" = ( @@ -16893,6 +16842,7 @@ icon_state = "4-8" }, /obj/machinery/deepfryer, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/red, /area/crew_quarters/kitchen) "aFe" = ( @@ -16905,7 +16855,6 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/kitchen) "aFf" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Kitchen Maintenance"; req_access_txt = "28" @@ -16923,7 +16872,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard/central) "aFg" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -16978,7 +16927,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "aFl" = ( @@ -16989,6 +16940,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/neutral, /area/hallway/secondary/exit) "aFo" = ( @@ -17005,24 +16959,22 @@ /area/shuttle/escape) "aFq" = ( /obj/machinery/power/emitter, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/engine/engineering) "aFr" = ( /obj/machinery/power/emitter, -/obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; pixel_y = -26 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault, /area/engine/engineering) "aFs" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -17035,13 +16987,11 @@ /turf/open/floor/plasteel, /area/engine/engineering) "aFu" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault, /area/engine/engineering) "aFv" = ( /obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, /obj/item/crowbar/red, /obj/item/stack/sheet/mineral/plasma{ amount = 20 @@ -17049,13 +16999,14 @@ /obj/item/device/gps/engineering{ gpstag = "ENG0" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/engine/engineering) "aFw" = ( /obj/structure/cable/white{ @@ -17064,11 +17015,13 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/engineering) "aFx" = ( @@ -17078,13 +17031,15 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "2-4" }, /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/engineering) "aFy" = ( @@ -17095,7 +17050,6 @@ dir = 4; pixel_x = 24 }, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "0-8" }, @@ -17107,11 +17061,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/engineering) "aFz" = ( /obj/structure/closet/radiation, -/obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, @@ -17126,7 +17082,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, @@ -17136,10 +17091,8 @@ "aFB" = ( /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -17295,7 +17248,7 @@ dir = 4; network = list("MINE") }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aFO" = ( /obj/structure/table/wood, @@ -17303,14 +17256,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aFP" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aFQ" = ( /obj/structure/table/reinforced, @@ -17370,11 +17323,13 @@ "aFY" = ( /obj/machinery/holopad, /obj/effect/landmark/lightsout, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aFZ" = ( @@ -17398,6 +17353,9 @@ /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "aGc" = ( @@ -17437,8 +17395,6 @@ id = "engstorage"; name = "Engineering Secure Storage Lockdown" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -17466,7 +17422,7 @@ /area/engine/engineering) "aGk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Power Monitoring"; req_access_txt = "32" }, @@ -17476,8 +17432,6 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -17519,7 +17473,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -17538,7 +17491,6 @@ dir = 4 }, /obj/machinery/portable_atmospherics/pump, -/obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet{ pixel_x = -24 }, @@ -17619,9 +17571,8 @@ /area/maintenance/port/central) "aGz" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/maintenance/port/central) "aGA" = ( @@ -17631,20 +17582,18 @@ pixel_y = 28 }, /obj/item/reagent_containers/glass/bucket, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/maintenance/port/central) "aGB" = ( /obj/structure/mopbucket, -/obj/effect/decal/cleanable/dirt, /obj/item/mop, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 }, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/maintenance/port/central) "aGC" = ( @@ -17661,12 +17610,9 @@ areastring = "/area/maintenance/port/central"; pixel_y = 25 }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 - }, +/turf/open/floor/plating, /area/maintenance/port/central) "aGE" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -17686,17 +17632,18 @@ /turf/open/floor/plasteel/neutral/corner, /area/maintenance/port/central) "aGG" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/port/central) "aGH" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -17704,12 +17651,10 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 - }, +/turf/open/floor/plating, /area/maintenance/port/central) "aGI" = ( -/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -17717,10 +17662,10 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" }, -/turf/open/floor/plasteel, /area/maintenance/port/central) "aGJ" = ( /obj/structure/cable/white{ @@ -17729,11 +17674,10 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port/central) "aGK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -17742,35 +17686,31 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" }, -/turf/open/floor/plasteel, /area/maintenance/port/central) "aGL" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" }, -/turf/open/floor/plasteel, /area/maintenance/port/central) "aGM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port/central) "aGN" = ( /obj/structure/chair/stool, @@ -17787,7 +17727,7 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aGO" = ( /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -17802,7 +17742,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aGP" = ( /obj/structure/chair/stool, @@ -17810,7 +17750,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aGQ" = ( /obj/machinery/holopad, @@ -17818,7 +17758,7 @@ name = "Station Intercom"; pixel_x = 28 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aGR" = ( /obj/machinery/vending/dinnerware, @@ -17837,25 +17777,28 @@ dir = 1; pixel_y = -32 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/turf/open/floor/plasteel/escape, /area/crew_quarters/kitchen) "aGS" = ( /obj/machinery/processor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/end{ - dir = 1 +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/escape, /area/crew_quarters/kitchen) "aGT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/crew_quarters/kitchen) "aGU" = ( @@ -17870,8 +17813,8 @@ /obj/item/storage/box/donkpockets, /obj/item/clothing/head/chefhat, /obj/machinery/light, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/crew_quarters/kitchen) "aGV" = ( @@ -17885,8 +17828,8 @@ dir = 1; pixel_y = -22 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/crew_quarters/kitchen) "aGW" = ( @@ -17896,8 +17839,8 @@ pixel_x = -3; pixel_y = 5 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 1 }, /area/crew_quarters/kitchen) "aGX" = ( @@ -17955,33 +17898,31 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aHj" = ( /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aHk" = ( /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aHl" = ( /obj/structure/cable/white{ @@ -17993,7 +17934,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aHm" = ( /obj/structure/cable/white{ @@ -18009,7 +17950,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aHn" = ( /obj/structure/cable/white{ @@ -18030,7 +17971,7 @@ network = list("SS13","Engine"); pixel_x = 23 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aHo" = ( /obj/structure/cable/white{ @@ -18039,12 +17980,11 @@ /obj/structure/cable/white{ icon_state = "1-8" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aHp" = ( /obj/structure/cable{ @@ -18059,7 +17999,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aHq" = ( /obj/structure/cable/white{ @@ -18077,7 +18017,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aHr" = ( /obj/structure/cable/white{ @@ -18086,14 +18026,13 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aHs" = ( /obj/structure/cable/white{ @@ -18114,14 +18053,13 @@ /obj/structure/cable/white{ icon_state = "1-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/caution{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/engine, /area/engine/engineering) "aHu" = ( /obj/structure/cable/white{ @@ -18130,13 +18068,13 @@ /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/caution{ +/obj/effect/turf_decal/stripes/line{ dir = 5 }, +/turf/open/floor/engine, /area/engine/engineering) "aHv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -18180,7 +18118,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -18274,7 +18211,6 @@ /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/central) "aHE" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -18282,10 +18218,11 @@ icon_state = "4-8" }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/primary/central) "aHF" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -18302,7 +18239,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port/central) "aHG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -18317,7 +18254,6 @@ /turf/open/floor/plasteel, /area/maintenance/port/central) "aHH" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -18330,23 +18266,19 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" }, -/turf/open/floor/plasteel, /area/maintenance/port/central) "aHI" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port/central) "aHJ" = ( /obj/effect/decal/cleanable/dirt, @@ -18384,7 +18316,7 @@ /obj/structure/cable/white{ icon_state = "1-8" }, -/turf/open/floor/plasteel/neutral/corner, +/turf/open/floor/plating, /area/maintenance/port/central) "aHM" = ( /turf/closed/wall, @@ -18400,7 +18332,6 @@ name = "Hydroponic's Maintenance"; req_access_txt = "35" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -18414,7 +18345,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port/central) "aHP" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -18435,7 +18366,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aHS" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -18444,12 +18375,12 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aHT" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/coffee, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aHU" = ( /obj/item/twohanded/required/kirbyplants{ @@ -18458,7 +18389,7 @@ /obj/structure/sign/poster/random{ pixel_x = 32 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aHV" = ( /obj/machinery/status_display, @@ -18495,7 +18426,9 @@ /obj/item/paper_bin, /obj/item/pen, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/primary/central) "aHZ" = ( /obj/item/twohanded/required/kirbyplants{ @@ -18545,19 +18478,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIg" = ( /obj/structure/cable{ icon_state = "2-4" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 6 }, /obj/machinery/meter, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIh" = ( /obj/structure/cable{ @@ -18567,7 +18499,7 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIi" = ( /obj/structure/cable{ @@ -18577,13 +18509,12 @@ /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIj" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, @@ -18591,7 +18522,7 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIk" = ( /obj/structure/cable{ @@ -18601,12 +18532,11 @@ dir = 1; pixel_y = -26 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIl" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -18618,7 +18548,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIm" = ( /obj/machinery/button/door{ @@ -18637,13 +18567,12 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIn" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -18651,7 +18580,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIo" = ( /obj/structure/cable{ @@ -18661,7 +18590,7 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIp" = ( /obj/structure/cable{ @@ -18672,7 +18601,7 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIq" = ( /obj/structure/cable{ @@ -18684,18 +18613,17 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIr" = ( /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aIs" = ( /obj/structure/table/reinforced, @@ -18705,7 +18633,6 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Engineering Monitoring"; dir = 2; @@ -18726,14 +18653,12 @@ pixel_y = 24 }, /obj/structure/closet/crate/bin, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/engineering) "aIv" = ( /obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt, /obj/item/paper_bin, /obj/item/pen, /obj/effect/turf_decal/bot, @@ -18820,31 +18745,33 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port/central) "aID" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, /area/janitor) "aIE" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; name = "3maintenance loot spawner" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, /turf/open/floor/plasteel, /area/maintenance/port/central) "aIF" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, /area/maintenance/port/central) "aIG" = ( /obj/item/crowbar/red, @@ -18859,22 +18786,20 @@ /obj/item/reagent_containers/glass/bucket, /obj/structure/closet/crate/hydroponics, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/hydroponics) "aIH" = ( /obj/structure/sink{ dir = 4; pixel_x = 12 }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/hydroponics) "aII" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -18907,8 +18832,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/hydroponics) "aIM" = ( /obj/machinery/chem_master/condimaster{ @@ -18922,7 +18846,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/hydroponics) "aIN" = ( /obj/machinery/vending/hydronutrients, @@ -18930,7 +18854,7 @@ pixel_y = 30 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/hydroponics) "aIO" = ( /obj/machinery/vending/hydroseeds, @@ -18946,7 +18870,7 @@ req_access_txt = "35" }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/hydroponics) "aIP" = ( /obj/structure/table/reinforced, @@ -18965,19 +18889,20 @@ pixel_x = 32 }, /obj/structure/closet/crate/bin, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/vault/side{ + dir = 9 + }, /area/crew_quarters/bar/atrium) "aIR" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) "aIS" = ( /obj/structure/closet/chefcloset, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) "aIT" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -18989,8 +18914,7 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) "aIU" = ( /obj/structure/sink/kitchen{ @@ -19024,10 +18948,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, /obj/structure/reagent_dispensers/cooking_oil, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "aIX" = ( @@ -19113,7 +19035,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot_white/left, /turf/open/floor/plasteel/vault{ dir = 4 @@ -19141,7 +19062,6 @@ pixel_x = -24; pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/camera{ c_tag = "Gravity Generator Entry"; @@ -19189,7 +19109,6 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "aJn" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/machinery/power/smes{ charge = 5e+006 @@ -19223,7 +19142,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aJq" = ( /obj/structure/cable{ @@ -19233,7 +19152,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/green/visible, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aJr" = ( /obj/item/wrench, @@ -19241,7 +19160,7 @@ dir = 6 }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/engine/engineering) "aJs" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ @@ -19249,7 +19168,7 @@ }, /obj/machinery/meter, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/engine/engineering) "aJt" = ( /obj/structure/sign/radiation, @@ -19260,7 +19179,7 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "aJv" = ( -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Supermatter Chamber"; req_access_txt = "24" }, @@ -19272,9 +19191,8 @@ dir = 1; name = "External Gas to Loop" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/engine/engineering) "aJx" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -19290,12 +19208,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aJz" = ( /obj/structure/cable/white{ @@ -19307,7 +19224,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aJA" = ( /obj/effect/spawner/structure/window/reinforced, @@ -19337,6 +19254,9 @@ /obj/item/grenade/chem_grenade/smart_metal_foam, /obj/item/grenade/chem_grenade/smart_metal_foam, /obj/item/crowbar, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/yellow/side{ dir = 8 }, @@ -19348,6 +19268,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/yellow, /area/engine/engineering) "aJD" = ( @@ -19355,6 +19278,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/neutral, /area/engine/engineering) "aJE" = ( @@ -19363,6 +19289,9 @@ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/engineering) "aJF" = ( @@ -19370,6 +19299,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/neutral, /area/engine/engineering) "aJG" = ( @@ -19377,6 +19309,9 @@ dir = 4 }, /obj/effect/landmark/start/station_engineer, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, /turf/open/floor/plasteel/yellow, /area/engine/engineering) "aJH" = ( @@ -19386,6 +19321,7 @@ /obj/machinery/computer/apc_control{ dir = 8 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/yellow/side{ dir = 4 }, @@ -19421,11 +19357,12 @@ c_tag = "Custodial Closet" }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/janitor) "aJJ" = ( /obj/vehicle/ridden/janicart, -/obj/effect/decal/cleanable/dirt, /obj/item/storage/bag/trash, /obj/item/key/janitor, /obj/machinery/power/apc/highcap/five_k{ @@ -19441,8 +19378,6 @@ /turf/open/floor/plasteel, /area/janitor) "aJK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -19451,16 +19386,16 @@ /area/janitor) "aJL" = ( /obj/structure/closet/crate/bin, -/obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet{ pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/janitor) "aJM" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -19475,7 +19410,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port/central) "aJN" = ( /obj/machinery/seed_extractor, @@ -19553,11 +19488,11 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aJX" = ( -/obj/machinery/vending/cola, -/turf/open/floor/plasteel/vault{ +/obj/machinery/vending/cola/random, +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/crew_quarters/bar/atrium) @@ -19574,8 +19509,7 @@ dir = 4; network = list("MINE") }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) "aKa" = ( /obj/machinery/airalarm{ @@ -19629,11 +19563,9 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) "aKf" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -19646,12 +19578,17 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/starboard/central) "aKg" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/hallway/primary/central) "aKh" = ( /obj/structure/sign/nanotrasen, @@ -19671,11 +19608,9 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "aKj" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/plasticflaps{ opacity = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -19697,7 +19632,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) "aKo" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0" @@ -19726,11 +19661,10 @@ /area/engine/gravity_generator) "aKs" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Gravity Generator Chamber"; req_access_txt = "19; 61" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -19746,8 +19680,6 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "aKt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, @@ -19761,7 +19693,6 @@ /area/engine/gravity_generator) "aKu" = ( /obj/machinery/holopad, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, @@ -19774,7 +19705,6 @@ /turf/open/floor/plasteel/neutral, /area/engine/gravity_generator) "aKv" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable/white{ icon_state = "1-4" @@ -19785,7 +19715,6 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "aKw" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -19835,7 +19764,7 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 6 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aKz" = ( /obj/machinery/portable_atmospherics/scrubber, @@ -19843,7 +19772,7 @@ dir = 1 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/engine/engineering) "aKA" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -19854,7 +19783,6 @@ dir = 4; pixel_x = -23 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/engine/supermatter) "aKB" = ( @@ -19865,10 +19793,8 @@ "aKC" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 2; - icon_state = "pump_map"; name = "Gas to Chamber" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/engine/supermatter) "aKD" = ( @@ -19881,7 +19807,7 @@ }, /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/engine/engineering) "aKF" = ( /obj/structure/cable{ @@ -19903,7 +19829,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aKH" = ( /obj/machinery/door/firedoor, @@ -19966,7 +19892,6 @@ /obj/item/stack/cable_coil/white, /obj/item/electronics/airlock, /obj/item/electronics/airlock, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -19997,6 +19922,9 @@ /obj/structure/cable/white{ icon_state = "4-8" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/neutral, /area/engine/engineering) "aKO" = ( @@ -20012,6 +19940,7 @@ /obj/machinery/computer/rdconsole/production{ dir = 8 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/yellow/side{ dir = 4 }, @@ -20030,7 +19959,9 @@ pixel_x = -32 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/janitor) "aKQ" = ( /obj/effect/landmark/start/janitor, @@ -20055,7 +19986,6 @@ /area/janitor) "aKS" = ( /obj/structure/janitorialcart, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 4 }, @@ -20063,12 +19993,17 @@ pixel_x = 32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/janitor) "aKT" = ( /obj/machinery/shieldgen, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, /area/maintenance/port/central) "aKU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -20106,7 +20041,7 @@ }, /obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/hydroponics) "aKY" = ( /obj/structure/table/glass, @@ -20120,7 +20055,7 @@ /obj/item/reagent_containers/glass/bottle/nutrient/rh, /obj/item/reagent_containers/dropper, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/hydroponics) "aKZ" = ( /obj/structure/table/glass, @@ -20129,7 +20064,7 @@ /obj/item/grenade/chem_grenade/antiweed, /obj/item/grenade/chem_grenade/antiweed, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/hydroponics) "aLa" = ( /obj/machinery/holopad, @@ -20138,7 +20073,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/hydroponics) "aLb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -20158,7 +20093,9 @@ /obj/item/seeds/wheat, /obj/item/reagent_containers/food/snacks/grown/tomato, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/hydroponics) "aLd" = ( /obj/structure/table/glass, @@ -20173,7 +20110,9 @@ }, /obj/item/seeds/tower, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/hydroponics) "aLe" = ( /obj/machinery/smartfridge, @@ -20184,19 +20123,18 @@ pixel_x = -32; pixel_y = -32 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aLg" = ( -/obj/machinery/vending/snack, +/obj/machinery/vending/snack/random, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/crew_quarters/bar/atrium) @@ -20212,6 +20150,9 @@ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "aLj" = ( @@ -20223,22 +20164,27 @@ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "aLk" = ( /obj/structure/kitchenspike, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "aLl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/turf/closed/wall, +/turf/closed/wall/rust, /area/crew_quarters/kitchen) "aLm" = ( /obj/structure/extinguisher_cabinet{ @@ -20304,7 +20250,6 @@ pixel_y = 3 }, /obj/item/lazarus_injector, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /mob/living/simple_animal/bot/medbot{ name = "\improper emergency medibot"; @@ -20342,8 +20287,6 @@ /turf/open/floor/plasteel/cmo, /area/shuttle/escape) "aLD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/power/port_gen/pacman, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -20354,7 +20297,6 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, @@ -20366,7 +20308,6 @@ /obj/structure/table/reinforced, /obj/item/stack/sheet/plasteel/twenty, /obj/item/wrench, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -20398,7 +20339,6 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "aLI" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -20423,13 +20363,11 @@ /area/engine/gravity_generator) "aLK" = ( /obj/structure/closet/radiation, -/obj/effect/decal/cleanable/dirt, /obj/item/clothing/glasses/meson, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -20451,7 +20389,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -20459,7 +20396,7 @@ dir = 1; filter_type = "n2" }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aLN" = ( /obj/structure/cable{ @@ -20474,7 +20411,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aLO" = ( /obj/machinery/ai_status_display, @@ -20491,10 +20428,10 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 }, -/turf/closed/wall/r_wall, +/turf/closed/wall/r_wall/rust, /area/engine/supermatter) "aLR" = ( -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Supermatter Chamber"; req_access_txt = "24" }, @@ -20524,13 +20461,12 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aLW" = ( /obj/structure/cable/white{ @@ -20539,7 +20475,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aLX" = ( /obj/effect/spawner/structure/window/reinforced, @@ -20561,20 +20497,27 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plasteel/yellow, /area/engine/engineering) "aMc" = ( -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/yellow, /area/engine/engineering) "aMd" = ( /obj/structure/cable/white{ icon_state = "1-4" }, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21" - }, /obj/machinery/rnd/circuit_imprinter, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/yellow/side{ dir = 4 }, @@ -20587,14 +20530,13 @@ }, /obj/item/storage/box/lights/mixed, /obj/item/device/lightreplacer, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/janitor) "aMf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -20620,26 +20562,23 @@ pixel_x = 12 }, /obj/item/reagent_containers/glass/bucket, -/obj/effect/decal/cleanable/dirt, /obj/item/mop, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/janitor) "aMi" = ( /obj/machinery/shieldgen, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, /area/maintenance/port/central) "aMj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" @@ -20654,7 +20593,6 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -20731,7 +20669,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aMu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -20741,7 +20679,7 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aMv" = ( /obj/effect/decal/cleanable/dirt, @@ -20789,7 +20727,9 @@ icon_state = "plant-22" }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/primary/central) "aMz" = ( /obj/item/twohanded/required/kirbyplants{ @@ -20812,7 +20752,6 @@ /turf/open/floor/plasteel/neutral, /area/hallway/secondary/exit) "aMC" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/brown{ dir = 4 }, @@ -20822,7 +20761,6 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /obj/machinery/light{ dir = 8 @@ -20836,7 +20774,6 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "aMF" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -20859,14 +20796,12 @@ /obj/item/crowbar, /obj/item/wrench, /obj/item/device/radio, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) "aMH" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /turf/open/floor/plasteel/cmo, @@ -20932,7 +20867,6 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Engineering Port"; dir = 4; @@ -20944,20 +20878,19 @@ /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aMP" = ( /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aMQ" = ( /obj/structure/cable{ @@ -21053,17 +20986,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aNa" = ( /obj/machinery/suit_storage_unit/engine, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = -26 @@ -21081,7 +21011,6 @@ /turf/open/floor/plasteel, /area/engine/engineering) "aNb" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/tank_dispenser, /obj/machinery/light, /obj/structure/extinguisher_cabinet{ @@ -21097,7 +21026,6 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, /obj/item/clothing/glasses/meson/engine, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -21114,6 +21042,7 @@ pixel_y = -32 }, /obj/machinery/rnd/protolathe/department/engineering, +/obj/effect/turf_decal/stripes/box, /turf/open/floor/plasteel, /area/engine/engineering) "aNe" = ( @@ -21128,7 +21057,6 @@ /area/engine/engineering) "aNf" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -21141,7 +21069,6 @@ /area/engine/engineering) "aNg" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/dirt, /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, @@ -21179,14 +21106,14 @@ "aNj" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; pixel_y = -26 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/janitor) "aNk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -21208,9 +21135,10 @@ /area/janitor) "aNm" = ( /obj/structure/closet/l3closet/janitor, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/janitor) "aNn" = ( /obj/structure/rack, @@ -21218,14 +21146,12 @@ /obj/item/crowbar/red, /obj/item/wrench, /obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 }, /turf/open/floor/plasteel, /area/maintenance/port/central) "aNo" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ @@ -21244,11 +21170,12 @@ /obj/item/book/manual/hydroponics_pod_people, /obj/item/storage/box/syringes, /obj/item/paper/guides/jobs/hydroponics, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/item/storage/box/disks_plantgene, /obj/item/toy/figure/botanist, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/hydroponics) "aNq" = ( /obj/machinery/hydroponics/constructable, @@ -21278,7 +21205,6 @@ pixel_y = -24 }, /obj/machinery/light, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -21286,8 +21212,9 @@ /area/hydroponics) "aNt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/hydroponics) "aNu" = ( /obj/structure/closet/crate/bin, @@ -21298,7 +21225,9 @@ network = list("SS13") }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/hydroponics) "aNv" = ( /obj/structure/window/reinforced{ @@ -21349,7 +21278,6 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar/atrium) "aNA" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, @@ -21369,7 +21297,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "aNC" = ( -/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -21377,10 +21305,12 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plating, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" + }, /area/maintenance/starboard/central) "aND" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, @@ -21432,7 +21362,6 @@ /area/hallway/secondary/exit) "aNH" = ( /obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, /obj/machinery/ai_status_display{ pixel_y = -32 }, @@ -21451,7 +21380,6 @@ /area/hallway/secondary/exit) "aNJ" = ( /obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, /obj/machinery/status_display{ pixel_y = -32 }, @@ -21480,13 +21408,11 @@ name = "Station Intercom"; pixel_y = -26 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) "aNM" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) @@ -21513,7 +21439,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 24 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) @@ -21615,7 +21540,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/meter, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aNZ" = ( /obj/structure/cable{ @@ -21628,7 +21553,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aOa" = ( /obj/machinery/power/supermatter_shard/crystal/engine, @@ -21643,7 +21568,6 @@ name = "Radiation Chamber Shutters" }, /obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -21670,11 +21594,10 @@ pixel_x = 26 }, /obj/structure/cable/white, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aOe" = ( /obj/structure/sign/nanotrasen, @@ -21720,7 +21643,7 @@ /area/hydroponics) "aOi" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Hydroponics"; req_access_txt = "35" }, @@ -21746,27 +21669,37 @@ /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, -/turf/open/floor/plasteel/yellowsiding, +/turf/open/floor/plasteel/redyellow/side{ + dir = 9 + }, /area/hallway/primary/central) "aOn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/stairs/left, +/turf/open/floor/plasteel/redyellow/side{ + dir = 1 + }, /area/hallway/primary/central) "aOo" = ( -/turf/open/floor/plasteel/stairs/medium, +/turf/open/floor/plasteel/redyellow/side{ + dir = 1 + }, /area/hallway/primary/central) "aOp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/stairs/right, +/turf/open/floor/plasteel/redyellow/side{ + dir = 1 + }, /area/hallway/primary/central) "aOq" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, -/turf/open/floor/plasteel/yellowsiding, +/turf/open/floor/plasteel/redyellow/side{ + dir = 5 + }, /area/hallway/primary/central) "aOr" = ( /obj/structure/sign/directions/engineering{ @@ -21789,8 +21722,6 @@ /turf/closed/wall, /area/maintenance/starboard/central) "aOu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -21805,7 +21736,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard/central) "aOv" = ( /obj/machinery/computer/message_monitor{ @@ -21854,14 +21785,13 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aOB" = ( /obj/structure/cable{ @@ -21919,12 +21849,11 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aOG" = ( /obj/machinery/firealarm{ @@ -21934,7 +21863,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aOH" = ( /turf/closed/wall/r_wall, @@ -21978,13 +21907,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" }, -/turf/open/floor/plasteel, /area/maintenance/port) "aOM" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -21992,13 +21920,11 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ - dir = 2 + dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port) "aON" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -22018,7 +21944,6 @@ /turf/open/floor/plasteel, /area/maintenance/port) "aOO" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -22028,6 +21953,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -22491,14 +22417,15 @@ /obj/structure/table, /obj/item/storage/briefcase, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/primary/central) "aPz" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/maintenance/starboard) "aPA" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, /obj/item/storage/secure/briefcase, /obj/item/restraints/handcuffs, @@ -22562,14 +22489,13 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aPJ" = ( /obj/machinery/light{ @@ -22581,7 +22507,7 @@ /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aPK" = ( /obj/structure/sign/electricshock, @@ -22602,7 +22528,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aPN" = ( /obj/machinery/newscaster{ @@ -22614,7 +22540,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aPO" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -22623,8 +22549,6 @@ /turf/closed/wall/r_wall, /area/maintenance/port) "aPP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -22635,18 +22559,18 @@ /turf/open/floor/plating, /area/maintenance/port) "aPQ" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; name = "3maintenance loot spawner" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, /turf/open/floor/plasteel, /area/maintenance/port) "aPR" = ( @@ -22657,40 +22581,43 @@ /turf/open/floor/plating, /area/maintenance/port) "aPS" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port) "aPT" = ( /obj/structure/rack, /obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port) "aPU" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port) "aPV" = ( @@ -22700,7 +22627,7 @@ /turf/closed/wall, /area/maintenance/port) "aPW" = ( -/obj/machinery/vending/snack, +/obj/machinery/vending/snack/random, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -22708,6 +22635,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -22984,7 +22912,9 @@ dir = 1 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/primary/central) "aQB" = ( /obj/structure/table/wood, @@ -23000,7 +22930,6 @@ }, /area/maintenance/starboard) "aQC" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/chair/office/dark{ dir = 4 }, @@ -23009,10 +22938,10 @@ /turf/open/floor/wood, /area/maintenance/starboard) "aQD" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken" }, /area/maintenance/starboard) @@ -23025,6 +22954,10 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plasteel/vault/telecomms{ dir = 5 }, @@ -23058,7 +22991,7 @@ /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aQK" = ( /obj/effect/turf_decal/stripes/line{ @@ -23067,7 +23000,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aQM" = ( /obj/effect/turf_decal/stripes/line{ @@ -23076,7 +23009,7 @@ /obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aQN" = ( /obj/effect/turf_decal/stripes/line{ @@ -23085,10 +23018,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aQO" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Engineering Aft"; dir = 2; @@ -23098,9 +23030,10 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/obj/effect/turf_decal/loading_area{ + dir = 1 }, +/turf/open/floor/plasteel/dark, /area/engine/engineering) "aQP" = ( /obj/effect/turf_decal/stripes/line{ @@ -23109,7 +23042,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aQQ" = ( /obj/effect/decal/cleanable/dirt, @@ -23122,7 +23055,6 @@ /turf/open/floor/plasteel, /area/engine/engineering) "aQR" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -23130,7 +23062,7 @@ /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aQS" = ( /obj/machinery/meter, @@ -23140,14 +23072,13 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aQT" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aQU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -23349,8 +23280,6 @@ /turf/open/floor/plasteel, /area/science/research) "aRx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -23365,7 +23294,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "aRy" = ( /obj/effect/spawner/structure/window/reinforced, @@ -23375,9 +23304,7 @@ /turf/closed/wall, /area/maintenance/starboard) "aRA" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -23392,18 +23319,19 @@ /turf/open/floor/plasteel, /area/maintenance/starboard) "aRB" = ( -/turf/open/floor/plasteel/vault/telecomms{ - dir = 5 - }, +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/item/clipboard, +/obj/item/storage/firstaid/o2, +/obj/item/crowbar, +/turf/open/floor/plasteel/vault/side, /area/tcommsat/server) "aRD" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/fans/tiny, -/turf/open/floor/plasteel/vault/telecomms{ - dir = 5 - }, +/turf/open/floor/plasteel/vault/side, /area/tcommsat/server) "aRE" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ @@ -23412,9 +23340,8 @@ on = 1; target_temperature = 80 }, -/turf/open/floor/plasteel/vault/telecomms{ - dir = 5 - }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side, /area/tcommsat/server) "aRF" = ( /obj/structure/cable/white{ @@ -23424,14 +23351,13 @@ name = "Station Intercom"; pixel_x = -28 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aRG" = ( /obj/structure/cable/white{ @@ -23445,7 +23371,7 @@ name = "Gas to Cooling Loop"; on = 1 }, -/turf/open/floor/plasteel/yellow, +/turf/open/floor/engine, /area/engine/engineering) "aRH" = ( /obj/structure/cable/white{ @@ -23454,7 +23380,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/neutral, +/turf/open/floor/engine, /area/engine/engineering) "aRI" = ( /obj/structure/cable/white{ @@ -23463,7 +23389,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel/yellow, +/turf/open/floor/engine, /area/engine/engineering) "aRJ" = ( /obj/structure/cable/white{ @@ -23472,20 +23398,19 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 }, -/turf/open/floor/plasteel/neutral, +/turf/open/floor/engine, /area/engine/engineering) "aRK" = ( /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aRL" = ( /obj/structure/cable/white{ @@ -23494,9 +23419,8 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, /area/engine/engineering) "aRM" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -23505,31 +23429,26 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aRN" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; - icon_state = "pump_map"; name = "Freezer to Gas" }, -/turf/open/floor/plasteel/neutral, +/turf/open/floor/engine, /area/engine/engineering) "aRO" = ( /obj/effect/landmark/start/station_engineer, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 9 }, -/turf/open/floor/plasteel/yellow, +/turf/open/floor/engine, /area/engine/engineering) "aRP" = ( /obj/machinery/holopad, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aRQ" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -23537,27 +23456,29 @@ name = "Gas to Cooling Loop"; on = 1 }, -/turf/open/floor/plasteel/yellow, +/turf/open/floor/engine, /area/engine/engineering) "aRR" = ( /obj/machinery/airalarm{ dir = 8; pixel_x = 24 }, -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aRS" = ( -/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /obj/structure/cable/white{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" + }, /area/maintenance/port) "aRT" = ( /obj/structure/table/wood, @@ -23615,6 +23536,8 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -23627,14 +23550,14 @@ /area/library) "aSa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aSb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aSc" = ( /obj/structure/table/wood, @@ -23655,9 +23578,8 @@ /obj/structure/bodycontainer/morgue, /obj/effect/landmark/revenantspawn, /obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/medical/morgue) "aSf" = ( @@ -23668,12 +23590,13 @@ /turf/open/floor/plasteel/vault, /area/medical/morgue) "aSg" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/medical/morgue) "aSh" = ( /turf/closed/wall, @@ -23727,6 +23650,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/table/glass, +/obj/item/clipboard, +/obj/item/storage/bag/chemistry, +/obj/item/storage/pill_bottle/mutadone, /turf/open/floor/plasteel, /area/medical/chemistry) "aSm" = ( @@ -23831,7 +23758,6 @@ "aSA" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/firealarm{ @@ -23842,29 +23768,30 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/research) "aSB" = ( /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/research) "aSC" = ( +/turf/open/floor/plating, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/neutral/corner, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" + }, /area/maintenance/starboard) "aSD" = ( /obj/structure/girder, @@ -23880,13 +23807,11 @@ /area/maintenance/starboard) "aSF" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/maintenance/starboard) "aSG" = ( /obj/machinery/portable_atmospherics/canister/air, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -23898,8 +23823,6 @@ /area/maintenance/starboard) "aSI" = ( /obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/photocopier, /obj/item/newspaper{ pixel_x = 3; @@ -23909,9 +23832,9 @@ /turf/open/floor/plating, /area/maintenance/starboard) "aSJ" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken2" }, /area/maintenance/starboard) @@ -23958,12 +23881,11 @@ /turf/closed/wall/r_wall, /area/tcommsat/server) "aSP" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/wardrobe/engineering_yellow, /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aSQ" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, @@ -23977,21 +23899,24 @@ pixel_y = -32 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, /area/engine/engineering) "aSS" = ( /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/meson/engine, /obj/structure/table/reinforced, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, /area/engine/engineering) "aST" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, /area/engine/engineering) "aSU" = ( /obj/effect/turf_decal/stripes/line{ @@ -24004,7 +23929,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aSV" = ( /obj/machinery/power/emitter/anchored{ @@ -24016,10 +23941,8 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, /area/engine/engineering) "aSW" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ @@ -24034,11 +23957,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aSX" = ( /obj/structure/closet/crate/bin, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, /area/engine/engineering) "aSY" = ( /obj/structure/table/reinforced, @@ -24051,7 +23975,8 @@ /obj/item/device/geiger_counter, /obj/item/device/geiger_counter, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, /area/engine/engineering) "aSZ" = ( /obj/structure/table/reinforced, @@ -24059,15 +23984,15 @@ /obj/item/clothing/head/radiation, /obj/item/clothing/glasses/meson, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, /area/engine/engineering) "aTa" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "aTb" = ( /obj/structure/cable/white{ @@ -24097,12 +24022,16 @@ /area/library) "aTf" = ( /obj/structure/table/wood, +/obj/item/clipboard, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/library) "aTg" = ( /obj/structure/table/wood, +/obj/item/folder, +/obj/item/pen/red, /turf/open/floor/plasteel/dark, /area/library) "aTh" = ( @@ -24127,13 +24056,14 @@ pixel_y = 3 }, /obj/item/storage/box/bodybags, -/obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 4; locked = 0; pixel_x = -23 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/medical/morgue) "aTk" = ( /obj/structure/cable/white{ @@ -24148,13 +24078,11 @@ }, /area/medical/morgue) "aTl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/medical/morgue) "aTm" = ( @@ -24163,14 +24091,13 @@ }, /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/newscaster{ pixel_y = 32 }, /obj/machinery/door/window/southleft, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side, /area/medical/medbay/zone3) "aTn" = ( /obj/machinery/light{ @@ -24181,12 +24108,12 @@ name = "Station Intercom"; pixel_y = 26 }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side, /area/medical/medbay/zone3) "aTo" = ( /obj/structure/window/reinforced, /obj/machinery/clonepod, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side, /area/medical/medbay/zone3) "aTp" = ( /obj/effect/spawner/structure/window/reinforced, @@ -24217,16 +24144,13 @@ /area/medical/chemistry) "aTt" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/chem_master, /turf/open/floor/plasteel, /area/medical/chemistry) "aTu" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/chem_master, /turf/open/floor/plasteel, /area/medical/chemistry) "aTv" = ( @@ -24349,7 +24273,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/lab) "aTL" = ( /obj/effect/spawner/structure/window/reinforced, @@ -24382,7 +24306,6 @@ }, /area/science/research) "aTO" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Science Maintenance"; req_access_txt = "47" @@ -24399,7 +24322,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/science/research) "aTP" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -24412,8 +24335,9 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" }, /area/maintenance/starboard) "aTQ" = ( @@ -24439,8 +24363,10 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, /area/maintenance/starboard) "aTS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -24450,8 +24376,10 @@ icon_state = "4-8" }, /obj/effect/landmark/blobstart, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/starboard) "aTT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -24460,8 +24388,10 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/starboard) "aTU" = ( /obj/structure/table/wood, @@ -24477,9 +24407,9 @@ /turf/open/floor/plating, /area/maintenance/starboard) "aTV" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken7" }, /area/maintenance/starboard) @@ -24493,6 +24423,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/vault/telecomms{ dir = 5 }, @@ -24504,6 +24435,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/vault/telecomms{ dir = 5 }, @@ -24515,22 +24447,22 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/vault/telecomms{ dir = 5 }, /area/tcommsat/server) "aUa" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction, -/turf/closed/wall/r_wall, +/turf/closed/wall/r_wall/rust, /area/engine/engineering) "aUb" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/blobstart, -/turf/open/floor/plasteel/neutral/corner, +/turf/open/floor/plating, /area/maintenance/port) "aUc" = ( /obj/machinery/power/apc{ @@ -24552,14 +24484,14 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aUe" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aUf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -24568,7 +24500,10 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken5" + }, /area/library) "aUg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -24577,7 +24512,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aUh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -24587,15 +24522,13 @@ /obj/structure/cable/white{ icon_state = "1-8" }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aUi" = ( /obj/structure/cable/white{ icon_state = "2-8" }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, +/turf/open/floor/wood, /area/library) "aUj" = ( /obj/machinery/photocopier, @@ -24604,16 +24537,15 @@ "aUk" = ( /obj/structure/bodycontainer/morgue, /obj/effect/landmark/revenantspawn, -/obj/effect/decal/cleanable/dirt, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = -26 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/medical/morgue) "aUl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -24624,8 +24556,8 @@ /area/medical/morgue) "aUm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/medical/morgue) "aUn" = ( @@ -24666,7 +24598,9 @@ pixel_y = 5 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/medical/chemistry) "aUt" = ( /obj/structure/cable/white{ @@ -24716,13 +24650,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/lab) "aUB" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault, /area/science/lab) "aUC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -24730,7 +24664,9 @@ dir = 5 }, /obj/machinery/rnd/protolathe/department/science, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/science/lab) "aUD" = ( /obj/effect/landmark/event_spawn, @@ -24759,7 +24695,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/lab) "aUF" = ( /obj/machinery/light{ @@ -24812,12 +24748,14 @@ /turf/closed/wall/r_wall, /area/science/research) "aUK" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/neutral/corner, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, /area/maintenance/starboard) "aUL" = ( /obj/structure/table/wood, @@ -24843,6 +24781,7 @@ }, /obj/effect/landmark/xeno_spawn, /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken5" }, /area/maintenance/starboard) @@ -24851,6 +24790,12 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/vault/telecomms{ dir = 5 }, @@ -24921,23 +24866,23 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aUX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aUY" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aUZ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aVa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -24946,7 +24891,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/wood, /area/library) "aVb" = ( /obj/structure/table/wood, @@ -24969,10 +24914,11 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/medical/morgue) "aVd" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -24984,13 +24930,12 @@ }, /area/medical/morgue) "aVe" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/medical/morgue) "aVf" = ( @@ -25045,7 +24990,9 @@ /obj/item/reagent_containers/glass/bottle/epinephrine, /obj/item/reagent_containers/dropper, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/medical/chemistry) "aVk" = ( /obj/effect/landmark/start/chemist, @@ -25125,7 +25072,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/lab) "aVu" = ( /obj/effect/landmark/start/scientist, @@ -25134,7 +25081,7 @@ icon_state = "2-8" }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault, /area/science/lab) "aVv" = ( /obj/item/reagent_containers/glass/beaker/sulphuric, @@ -25143,7 +25090,9 @@ dir = 6 }, /obj/machinery/rnd/circuit_imprinter/department/science, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/science/lab) "aVw" = ( /turf/open/floor/plasteel/whitepurple/corner, @@ -25158,7 +25107,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/lab) "aVy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -25216,15 +25165,13 @@ /turf/closed/wall/r_wall, /area/science/research) "aVF" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "aVG" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -25241,13 +25188,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "aVH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken" }, /area/maintenance/starboard) @@ -25280,13 +25228,14 @@ name = "Asteroid" }) "aVM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/port) "aVN" = ( /obj/structure/table/wood, @@ -25361,17 +25310,15 @@ /area/library) "aVY" = ( /obj/structure/table, -/obj/effect/decal/cleanable/dirt, /obj/item/clothing/gloves/color/latex, -/obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/medical/morgue) "aVZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -25386,9 +25333,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/structure/closet/l3closet, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/medical/morgue) "aWb" = ( @@ -25452,7 +25398,7 @@ }, /obj/item/reagent_containers/dropper, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/corner, /area/medical/chemistry) "aWg" = ( /obj/structure/table/glass, @@ -25477,7 +25423,9 @@ }, /obj/machinery/light, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/medical/chemistry) "aWh" = ( /obj/structure/table/glass, @@ -25496,7 +25444,9 @@ /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/medical/chemistry) "aWi" = ( /obj/structure/cable/white{ @@ -25504,7 +25454,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/medical/chemistry) "aWj" = ( /obj/structure/table/glass, @@ -25516,7 +25468,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/medical/chemistry) "aWk" = ( /obj/structure/table, @@ -25565,7 +25519,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/lab) "aWp" = ( /obj/machinery/status_display, @@ -25624,7 +25578,6 @@ /obj/item/clipboard, /obj/item/electronics/airalarm, /obj/item/electronics/airlock, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/maintenance/starboard) "aWx" = ( @@ -25634,14 +25587,12 @@ /obj/item/stack/sheet/glass, /obj/item/stack/sheet/glass, /obj/item/circuitboard/machine/microwave, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/maintenance/starboard) "aWy" = ( /obj/structure/table/wood, /obj/item/storage/briefcase, /obj/item/device/taperecorder, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard) "aWz" = ( @@ -25706,7 +25657,6 @@ "aWH" = ( /obj/structure/bodycontainer/morgue, /obj/effect/landmark/revenantspawn, -/obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ dir = 2; name = "Morgue APC"; @@ -25716,11 +25666,11 @@ /obj/structure/cable/white{ icon_state = "0-4" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/medical/morgue) "aWI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/structure/cable/white{ icon_state = "1-8" @@ -25734,8 +25684,8 @@ dir = 8; network = list("SS13") }, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/medical/morgue) "aWK" = ( @@ -25744,7 +25694,7 @@ /area/medical/medbay/zone3) "aWL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "cloningfoyer"; name = "Cloning Lab"; req_access_txt = "5" @@ -25765,7 +25715,7 @@ /area/medical/medbay/zone3) "aWN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Chemistry Lab"; req_access_txt = "5; 33" @@ -25891,7 +25841,7 @@ name = "Xenobiology Containment Door" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Server Access"; req_access_txt = "30" }, @@ -25919,9 +25869,9 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" }, /area/maintenance/starboard) "aXc" = ( @@ -26121,6 +26071,9 @@ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research) "aXz" = ( @@ -26248,6 +26201,7 @@ dir = 8; pixel_x = 24 }, +/obj/item/clothing/suit/armor/reactive/teleport, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -26260,12 +26214,10 @@ /turf/open/floor/plating, /area/maintenance/starboard) "aXK" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, /obj/machinery/light/small{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/maintenance/starboard) @@ -26285,8 +26237,6 @@ /turf/closed/wall, /area/library) "aXN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -26301,7 +26251,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port) "aXO" = ( /obj/structure/table/glass, @@ -26331,6 +26281,12 @@ network = list("SS13") }, /obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/zone3) "aXP" = ( @@ -26359,6 +26315,7 @@ }, /obj/item/storage/box/syringes, /obj/item/gun/syringe, +/obj/item/reagent_containers/hypospray/CMO, /turf/open/floor/plasteel, /area/medical/medbay/zone3) "aXR" = ( @@ -26513,6 +26470,9 @@ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research) "aYj" = ( @@ -26643,9 +26603,7 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "aYu" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -26658,15 +26616,13 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "aYv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -26675,9 +26631,7 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "aYw" = ( /obj/structure/destructible/cult/tome, @@ -26688,14 +26642,17 @@ /obj/machinery/light_switch{ pixel_y = 24 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken6" + }, /area/library) "aYx" = ( /obj/effect/landmark/start/librarian, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aYy" = ( /obj/structure/bookcase{ @@ -26709,7 +26666,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aYz" = ( /obj/structure/cable/white{ @@ -26718,18 +26675,21 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plating, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, /area/maintenance/port) "aYA" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" }, /area/maintenance/port) "aYB" = ( @@ -26751,8 +26711,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, /area/maintenance/port) "aYD" = ( /obj/effect/decal/cleanable/dirt, @@ -26766,7 +26726,6 @@ /turf/open/floor/plasteel, /area/maintenance/port) "aYE" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable/white{ icon_state = "4-8" @@ -26774,8 +26733,10 @@ /obj/structure/cable/white{ icon_state = "1-8" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, /area/maintenance/port) "aYF" = ( /obj/structure/cable/white{ @@ -26784,10 +26745,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port) "aYG" = ( /obj/structure/table/glass, @@ -26809,6 +26767,11 @@ pixel_x = -22 }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/window/eastleft{ + name = "First-Aid Supplies"; + req_access_txt = "5"; + req_one_access_txt = "0" + }, /turf/open/floor/plasteel, /area/medical/medbay/zone3) "aYH" = ( @@ -26820,7 +26783,7 @@ /area/medical/medbay/zone3) "aYJ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage"; req_access_txt = "5" }, @@ -26899,7 +26862,7 @@ /area/medical/medbay/zone3) "aYT" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5" @@ -26969,7 +26932,6 @@ /area/science/robotics/mechbay) "aZd" = ( /obj/machinery/door/firedoor, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/research{ name = "Mech Bay"; req_access_txt = "29" @@ -27033,7 +26995,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/turf/closed/wall/r_wall, +/turf/closed/wall/r_wall/rust, /area/science/robotics/lab) "aZn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -27073,7 +27035,6 @@ pixel_y = 3 }, /obj/item/storage/secure/briefcase, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plasteel/vault{ dir = 4 @@ -27105,7 +27066,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aZv" = ( /obj/structure/table/wood, @@ -27117,7 +27078,10 @@ name = "Station Intercom"; pixel_y = -26 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken" + }, /area/library) "aZw" = ( /obj/structure/table/wood, @@ -27132,7 +27096,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "aZx" = ( /obj/structure/cable/white{ @@ -27148,7 +27112,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/closed/wall, +/turf/closed/wall/rust, /area/maintenance/port) "aZz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -27158,7 +27122,6 @@ /turf/closed/wall, /area/maintenance/port) "aZA" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -27203,6 +27166,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/window/eastright{ + name = "First-Aid Supplies"; + req_access_txt = "5" + }, /turf/open/floor/plasteel, /area/medical/medbay/zone3) "aZD" = ( @@ -27210,6 +27177,13 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plasteel/cmo, /area/medical/medbay/zone3) "aZE" = ( @@ -27223,7 +27197,7 @@ /area/medical/medbay/zone3) "aZF" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage"; req_access_txt = "5" }, @@ -27340,7 +27314,7 @@ /area/medical/medbay/zone3) "aZP" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5" @@ -27388,10 +27362,7 @@ /area/hallway/primary/central) "aZU" = ( /obj/machinery/recharge_station, -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/cyborg, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 4; locked = 0; @@ -27407,27 +27378,25 @@ icon_state = "0-2" }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/robotics/mechbay) "aZV" = ( /obj/machinery/recharge_station, -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/robotics/mechbay) "aZW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/robotics/mechbay) "aZX" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/robotics/mechbay) "aZY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -27460,8 +27429,6 @@ }, /obj/item/device/multitool, /obj/item/clothing/head/welding, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -27471,15 +27438,14 @@ network = list("SS13","RD") }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/robotics/lab) "bac" = ( /obj/machinery/mecha_part_fabricator, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/end{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/robotics/lab) "bad" = ( /obj/structure/rack, @@ -27487,13 +27453,11 @@ /obj/item/storage/belt/utility/full, /obj/item/circuitboard/mecha/ripley/main, /obj/item/circuitboard/mecha/ripley/peripherals, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light{ dir = 1 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/robotics/lab) "bae" = ( /obj/machinery/mecha_part_fabricator, @@ -27520,7 +27484,7 @@ pixel_y = 32 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/robotics/lab) "bag" = ( /obj/item/paper_bin, @@ -27548,7 +27512,7 @@ pixel_x = 24 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/science/robotics/lab) "bah" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -27559,16 +27523,15 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/neutral/corner, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, /area/maintenance/starboard) "baj" = ( /turf/closed/wall, /area/maintenance/port) "bak" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/maintenance/port) "bal" = ( @@ -27605,15 +27568,16 @@ /turf/open/floor/plasteel, /area/maintenance/port) "bao" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, /area/maintenance/port) "bap" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -27623,21 +27587,21 @@ /obj/structure/table/wood, /obj/item/clothing/suit/syndicatefake, /obj/item/clothing/head/syndicatefake, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/maintenance/port) "bar" = ( /turf/open/floor/plating, /area/maintenance/port) "bas" = ( /obj/structure/dresser, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 1 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/maintenance/port) "bat" = ( @@ -27663,6 +27627,10 @@ }, /obj/structure/cable/white, /obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/zone3) "bau" = ( @@ -27676,6 +27644,7 @@ }, /obj/effect/turf_decal/bot, /obj/machinery/rnd/protolathe/department/medical, +/obj/effect/turf_decal/stripes/box, /turf/open/floor/plasteel, /area/medical/medbay/zone3) "bav" = ( @@ -27856,7 +27825,6 @@ /turf/open/floor/plasteel, /area/science/robotics/mechbay) "baO" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/structure/cable/white{ icon_state = "4-8" @@ -27893,7 +27861,6 @@ /area/science/robotics/mechbay) "baR" = ( /obj/machinery/door/firedoor, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/research{ name = "Mech Bay"; req_access_txt = "29" @@ -27947,7 +27914,6 @@ /turf/open/floor/plating, /area/science/robotics/lab) "baV" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -27981,7 +27947,6 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "baZ" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/roboticist, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -28000,7 +27965,9 @@ pixel_x = 24 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/science/robotics/lab) "bbb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -28023,7 +27990,6 @@ /turf/open/floor/plasteel/dark, /area/maintenance/port) "bbe" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -28035,8 +28001,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, /area/maintenance/port) "bbg" = ( /obj/structure/cable/white{ @@ -28048,7 +28014,6 @@ /turf/open/floor/plating, /area/maintenance/port) "bbh" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -28056,7 +28021,10 @@ dir = 4 }, /obj/effect/landmark/blobstart, -/turf/open/floor/plating, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/port) "bbi" = ( /obj/structure/cable/white{ @@ -28071,40 +28039,33 @@ /turf/open/floor/plasteel, /area/maintenance/port) "bbj" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, /area/maintenance/port) "bbk" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port) "bbl" = ( /obj/structure/table/wood, /obj/item/clipboard, /obj/item/toy/syndicateballoon, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault{ - dir = 1 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/maintenance/port) "bbm" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/revenantspawn, /turf/open/floor/plasteel/bar, /area/maintenance/port) @@ -28112,9 +28073,8 @@ /obj/machinery/vending/autodrobe{ req_access_txt = "0" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault{ - dir = 4 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/maintenance/port) "bbo" = ( @@ -28169,7 +28129,6 @@ "bbu" = ( /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; pixel_x = 24 }, /obj/machinery/light{ @@ -28198,7 +28157,7 @@ /area/hallway/primary/central) "bbx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Checkpoint"; req_access_txt = "63" }, @@ -28270,7 +28229,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bbC" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -28290,7 +28248,6 @@ /turf/open/floor/circuit, /area/science/robotics/mechbay) "bbE" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, @@ -28298,7 +28255,6 @@ /area/science/robotics/mechbay) "bbF" = ( /obj/machinery/mech_bay_recharge_port{ - icon_state = "recharge_port"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -28333,7 +28289,7 @@ /area/science/research) "bbI" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Robotics Lab"; req_access_txt = "29" }, @@ -28364,7 +28320,6 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "bbK" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -28407,7 +28362,9 @@ /obj/machinery/computer/rdconsole{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/science/robotics/lab) "bbP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -28415,11 +28372,11 @@ icon_state = "1-2" }, /obj/effect/landmark/blobstart, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard) "bbQ" = ( /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken5" }, /area/maintenance/port) @@ -28428,6 +28385,7 @@ /area/maintenance/port) "bbS" = ( /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken6" }, /area/maintenance/port) @@ -28465,9 +28423,7 @@ /turf/open/floor/plating, /area/maintenance/port) "bbW" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -28495,9 +28451,7 @@ /turf/closed/wall, /area/maintenance/port) "bbZ" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -28519,8 +28473,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, /area/maintenance/port) "bcc" = ( /obj/structure/reagent_dispensers/watertank, @@ -28540,6 +28496,10 @@ req_access_txt = "0"; use_power = 0 }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -28565,6 +28525,10 @@ /obj/item/clothing/mask/surgical, /obj/item/surgical_drapes, /obj/structure/table/reinforced, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -28582,8 +28546,8 @@ "bci" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, -/turf/open/floor/plasteel/vault{ - dir = 1 +/turf/open/floor/plasteel/vault/side{ + dir = 9 }, /area/medical/medbay/zone3) "bcj" = ( @@ -28602,7 +28566,7 @@ /area/medical/medbay/zone3) "bck" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Medbay Desk"; req_access_txt = "5" }, @@ -28684,7 +28648,6 @@ id = "mechbay"; name = "Mech Bay Shutters" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -28720,7 +28683,6 @@ /turf/open/floor/plasteel/whitepurple/corner, /area/science/research) "bcy" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -28728,7 +28690,6 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "bcz" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" @@ -28752,11 +28713,12 @@ pixel_x = 24 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/science/robotics/lab) "bcD" = ( /obj/structure/rack, -/obj/effect/decal/cleanable/dirt, /obj/item/weldingtool, /obj/item/device/assembly/voice, /obj/item/clothing/head/welding, @@ -28767,7 +28729,6 @@ /turf/open/floor/plasteel, /area/maintenance/starboard) "bcE" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -28776,7 +28737,6 @@ /area/maintenance/starboard) "bcF" = ( /obj/machinery/computer/slot_machine, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -28791,6 +28751,7 @@ /area/maintenance/port) "bcI" = ( /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken2" }, /area/maintenance/port) @@ -28800,19 +28761,16 @@ /area/maintenance/port) "bcK" = ( /obj/machinery/computer/slot_machine, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port) "bcL" = ( /obj/machinery/vending/cigarette, -/obj/effect/decal/cleanable/dirt, /obj/machinery/newscaster{ pixel_x = -32 }, /turf/open/floor/plating, /area/maintenance/port) "bcM" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 5 @@ -28822,7 +28780,6 @@ /obj/structure/chair/comfy/black{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -28847,11 +28804,9 @@ /obj/structure/table/wood, /obj/item/device/instrument/guitar, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port) "bcS" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -28860,14 +28815,12 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/blobstart, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port) "bcT" = ( /obj/structure/rack, /obj/item/storage/toolbox/mechanical, /obj/item/clothing/head/welding, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 4 }, @@ -28894,6 +28847,10 @@ /obj/structure/mirror{ pixel_x = -28 }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -28915,6 +28872,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -28939,7 +28900,7 @@ "bcZ" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, -/turf/open/floor/plasteel/vault{ +/turf/open/floor/plasteel/vault/side{ dir = 8 }, /area/medical/medbay/zone3) @@ -28947,8 +28908,8 @@ /obj/machinery/computer/med_data{ dir = 4 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/medical/medbay/zone3) "bdb" = ( @@ -29058,7 +29019,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bdk" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/shutters{ id = "mechbay"; name = "Mech Bay Shutters" @@ -29081,7 +29041,6 @@ /turf/open/floor/plasteel, /area/science/robotics/mechbay) "bdl" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, @@ -29091,14 +29050,12 @@ /turf/open/floor/plasteel, /area/science/robotics/mechbay) "bdm" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/circuit/green, /area/science/robotics/mechbay) "bdn" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, @@ -29140,11 +29097,10 @@ /turf/open/floor/plasteel/whitepurple/corner, /area/science/research) "bds" = ( -/turf/closed/wall, +/turf/closed/wall/rust, /area/science/robotics/lab) "bdt" = ( /obj/structure/closet/wardrobe/robotics_black, -/obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ dir = 8; name = "Robotics Lab APC"; @@ -29156,7 +29112,7 @@ icon_state = "0-4" }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault, /area/science/robotics/lab) "bdu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -29170,7 +29126,7 @@ icon_state = "1-8" }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault, /area/science/robotics/lab) "bdv" = ( /obj/structure/table/reinforced, @@ -29181,7 +29137,9 @@ /obj/item/surgical_drapes, /obj/item/cautery, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/science/robotics/lab) "bdw" = ( /obj/machinery/holopad, @@ -29203,7 +29161,9 @@ pixel_x = 32 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/science/robotics/lab) "bdz" = ( /obj/structure/cable/white{ @@ -29212,9 +29172,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "bdA" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -29230,22 +29188,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "bdB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/maintenance/starboard) "bdC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/item/storage/box/lights/mixed, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -29261,12 +29217,14 @@ /obj/structure/chair/stool/bar, /obj/effect/landmark/revenantspawn, /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken" }, /area/maintenance/port) "bdF" = ( /obj/structure/chair/stool/bar, /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken5" }, /area/maintenance/port) @@ -29274,6 +29232,7 @@ /obj/structure/chair/stool/bar, /obj/effect/landmark/revenantspawn, /turf/open/floor/wood{ + broken = 1; icon_state = "wood-broken2" }, /area/maintenance/port) @@ -29296,7 +29255,6 @@ pixel_y = 3 }, /obj/item/storage/briefcase, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 8 }, @@ -29316,7 +29274,6 @@ /obj/structure/chair/comfy/black{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -29347,8 +29304,6 @@ /obj/item/clothing/head/helmet/justice/escape{ name = "justice helmet" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 4 }, @@ -29360,17 +29315,15 @@ }, /area/maintenance/port) "bdO" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, /area/maintenance/port) "bdP" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -29385,6 +29338,10 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -26 }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -29404,6 +29361,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -29456,8 +29417,8 @@ dir = 8; network = list("SS13") }, -/turf/open/floor/plasteel/vault{ - dir = 4 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/medical/medbay/zone3) "bdX" = ( @@ -29472,8 +29433,8 @@ pixel_x = -26; pixel_y = -26 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/medical/medbay/zone3) "bdY" = ( @@ -29556,7 +29517,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "beg" = ( -/obj/effect/decal/cleanable/dirt, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = -24 @@ -29579,7 +29539,6 @@ /turf/open/floor/circuit/green, /area/science/robotics/mechbay) "bei" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, @@ -29587,7 +29546,6 @@ /area/science/robotics/mechbay) "bej" = ( /obj/machinery/mech_bay_recharge_port{ - icon_state = "recharge_port"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -29598,6 +29556,9 @@ "bek" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "bel" = ( @@ -29606,6 +29567,9 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "bem" = ( @@ -29617,20 +29581,21 @@ name = "Station Intercom"; pixel_y = -26 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/science/robotics/lab) "ben" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/science/robotics/lab) "beo" = ( /obj/structure/table/reinforced, @@ -29645,7 +29610,9 @@ }, /obj/machinery/light, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, /area/science/robotics/lab) "bep" = ( /obj/machinery/computer/operating{ @@ -29664,7 +29631,6 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/whitepurple/corner, /area/science/robotics/lab) "ber" = ( @@ -29680,16 +29646,20 @@ pixel_x = 28 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/science/robotics/lab) "bes" = ( /obj/structure/rack, /obj/item/crowbar/red, /obj/item/wrench, /obj/item/tank/internals/emergency_oxygen/engi, -/obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel, /area/maintenance/starboard) "bet" = ( /obj/structure/rack, @@ -29700,7 +29670,6 @@ /obj/item/stack/sheet/glass{ amount = 30 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -29709,12 +29678,10 @@ "beu" = ( /obj/structure/table/wood, /obj/item/storage/pill_bottle, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port) "bev" = ( /obj/machinery/computer/slot_machine, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /obj/structure/sign/poster/contraband/random{ pixel_y = -32 @@ -29725,7 +29692,6 @@ /area/maintenance/port) "bew" = ( /obj/structure/table/wood, -/obj/effect/decal/cleanable/dirt, /obj/item/coin/iron{ icon_state = "coin_bananium_heads"; name = "arcade coin"; @@ -29750,7 +29716,6 @@ pixel_y = 5 }, /obj/item/reagent_containers/syringe, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -29759,12 +29724,9 @@ /obj/structure/table/wood, /obj/item/newspaper, /obj/item/clothing/head/bowler, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port) "bez" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, @@ -29784,7 +29746,6 @@ name = "Theatre Stage"; req_access_txt = "0" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bar, /area/maintenance/port) "beC" = ( @@ -29821,7 +29782,6 @@ /area/medical/medbay/zone3) "beF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Medbay Maintenance"; req_access_txt = "5" @@ -29954,7 +29914,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "beQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -29963,7 +29923,6 @@ /turf/closed/wall/r_wall, /area/science/robotics/lab) "beR" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-4" }, @@ -29985,8 +29944,11 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/port) "beT" = ( /obj/effect/decal/cleanable/dirt, @@ -30021,8 +29983,8 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, /area/maintenance/port) "beW" = ( /obj/structure/cable/white{ @@ -30060,7 +30022,6 @@ /turf/open/floor/plating, /area/maintenance/port) "bfa" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -30071,9 +30032,10 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, /area/maintenance/port) "bfb" = ( /obj/structure/cable/white{ @@ -30082,8 +30044,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 4 +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" }, /area/maintenance/port) "bfc" = ( @@ -30097,10 +30060,11 @@ /turf/open/floor/plasteel/neutral/corner, /area/maintenance/port) "bfd" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel, /area/maintenance/port) "bfe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -30118,7 +30082,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Security Checkpoint"; req_access_txt = "63" }, @@ -30207,7 +30171,6 @@ /obj/structure/cable/white{ icon_state = "2-4" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/starboard) @@ -30222,10 +30185,7 @@ /obj/structure/cable/white{ icon_state = "1-4" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "bfo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -30234,8 +30194,10 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/neutral/corner, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/starboard) "bfp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -30264,20 +30226,20 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 - }, +/turf/open/floor/plating, /area/maintenance/starboard) "bfs" = ( +/turf/open/floor/plating, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" + }, /area/maintenance/starboard) "bft" = ( /obj/structure/cable/white{ @@ -30289,8 +30251,6 @@ areastring = "/area/maintenance/starboard"; pixel_y = -26 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard) "bfu" = ( @@ -30324,6 +30284,7 @@ }, /obj/effect/decal/remains/human, /turf/open/floor/plating{ + burnt = 1; icon_state = "panelscorched" }, /area/chapel/main) @@ -30366,7 +30327,6 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" @@ -30380,17 +30340,25 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port) "bfC" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/closed/wall, +/turf/closed/wall/rust, /area/chapel/main) "bfD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/item/storage/backpack, +/obj/item/crowbar, +/obj/item/wrench, +/obj/structure/rack, +/turf/open/floor/plasteel, /area/maintenance/port) "bfE" = ( /obj/structure/cable/white{ @@ -30401,27 +30369,33 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/blobstart, -/turf/open/floor/plasteel/neutral, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, /area/maintenance/port) "bfF" = ( /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/neutral, +/obj/item/tank/internals/oxygen/red, +/obj/item/clothing/mask/gas, +/turf/open/floor/plating, /area/maintenance/port) "bfG" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/port) "bfH" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -30435,7 +30409,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/port) "bfI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -30584,8 +30558,8 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/chapel/main) "bfU" = ( @@ -30621,9 +30595,8 @@ name = "Station Intercom"; pixel_y = 24 }, -/turf/open/floor/plasteel{ - dir = 1; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 1 }, /area/chapel/main) "bfY" = ( @@ -30641,9 +30614,8 @@ /obj/structure/cable/white{ icon_state = "0-2" }, -/turf/open/floor/plasteel{ - dir = 4; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 4 }, /area/chapel/main) "bfZ" = ( @@ -30653,18 +30625,16 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/open/floor/plasteel{ - dir = 1; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 1 }, /area/chapel/main) "bga" = ( /obj/structure/chair/wood/normal{ dir = 8 }, -/turf/open/floor/plasteel{ - dir = 4; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 4 }, /area/chapel/main) "bgb" = ( @@ -30683,13 +30653,20 @@ }, /area/chapel/main) "bgc" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plasteel, /area/maintenance/port) "bgd" = ( /obj/structure/closet/firecloset, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/maintenance/port) "bge" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -30725,12 +30702,14 @@ /turf/open/floor/plasteel/neutral/side, /area/hallway/primary/central) "bgl" = ( -/obj/machinery/vending/cola, +/obj/machinery/vending/cola/random, /obj/machinery/newscaster{ pixel_x = 32 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/primary/central) "bgm" = ( /turf/open/floor/plasteel/vault{ @@ -30767,7 +30746,6 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bgq" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -30810,30 +30788,25 @@ "bgu" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/tea, -/obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/food/snacks/grown/tomato, /obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, +/turf/open/floor/plasteel/vault/side, /area/maintenance/starboard) "bgv" = ( /obj/machinery/biogenerator, /obj/item/wrench, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/maintenance/starboard) "bgw" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/maintenance/starboard) "bgx" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "bgy" = ( /obj/item/twohanded/required/kirbyplants{ @@ -30841,23 +30814,21 @@ pixel_x = -3; pixel_y = 3 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plasteel/vault/side, /area/maintenance/starboard) "bgz" = ( /obj/machinery/seed_extractor, /obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/maintenance/starboard) "bgA" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/poppy, -/obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/food/snacks/grown/cherries, /obj/item/shovel/spade, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side, /area/maintenance/starboard) "bgB" = ( /obj/structure/mirror{ @@ -30902,8 +30873,8 @@ dir = 4; network = list("MINE") }, -/turf/open/floor/plasteel/vault{ - dir = 8 +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, /area/chapel/main) "bgE" = ( @@ -30919,7 +30890,7 @@ /area/chapel/main) "bgF" = ( /obj/machinery/status_display, -/turf/closed/wall, +/turf/closed/wall/rust, /area/chapel/main) "bgG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -30942,9 +30913,8 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel{ - dir = 8; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 8 }, /area/chapel/main) "bgJ" = ( @@ -30960,9 +30930,7 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/turf/open/floor/plasteel{ - icon_state = "chapel" - }, +/turf/open/floor/plasteel/chapel, /area/chapel/main) "bgK" = ( /obj/structure/chair/wood/normal{ @@ -30971,15 +30939,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/turf/open/floor/plasteel{ - dir = 8; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 8 }, /area/chapel/main) "bgL" = ( -/turf/open/floor/plasteel{ - icon_state = "chapel" - }, +/turf/open/floor/plasteel/chapel, /area/chapel/main) "bgM" = ( /obj/structure/table/wood, @@ -31002,7 +30967,6 @@ /turf/closed/wall, /area/hallway/secondary/entry) "bgO" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" @@ -31225,18 +31189,16 @@ /obj/structure/sign/nosmoking_2{ pixel_x = -32 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "bhk" = ( -/turf/open/floor/plasteel/hydrofloor, +/turf/open/floor/plating, /area/maintenance/starboard) "bhl" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard) "bhm" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -31251,8 +31213,7 @@ /obj/structure/sign/botany{ pixel_x = 32 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "bho" = ( /obj/machinery/door/airlock/silver{ @@ -31472,7 +31433,9 @@ pixel_x = 24 }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/secondary/entry) "bhM" = ( /obj/structure/disposalpipe/trunk{ @@ -31542,7 +31505,9 @@ /obj/item/reagent_containers/food/snacks/grown/watermelon, /obj/item/cultivator, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/maintenance/starboard) "bhU" = ( /obj/item/twohanded/required/kirbyplants{ @@ -31550,37 +31515,41 @@ pixel_x = -3; pixel_y = 3 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/maintenance/starboard) "bhV" = ( /obj/machinery/hydroponics/soil, /obj/item/reagent_containers/food/snacks/grown/wheat, /obj/item/reagent_containers/glass/bottle/nutrient/ez, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/maintenance/starboard) "bhW" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/starboard) "bhX" = ( /obj/machinery/hydroponics/soil, /obj/item/reagent_containers/food/snacks/grown/tea, /obj/item/hatchet, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/maintenance/starboard) "bhY" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/tower, -/obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/glass/bottle/nutrient/rh, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, /area/maintenance/starboard) "bhZ" = ( /obj/structure/closet/wardrobe/chaplain_black, @@ -31682,9 +31651,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel{ - dir = 1; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 1 }, /area/chapel/main) "bik" = ( @@ -31697,9 +31665,8 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel{ - dir = 4; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 4 }, /area/chapel/main) "bil" = ( @@ -31709,9 +31676,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plasteel{ - dir = 1; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 1 }, /area/chapel/main) "bim" = ( @@ -31719,9 +31685,8 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel{ - dir = 4; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 4 }, /area/chapel/main) "bin" = ( @@ -31867,7 +31832,6 @@ }, /area/hallway/secondary/entry) "biA" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/newscaster{ pixel_x = 32 }, @@ -31878,7 +31842,9 @@ name = "arrivals camera" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/secondary/entry) "biB" = ( /obj/structure/sign/biohazard, @@ -31887,7 +31853,6 @@ "biC" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -31899,7 +31864,6 @@ "biD" = ( /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -32026,9 +31990,8 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel{ - dir = 8; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 8 }, /area/chapel/main) "biQ" = ( @@ -32041,9 +32004,7 @@ /obj/structure/cable/white{ icon_state = "1-8" }, -/turf/open/floor/plasteel{ - icon_state = "chapel" - }, +/turf/open/floor/plasteel/chapel, /area/chapel/main) "biR" = ( /obj/structure/chair/wood/normal{ @@ -32052,9 +32013,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/turf/open/floor/plasteel{ - dir = 8; - icon_state = "chapel" +/turf/open/floor/plasteel/chapel{ + dir = 8 }, /area/chapel/main) "biS" = ( @@ -32067,9 +32027,7 @@ pixel_y = -24; req_access_txt = "0" }, -/turf/open/floor/plasteel{ - icon_state = "chapel" - }, +/turf/open/floor/plasteel/chapel, /area/chapel/main) "biT" = ( /obj/structure/bookcase, @@ -32332,7 +32290,7 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bjv" = ( -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Xenobiology Kill Room"; req_access_txt = "47" }, @@ -32793,8 +32751,6 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bki" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/fans/tiny, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -32900,7 +32856,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bku" = ( -/obj/machinery/vending/snack, +/obj/machinery/vending/snack/random, /obj/machinery/light{ dir = 1 }, @@ -32937,7 +32893,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bkz" = ( -/obj/machinery/vending/cola, +/obj/machinery/vending/cola/random, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -33130,7 +33086,6 @@ /area/shuttle/arrival) "blb" = ( /obj/structure/closet/firecloset, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -33197,8 +33152,10 @@ dir = 2; network = list("SS13") }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/primary/central) "blj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -33211,7 +33168,7 @@ c_tag = "Central Diner 4"; dir = 1 }, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "blk" = ( /obj/machinery/camera{ @@ -33247,8 +33204,10 @@ dir = 2; network = list("SS13") }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, /area/hallway/primary/central) "bln" = ( /obj/structure/cable/white{ @@ -33262,7 +33221,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "blo" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -33399,6 +33358,9 @@ /obj/machinery/mass_driver{ id = "chapelgun" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating, /area/chapel/main) "blD" = ( @@ -33414,12 +33376,16 @@ dir = 8; pixel_x = 25 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/chapel/main) "blF" = ( /obj/structure/fans/tiny, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/chapel/main) "blG" = ( @@ -33443,6 +33409,9 @@ pixel_x = 24; pixel_y = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -33465,10 +33434,9 @@ }, /obj/machinery/atmospherics/components/binary/pump{ dir = 4; - icon_state = "pump_map"; name = "Gas to Loop" }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "blL" = ( /obj/machinery/door/airlock/public/glass{ @@ -33537,14 +33505,28 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "bmb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit) -"bmh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/turf/open/floor/plasteel/escape{ + dir = 1 + }, +/area/hallway/secondary/exit) +"bmh" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/escape{ dir = 1 }, -/turf/open/floor/plasteel, /area/hallway/secondary/exit) "bmw" = ( /obj/item/twohanded/required/kirbyplants{ @@ -33553,16 +33535,23 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "bmC" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/vending/snack/random, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, -/turf/open/floor/plasteel, /area/hallway/secondary/exit) "bmG" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22" +/obj/effect/turf_decal/bot, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 4 }, -/turf/open/floor/plasteel, /area/hallway/secondary/exit) "bsv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -33657,13 +33646,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21" - }, /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/escape, /area/hallway/secondary/exit) "bsE" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, @@ -33677,14 +33666,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/light, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22" - }, /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/escape, /area/hallway/secondary/exit) "bsM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -33696,7 +33684,13 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/turf/open/floor/plasteel, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/neutral/side{ + dir = 4 + }, /area/hallway/secondary/exit) "bsN" = ( /obj/machinery/door/firedoor, @@ -33721,10 +33715,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/delivery, /obj/structure/cable/white{ icon_state = "4-8" }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "bsP" = ( @@ -33757,19 +33753,28 @@ /obj/structure/cable/white{ icon_state = "2-8" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/neutral, /area/hallway/secondary/exit) "bsS" = ( /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/escape{ + dir = 4 + }, /area/hallway/secondary/exit) "bsT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/neutral, /area/hallway/secondary/exit) "bsV" = ( @@ -33777,14 +33782,13 @@ /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/escape, /area/hallway/secondary/exit) "bsX" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - name = "Cargo Port"; - req_access_txt = "48;50" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -33795,28 +33799,33 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Office"; + req_access_txt = "48;50" + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "bsY" = ( /obj/structure/cable/white{ icon_state = "1-4" }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "bsZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - name = "Cargo Port"; - req_access_txt = "48;50" - }, /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/turf_decal/delivery, +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Office"; + req_access_txt = "48;50" }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) @@ -33882,7 +33891,6 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/arrival) "btk" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ cyclelinkeddir = 4; name = "External Docking Port" @@ -33909,7 +33917,6 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "buy" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -33947,6 +33954,10 @@ /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plasteel/vault/telecomms{ dir = 5 }, @@ -33966,6 +33977,12 @@ /area/tcommsat/server) "buI" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/vault/telecomms{ dir = 5 }, @@ -33978,6 +33995,12 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/vault/telecomms{ dir = 5 }, @@ -34013,12 +34036,21 @@ /obj/machinery/status_display{ pixel_y = -32 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/vault/telecomms{ dir = 5 }, /area/tcommsat/server) "buS" = ( /obj/machinery/ntnet_relay, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/vault/telecomms{ dir = 5 }, @@ -34029,6 +34061,9 @@ dir = 8; network = list("MINE") }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/vault/telecomms{ dir = 5 }, @@ -34064,11 +34099,15 @@ name = "Asteroid" }) "bvh" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/airless/astplate, -/area/ruin/unpowered{ - name = "Asteroid" - }) +/obj/structure/closet/emcloset{ + anchored = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "bvo" = ( /obj/structure/girder, /turf/open/floor/plating/airless, @@ -34231,13 +34270,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "bwW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/closed/wall/r_wall, +/turf/closed/wall/r_wall/rust, /area/tcommsat/server) "bwX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -34265,7 +34304,7 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 9 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "bxc" = ( /obj/structure/lattice/catwalk, @@ -34316,15 +34355,14 @@ /turf/closed/wall/r_wall, /area/tcommsat/server) "bxu" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/open/floor/plasteel/caution, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, /area/engine/engineering) "bxv" = ( /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -34334,10 +34372,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/engine/engineering) "bxw" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/event_spawn, /obj/structure/cable/white{ @@ -34351,8 +34388,8 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/vault{ - dir = 5 +/turf/open/floor/plasteel/vault/side{ + dir = 8 }, /area/bridge) "bxy" = ( @@ -34363,9 +34400,7 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, +/turf/open/floor/wood, /area/crew_quarters/heads/hop) "bxz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -34401,7 +34436,10 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/neutral/corner, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/starboard/central) "bxD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -34411,7 +34449,6 @@ }, /area/hallway/primary/central) "bxE" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" }, @@ -34428,10 +34465,9 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "bxH" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/neutral, /area/engine/atmos) @@ -34457,11 +34493,15 @@ /area/crew_quarters/dorms) "bxL" = ( /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/bar, +/turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "bxM" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/escape{ + dir = 1 + }, /area/hallway/secondary/exit) "bxN" = ( /obj/structure/cable/white{ @@ -34494,16 +34534,14 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 - }, +/turf/open/floor/plating, /area/maintenance/port) "bxS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/library) "bxT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -34536,9 +34574,11 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, -/turf/open/floor/plating, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/starboard) "bxY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -34554,7 +34594,7 @@ /turf/closed/wall, /area/maintenance/starboard/fore) "bye" = ( -/turf/closed/wall, +/turf/closed/wall/rust, /area/maintenance/fore) "byf" = ( /obj/structure/sign/vacuum, @@ -34562,7 +34602,6 @@ /area/maintenance/starboard/fore) "byg" = ( /obj/structure/closet/emcloset/anchored, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 }, @@ -34570,15 +34609,15 @@ /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "byi" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, /area/maintenance/starboard/fore) "byj" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ name = "External Airlock"; req_access_txt = "13" @@ -34595,8 +34634,6 @@ /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "byk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -34606,7 +34643,6 @@ /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "byl" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ name = "External Airlock"; req_access_txt = "13" @@ -34620,15 +34656,11 @@ /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "bym" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 8; - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/maintenance/starboard/fore) "byn" = ( /obj/structure/closet/wardrobe/grey, @@ -34663,14 +34695,14 @@ /area/space/nearstation) "sws" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_sw"; name = "southwest of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) @@ -34686,38 +34718,1427 @@ /turf/closed/wall, /area/medical/medbay/zone3) "swv" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - id_tag = "Dorm4"; - name = "Cabin" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) +/turf/closed/wall/r_wall/rust, +/area/bridge) "sww" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - id_tag = "Dorm1"; - name = "Cabin" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) +/turf/closed/wall/r_wall/rust, +/area/bridge) "swx" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 9 + }, +/area/bridge) +"swy" = ( +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, +/area/bridge) +"swz" = ( +/turf/closed/wall/r_wall/rust, +/area/crew_quarters/heads/hop) +"swA" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard/fore) +"swB" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard/fore) +"swC" = ( +/turf/closed/wall/r_wall/rust, +/area/crew_quarters/heads/captain/private) +"swD" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, +/area/bridge) +"swE" = ( +/turf/closed/wall/r_wall/rust, +/area/crew_quarters/heads/hop) +"swF" = ( +/obj/structure/sign/securearea, +/turf/closed/wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"swG" = ( +/turf/closed/wall/rust, +/area/security/detectives_office) +"swH" = ( +/turf/closed/wall/r_wall/rust, +/area/crew_quarters/heads/captain/private) +"swI" = ( +/turf/closed/wall/r_wall/rust, +/area/crew_quarters/heads/hop) +"swJ" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, +/area/bridge) +"swK" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, +/area/bridge) +"swL" = ( +/turf/closed/wall/rust, +/area/quartermaster/storage) +"swM" = ( +/obj/machinery/status_display{ + name = "cargo display"; + supply_display = 1 + }, +/turf/closed/wall/rust, +/area/quartermaster/storage) +"swN" = ( +/turf/closed/wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"swO" = ( +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"swP" = ( +/turf/closed/wall/r_wall/rust, +/area/crew_quarters/heads/captain/private) +"swQ" = ( +/turf/closed/wall/r_wall/rust, +/area/bridge) +"swR" = ( +/turf/closed/wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"swS" = ( +/turf/closed/wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"swT" = ( +/turf/closed/wall/rust, +/area/security/detectives_office) +"swU" = ( +/turf/closed/wall/r_wall/rust, +/area/bridge) +"swV" = ( +/turf/closed/wall/r_wall/rust, +/area/crew_quarters/heads/hop) +"swW" = ( +/turf/closed/wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"swX" = ( +/turf/closed/wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"swY" = ( +/turf/closed/wall/rust, +/area/quartermaster/storage) +"swZ" = ( +/turf/closed/wall/r_wall/rust, +/area/security/brig) +"sxa" = ( +/turf/closed/wall/r_wall/rust, +/area/bridge) +"sxb" = ( +/turf/closed/wall/r_wall/rust, +/area/crew_quarters/heads/hop) +"sxc" = ( +/turf/closed/wall/r_wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"sxd" = ( +/turf/closed/wall/r_wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"sxe" = ( +/turf/closed/wall/r_wall/rust, +/area/security/brig) +"sxf" = ( +/turf/closed/wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"sxg" = ( +/turf/closed/wall/r_wall/rust, +/area/crew_quarters/heads/captain/private) +"sxh" = ( +/turf/closed/wall/rust, +/area/quartermaster/storage) +"sxi" = ( +/turf/closed/wall, +/area/space) +"sxj" = ( +/turf/closed/wall, +/area/space) +"sxk" = ( +/turf/closed/wall, +/area/space) +"sxl" = ( +/turf/closed/wall, +/area/space) +"sxm" = ( +/turf/closed/wall, +/area/space) +"sxn" = ( +/turf/closed/wall, +/area/space) +"sxo" = ( +/turf/closed/wall, +/area/space) +"sxp" = ( +/obj/structure/table/reinforced, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sxq" = ( +/obj/structure/table/reinforced, +/obj/machinery/light, +/obj/machinery/requests_console{ + department = "Mining"; + departmentType = 0; + name = "Mining Dock RC"; + pixel_y = -32 + }, +/obj/item/folder/yellow, +/obj/item/toy/figure/miner, +/turf/open/floor/plasteel/brown{ + dir = 10 + }, +/area/space) +"sxr" = ( +/obj/machinery/computer/security/mining, +/obj/machinery/status_display{ + pixel_x = 32 + }, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/purple/side{ + dir = 6 + }, +/area/space) +"sxs" = ( +/turf/closed/wall, +/area/space) +"sxt" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sxu" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/vacuum, +/turf/open/floor/plating, +/area/space) +"sxv" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sxw" = ( +/turf/closed/wall/mineral/titanium, +/area/space) +"sxx" = ( +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/structure/closet/crate/internals, +/obj/item/pickaxe/emergency, +/obj/item/pickaxe/emergency, +/obj/effect/turf_decal/delivery, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"sxy" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/space) +"sxz" = ( +/obj/structure/ore_box, +/obj/effect/turf_decal/delivery, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/space) +"sxA" = ( +/turf/closed/wall/mineral/titanium, +/area/space) +"sxB" = ( +/turf/closed/wall/r_wall/rust, +/area/security/brig) +"sxC" = ( +/turf/closed/wall/r_wall/rust, +/area/ai_monitored/turret_protected/ai) +"sxD" = ( +/obj/machinery/mineral/mint, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/space) +"sxE" = ( +/obj/effect/decal/cleanable/oil, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/space) +"sxF" = ( +/turf/open/floor/plating, +/area/space) +"sxG" = ( +/obj/machinery/space_heater, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plasteel, +/area/space) +"sxH" = ( +/obj/structure/sign/vacuum, +/turf/closed/wall, +/area/space) +"sxI" = ( +/obj/structure/closet/emcloset{ + anchored = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/space) +"sxJ" = ( +/turf/closed/wall, +/area/space) +"sxK" = ( +/turf/closed/wall, +/area/space) +"sxL" = ( +/turf/closed/wall, +/area/space) +"sxM" = ( +/turf/closed/wall, +/area/space) +"sxN" = ( +/turf/closed/wall, +/area/space) +"sxO" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sxP" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sxQ" = ( +/turf/closed/wall/mineral/titanium, +/area/space) +"sxR" = ( +/turf/closed/wall/mineral/titanium, +/area/space) +"sxS" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"sxT" = ( +/turf/closed/wall/mineral/titanium, +/area/space) +"sxU" = ( +/turf/closed/wall/mineral/titanium, +/area/space) +"sxV" = ( +/turf/closed/wall/rust, +/area/quartermaster/storage) +"sxW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sxX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sxY" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"sxZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sya" = ( +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/space) +"syb" = ( +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plating, +/area/space) +"syc" = ( +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/space) +"syd" = ( +/turf/open/floor/plating/airless/astplate, +/area/space) +"sye" = ( +/turf/open/floor/plating/airless/astplate, +/area/space) +"syf" = ( +/turf/open/floor/plating/asteroid/airless, +/area/space) +"syg" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"syh" = ( +/turf/closed/wall/r_wall/rust, +/area/security/brig) +"syi" = ( +/turf/closed/wall, +/area/space) +"syj" = ( +/turf/closed/wall, +/area/space) +"syk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/space) +"syl" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/space) +"sym" = ( +/turf/closed/wall, +/area/space) +"syn" = ( +/turf/closed/wall, +/area/space) +"syo" = ( +/obj/structure/sign/vacuum, +/turf/closed/wall, +/area/space) +"syp" = ( +/turf/open/floor/plating/airless/astplate, +/area/space) +"syq" = ( +/turf/open/floor/plating/asteroid/airless, +/area/space) +"syr" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"sys" = ( +/obj/machinery/shieldgen, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/space) +"syt" = ( +/turf/closed/wall, +/area/space) +"syu" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/space) +"syv" = ( +/obj/structure/easel, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"syw" = ( +/turf/closed/wall, +/area/space) +"syx" = ( +/turf/closed/mineral/random/labormineral, +/area/space) +"syy" = ( +/turf/closed/mineral/random/labormineral, +/area/space) +"syz" = ( +/turf/open/floor/plating/asteroid/airless, +/area/space) +"syA" = ( +/turf/open/floor/plating/asteroid/airless, +/area/space) +"syB" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"syC" = ( +/turf/closed/wall/r_wall/rust, +/area/teleporter) +"syD" = ( +/turf/closed/wall/rust, +/area/quartermaster/miningdock) +"syE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/space) +"syF" = ( +/turf/closed/wall, +/area/space) +"syG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/space) +"syH" = ( +/obj/structure/closet/crate{ + icon_state = "crateopen"; + opened = 1 + }, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 + }, +/turf/open/floor/plasteel, +/area/space) +"syI" = ( +/turf/closed/wall, +/area/space) +"syJ" = ( +/turf/closed/mineral/random/labormineral, +/area/space) +"syK" = ( +/turf/open/floor/plating/asteroid/airless, +/area/space) +"syL" = ( +/turf/open/floor/plating/asteroid/airless, +/area/space) +"syM" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"syN" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"syO" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"syP" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"syQ" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"syR" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"syS" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"syT" = ( +/turf/closed/wall/r_wall/rust, +/area/ai_monitored/storage/eva) +"syU" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plasteel, +/area/space) +"syV" = ( +/turf/closed/wall, +/area/space) +"syW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/space) +"syX" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"syY" = ( +/turf/closed/wall, +/area/space) +"syZ" = ( +/obj/structure/sign/securearea, +/turf/closed/wall, +/area/space) +"sza" = ( +/turf/open/floor/plating/airless/astplate, +/area/space) +"szb" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szc" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szd" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sze" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szf" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szg" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szh" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szi" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szj" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szk" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szl" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szm" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szn" = ( +/turf/closed/wall/r_wall/rust, +/area/security/brig) +"szo" = ( +/turf/closed/wall, +/area/space) +"szp" = ( +/turf/closed/wall, +/area/space) +"szq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/space) +"szr" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/space) +"szs" = ( +/turf/closed/wall, +/area/space) +"szt" = ( +/turf/closed/mineral/random/labormineral, +/area/space) +"szu" = ( +/turf/closed/mineral/random/labormineral, +/area/space) +"szv" = ( +/turf/open/floor/plating/asteroid/airless, +/area/space) +"szw" = ( +/turf/open/floor/plating/asteroid/airless, +/area/space) +"szx" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szy" = ( +/turf/closed/wall, +/area/space) +"szz" = ( +/turf/closed/wall, +/area/space) +"szA" = ( +/turf/closed/wall, +/area/space) +"szB" = ( +/turf/closed/wall, +/area/space) +"szC" = ( +/turf/closed/wall, +/area/space) +"szD" = ( +/turf/closed/wall, +/area/space) +"szE" = ( +/turf/closed/wall, +/area/space) +"szF" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"szG" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"szH" = ( +/turf/closed/wall/r_wall/rust, +/area/teleporter) +"szI" = ( +/turf/closed/wall/r_wall/rust, +/area/ai_monitored/storage/eva) +"szJ" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plating, +/area/space) +"szK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"szL" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating, +/area/space) +"szM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plating, +/area/space) +"szN" = ( +/turf/closed/wall, +/area/space) +"szO" = ( +/turf/closed/mineral/random/labormineral, +/area/space) +"szP" = ( +/turf/closed/mineral/random/labormineral, +/area/space) +"szQ" = ( +/turf/closed/mineral/random/labormineral, +/area/space) +"szR" = ( +/turf/open/floor/plating/asteroid/airless, +/area/space) +"szS" = ( +/turf/open/floor/plating/asteroid/airless, +/area/space) +"szT" = ( +/turf/open/floor/plating/airless/astplate, +/area/space) +"szU" = ( +/turf/closed/wall, +/area/space) +"szV" = ( +/obj/structure/table/reinforced, +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + dir = 8; + name = "Departure Lounge APC"; + areastring = "/area/hallway/secondary/exit"; + pixel_x = -26; + pixel_y = 3 + }, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/device/radio, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel/red/side{ + dir = 9 + }, +/area/space) +"szW" = ( +/obj/structure/table/reinforced, +/obj/item/restraints/handcuffs, +/obj/item/device/assembly/flash/handheld, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/space) +"szX" = ( +/obj/structure/chair, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + name = "Station Intercom"; + pixel_y = 24 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/space) +"szY" = ( +/obj/structure/chair, +/obj/machinery/ai_status_display{ + pixel_y = 32 + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/red/side{ + dir = 1 + }, +/area/space) +"szZ" = ( +/obj/structure/chair, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/open/floor/plasteel/red/side{ + dir = 5 + }, +/area/space) +"sAa" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sAb" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sAc" = ( +/turf/closed/wall/rust, +/area/storage/primary) +"sAd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/space) +"sAe" = ( +/turf/closed/wall, +/area/space) +"sAf" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/space) +"sAg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/space) +"sAh" = ( +/turf/closed/wall, +/area/space) +"sAi" = ( +/turf/closed/wall, +/area/space) +"sAj" = ( +/turf/closed/wall, +/area/space) +"sAk" = ( +/turf/closed/wall, +/area/space) +"sAl" = ( +/obj/structure/sign/securearea, +/turf/closed/wall, +/area/space) +"sAm" = ( +/turf/open/floor/plating/airless/astplate, +/area/space) +"sAn" = ( +/turf/open/floor/plating/airless/astplate, +/area/space) +"sAo" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sAp" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/space) +"sAq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/plasteel/neutral, +/area/space) +"sAr" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sAs" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/neutral, +/area/space) +"sAt" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/red/side{ + dir = 4 + }, +/area/space) +"sAu" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sAv" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sAw" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sAx" = ( +/turf/closed/wall/r_wall/rust, +/area/engine/atmos) +"sAy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall/rust, +/area/engine/atmos) +"sAz" = ( +/turf/closed/wall/r_wall/rust, +/area/storage/primary) +"sAA" = ( +/turf/closed/wall/rust, +/area/crew_quarters/bar/atrium) +"sAB" = ( +/turf/closed/wall/r_wall/rust, +/area/ai_monitored/storage/eva) +"sAC" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sAD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/space) +"sAE" = ( +/turf/closed/wall, +/area/space) +"sAF" = ( +/obj/structure/closet/wardrobe/grey, +/turf/open/floor/plasteel/redblue, +/area/space) +"sAG" = ( +/turf/open/floor/plating, +/area/space) +"sAH" = ( +/obj/item/wallframe/apc, +/turf/open/floor/plating, +/area/space) +"sAI" = ( +/obj/structure/closet/wardrobe/green, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plasteel/redblue, +/area/space) +"sAJ" = ( +/turf/closed/wall, +/area/space) +"sAK" = ( +/obj/structure/closet/firecloset, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/space) +"sAL" = ( +/turf/closed/wall, +/area/space) +"sAM" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/space) +"sAN" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/space) +"sAO" = ( +/turf/closed/wall, +/area/space) +"sAP" = ( +/obj/machinery/computer/security, +/obj/machinery/newscaster/security_unit{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/red/side{ + dir = 10 + }, +/area/space) +"sAQ" = ( +/obj/structure/chair/office/dark, +/turf/open/floor/plasteel/red/side, +/area/space) +"sAR" = ( +/obj/machinery/computer/secure_data, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/red/side, +/area/space) +"sAS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side, +/area/space) +"sAT" = ( +/obj/machinery/camera{ + c_tag = "Security - Departures Starboard"; + dir = 1; + name = "security camera" + }, +/turf/open/floor/plasteel/red/side{ + dir = 6 + }, +/area/space) +"sAU" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port"; + req_access_txt = "63" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"sAV" = ( +/obj/structure/fans/tiny, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sAW" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port"; + req_access_txt = "63" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"sAX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, +/area/maintenance/starboard/central) +"sAY" = ( +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/hallway/primary/central) +"sAZ" = ( +/turf/closed/wall/rust, +/area/quartermaster/miningdock) +"sBa" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/space) +"sBb" = ( +/turf/closed/wall, +/area/space) +"sBc" = ( +/obj/structure/closet/wardrobe/black, +/obj/item/clothing/accessory/waistcoat, +/turf/open/floor/plating, +/area/space) +"sBd" = ( +/turf/open/floor/plasteel/redblue, +/area/space) +"sBe" = ( +/turf/open/floor/plating, +/area/space) +"sBf" = ( +/obj/structure/closet/wardrobe/white, +/turf/open/floor/plasteel/redblue, +/area/space) +"sBg" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/space) +"sBh" = ( +/turf/open/floor/plating, +/area/space) +"sBi" = ( +/turf/closed/wall, +/area/space) +"sBj" = ( +/obj/structure/table, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/open/floor/plasteel, +/area/space) +"sBk" = ( +/obj/structure/table, +/turf/open/floor/plasteel/escape{ + dir = 5 + }, +/area/space) +"sBl" = ( +/turf/closed/wall, +/area/space) +"sBm" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/space) +"sBn" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - id_tag = "Dorm2"; - name = "Cabin" +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/machinery/door/window/brigdoor/southright{ + dir = 1; + name = "Security Desk"; + req_access_txt = "63" + }, +/obj/structure/table/reinforced, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/item/folder/red, +/obj/item/device/radio, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/turf/open/floor/plasteel, +/area/space) +"sBo" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/space) +"sBp" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/turf/open/floor/plasteel, +/area/space) +"sBq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/space) +"sBr" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/vacuum, +/turf/open/floor/plating, +/area/space) +"sBs" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sBt" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sBu" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/security/brig) +"sBv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/rust, +/area/crew_quarters/theatre) +"sBw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/rust, +/area/crew_quarters/bar/atrium) +"sBx" = ( +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sBy" = ( +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"sBz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/space) +"sBA" = ( +/turf/closed/wall, +/area/space) +"sBB" = ( +/turf/closed/wall, +/area/space) +"sBC" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall, +/area/space) +"sBD" = ( +/obj/structure/barricade/wooden, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" }, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -34725,15 +36146,3396 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/turf/open/floor/plating, +/area/space) +"sBE" = ( +/turf/closed/wall, +/area/space) +"sBF" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/space) +"sBG" = ( +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plating, +/area/space) +"sBH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, +/area/space) +"sBI" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/escape{ + dir = 8 + }, +/area/space) +"sBJ" = ( +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/space) +"sBK" = ( +/turf/closed/wall, +/area/space) +"sBL" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sBM" = ( +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/escape{ + dir = 1 + }, +/area/space) +"sBN" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/escape{ + dir = 1 + }, +/area/space) +"sBO" = ( +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/escape{ + dir = 1 + }, +/area/space) +"sBP" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sBQ" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"sBR" = ( +/obj/structure/fans/tiny, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sBS" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"sBT" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sBU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sBV" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sBW" = ( +/obj/structure/sign/vacuum, +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sBX" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating, +/area/space) +"sBY" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sBZ" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sCa" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sCb" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sCc" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sCd" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sCe" = ( +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plating, +/area/space) +"sCf" = ( +/turf/closed/wall, +/area/space) +"sCg" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/plasteel, +/area/space) +"sCh" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/escape{ + dir = 4 + }, +/area/space) +"sCi" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sCj" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-22" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sCk" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel/neutral, +/area/space) +"sCl" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/bot, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/space) +"sCm" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/neutral, +/area/space) +"sCn" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sCo" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sCp" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sCq" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sCr" = ( +/turf/open/floor/plating, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" + }, +/area/maintenance/port/central) +"sCs" = ( +/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" + }, +/area/hallway/primary/central) +"sCt" = ( +/obj/structure/easel, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"sCu" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sCv" = ( +/turf/closed/wall, +/area/space) +"sCw" = ( +/turf/closed/wall, +/area/space) +"sCx" = ( +/turf/closed/wall, +/area/space) +"sCy" = ( +/turf/closed/wall, +/area/space) +"sCz" = ( +/turf/closed/wall, +/area/space) +"sCA" = ( +/turf/closed/wall, +/area/space) +"sCB" = ( +/turf/closed/wall, +/area/space) +"sCC" = ( +/turf/closed/wall, +/area/space) +"sCD" = ( +/turf/closed/wall, +/area/space) +"sCE" = ( +/turf/open/floor/plasteel/escape{ + dir = 8 + }, +/area/space) +"sCF" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/neutral/side{ + dir = 4 + }, +/area/space) +"sCG" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Departure Lounge" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"sCH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sCI" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/neutral, +/area/space) +"sCJ" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/bot, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/space) +"sCK" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/neutral, +/area/space) +"sCL" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sCM" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sCN" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sCO" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sCP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sCQ" = ( +/obj/structure/closet/crate{ + icon_state = "crateopen"; + opened = 1 + }, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 + }, +/obj/item/storage/box, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"sCR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/escape{ + dir = 1 + }, +/area/space) +"sCS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/space) +"sCT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/plasteel/escape{ + dir = 1 + }, +/area/space) +"sCU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/airalarm{ + pixel_y = 24 + }, +/turf/open/floor/plasteel, +/area/space) +"sCV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/escape{ + dir = 1 + }, +/area/space) +"sCW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/space) +"sCX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/escape{ + dir = 1 + }, +/area/space) +"sCY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/space) +"sCZ" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/escape{ + dir = 1 + }, +/area/space) +"sDa" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/space) +"sDb" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/neutral/side{ + dir = 4 + }, +/area/space) +"sDc" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Departure Lounge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"sDd" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sDe" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel/neutral, +/area/space) +"sDf" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/bot, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/space) +"sDg" = ( +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sDh" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Shuttle Docking Foyer"; + dir = 8; + network = list("MINE") + }, +/obj/machinery/camera{ + c_tag = "Escape Arm Airlocks"; + dir = 8; + network = list("SS13") + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sDi" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: EXTERNAL AIRLOCK" + }, +/turf/open/floor/plating, +/area/space) +"sDj" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sDk" = ( +/turf/closed/wall/r_wall/rust, +/area/engine/atmos) +"sDl" = ( +/turf/closed/wall/rust, /area/crew_quarters/dorms) -"swy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/kink, +"sDm" = ( +/turf/closed/wall/rust, +/area/crew_quarters/dorms) +"sDn" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"sDo" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sDp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, +/area/hallway/primary/central) +"sDq" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/tank/internals/air, +/obj/item/clothing/mask/gas, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"sDr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/space) +"sDs" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/escape, +/area/space) +"sDt" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/light, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/space) +"sDu" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/escape, +/area/space) +"sDv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/space) +"sDw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = -28 + }, +/obj/machinery/camera{ + c_tag = "Departures Hallway"; + dir = 1 + }, +/turf/open/floor/plasteel/escape, +/area/space) +"sDx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/space) +"sDy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/escape, +/area/space) +"sDz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/space) +"sDA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/escape/corner{ + dir = 8 + }, +/area/space) +"sDB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/neutral/side{ + dir = 4 + }, +/area/space) +"sDC" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Departure Lounge" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/space) +"sDD" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/space) +"sDE" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/neutral, +/area/space) +"sDF" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/space) +"sDG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/neutral, +/area/space) +"sDH" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sDI" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sDJ" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sDK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/rust, +/area/crew_quarters/theatre) +"sDL" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"sDM" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/rust, +/area/crew_quarters/bar/atrium) +"sDN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/hallway/primary/central) +"sDO" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sDP" = ( +/turf/closed/wall/rust, +/area/hallway/secondary/exit) +"sDQ" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall, +/area/space) +"sDR" = ( +/turf/closed/wall, +/area/space) +"sDS" = ( +/turf/closed/wall, +/area/space) +"sDT" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/space) +"sDU" = ( +/turf/closed/wall, +/area/space) +"sDV" = ( +/turf/closed/wall, +/area/space) +"sDW" = ( +/obj/machinery/vending/cigarette, +/obj/machinery/newscaster{ + pixel_y = -30 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, +/area/space) +"sDX" = ( +/turf/closed/wall, +/area/space) +"sDY" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall, +/area/space) +"sDZ" = ( +/turf/open/floor/plasteel, +/area/space) +"sEa" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/escape{ + dir = 4 + }, +/area/space) +"sEb" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sEc" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-21" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sEd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/plasteel/neutral, +/area/space) +"sEe" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sEf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/neutral, +/area/space) +"sEg" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sEh" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sEi" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sEj" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sEk" = ( +/turf/closed/wall/rust, +/area/crew_quarters/dorms) +"sEl" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sEm" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sEn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sEo" = ( +/turf/closed/wall/rust, +/area/hallway/secondary/exit) +"sEp" = ( +/obj/structure/closet/emcloset{ + anchored = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/space) +"sEq" = ( +/obj/structure/sign/securearea, +/turf/closed/wall, +/area/space) +"sEr" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sEs" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sEt" = ( +/turf/closed/wall, +/area/space) +"sEu" = ( +/turf/closed/wall, +/area/space) +"sEv" = ( +/turf/closed/wall, +/area/space) +"sEw" = ( +/obj/machinery/vending/cola/random, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"sEx" = ( +/turf/open/floor/plasteel/escape{ + dir = 8 + }, +/area/space) +"sEy" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/space) +"sEz" = ( +/turf/closed/wall, +/area/space) +"sEA" = ( +/obj/structure/table, +/obj/item/storage/pill_bottle/dice, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sEB" = ( +/turf/open/floor/plasteel/escape, +/area/space) +"sEC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/escape, +/area/space) +"sED" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/escape, +/area/space) +"sEE" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sEF" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"sEG" = ( +/obj/structure/fans/tiny, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sEH" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"sEI" = ( +/turf/closed/wall/rust, +/area/crew_quarters/dorms) +"sEJ" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/neutral/corner, +/area/hallway/primary/central) +"sEK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sEL" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sEM" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sEN" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering{ + name = "Technology Storage"; + req_access_txt = "23" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/vault, +/area/hallway/primary/central) +"sEO" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sEP" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sEQ" = ( +/obj/structure/sign/securearea, +/turf/closed/wall, +/area/hallway/primary/central) +"sER" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plating, +/area/space) +"sES" = ( +/turf/closed/wall, +/area/space) +"sET" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"sEU" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"sEV" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"sEW" = ( +/turf/closed/wall, +/area/space) +"sEX" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/rack, +/obj/item/clothing/under/color/grey, +/obj/item/clothing/mask/gas, +/obj/machinery/atmospherics/components/unary/vent_pump, +/turf/open/floor/plasteel, +/area/space) +"sEY" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall, +/area/space) +"sEZ" = ( +/obj/machinery/vending/snack/random, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"sFa" = ( +/turf/open/floor/plasteel, +/area/space) +"sFb" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/escape{ + dir = 4 + }, +/area/space) +"sFc" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall, +/area/space) +"sFd" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sFe" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/folder/yellow, +/obj/item/pen, +/obj/machinery/door/window/southleft{ + dir = 2; + name = "Cargo Desk"; + req_access_txt = "50" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sFf" = ( +/obj/structure/plasticflaps{ + opacity = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sFg" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/space) +"sFh" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sFi" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/vacuum, +/turf/open/floor/plating, +/area/space) +"sFj" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sFk" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sFl" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sFm" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/hallway/primary/central) +"sFn" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/circuitboard/computer/cloning{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/circuitboard/machine/clonepod, +/obj/item/circuitboard/machine/clonescanner, +/obj/item/circuitboard/computer/med_data{ + pixel_x = -3; + pixel_y = -3 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, +/area/hallway/primary/central) +"sFo" = ( +/turf/open/floor/plasteel/vault/side{ + dir = 9 + }, +/area/hallway/primary/central) +"sFp" = ( +/turf/open/floor/plasteel/vault/side{ + dir = 5 + }, +/area/hallway/primary/central) +"sFq" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/clipboard, +/obj/item/crowbar/red, +/obj/item/device/aicard, +/obj/item/device/analyzer, +/obj/item/device/assembly/flash/handheld, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, +/area/hallway/primary/central) +"sFr" = ( +/obj/structure/closet/firecloset, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"sFs" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sFt" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sFu" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating, +/area/space) +"sFv" = ( +/obj/machinery/button/door{ + id = "supplybridge"; + name = "Shuttle Bay Space Bridge Control"; + pixel_y = 27; + req_access_txt = "0" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Bridge Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sFw" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sFx" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sFy" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sFz" = ( +/obj/machinery/button/door{ + id = "supplybridge"; + name = "Shuttle Bay Space Bridge Control"; + pixel_y = 27; + req_access_txt = "0" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Bridge Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sFA" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating, +/area/space) +"sFB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"sFC" = ( +/obj/effect/turf_decal/bot, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/space) +"sFD" = ( +/obj/machinery/light, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/escape{ + dir = 10 + }, +/area/space) +"sFE" = ( +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/space) +"sFF" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/space) +"sFG" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/brown{ + dir = 9 + }, +/area/space) +"sFH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/brown{ + dir = 1 + }, +/area/space) +"sFI" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/space) +"sFJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/brown{ + dir = 1 + }, +/area/space) +"sFK" = ( +/turf/open/floor/plasteel/brown{ + dir = 5 + }, +/area/space) +"sFL" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"sFM" = ( +/obj/structure/fans/tiny, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sFN" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/space) +"sFO" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, +/area/maintenance/port/central) +"sFP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"sFQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, +/area/hallway/primary/central) +"sFR" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/circuitboard/machine/autolathe{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/circuitboard/machine/microwave, +/obj/item/circuitboard/computer/secure_data{ + pixel_x = -3; + pixel_y = -3 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, +/area/hallway/primary/central) +"sFS" = ( +/turf/open/floor/plasteel/vault/side{ + dir = 10 + }, +/area/hallway/primary/central) +"sFT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel/vault/side{ + dir = 6 + }, +/area/hallway/primary/central) +"sFU" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/clothing/gloves/color/yellow, +/obj/item/storage/toolbox/electrical, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, +/obj/item/stock_parts/cell/high, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, +/area/hallway/primary/central) +"sFV" = ( +/turf/open/floor/plating, +/area/hallway/primary/central) +"sFW" = ( +/turf/closed/wall/rust, +/area/hallway/secondary/exit) +"sFX" = ( +/obj/structure/table, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, +/area/hallway/secondary/exit) +"sFY" = ( +/obj/structure/table, +/obj/effect/turf_decal/stripes/line, +/obj/item/crowbar, +/obj/item/crowbar, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, +/area/hallway/secondary/exit) +"sFZ" = ( +/turf/closed/wall, +/area/space) +"sGa" = ( +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: EXTERNAL AIRLOCK" + }, +/turf/closed/wall, +/area/space) +"sGb" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"sGc" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"sGd" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"sGe" = ( +/obj/structure/sign/vacuum, +/turf/closed/wall, +/area/space) +"sGf" = ( +/turf/closed/wall, +/area/space) +"sGg" = ( +/turf/closed/wall, +/area/space) +"sGh" = ( +/turf/closed/wall, +/area/space) +"sGi" = ( +/turf/closed/wall, +/area/space) +"sGj" = ( +/turf/closed/wall, +/area/space) +"sGk" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sGl" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-21" + }, +/turf/open/floor/plasteel/brown{ + dir = 8 + }, +/area/space) +"sGm" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/plasteel/neutral, +/area/space) +"sGn" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sGo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/landmark/lightsout, +/turf/open/floor/plasteel/neutral, +/area/space) +"sGp" = ( +/turf/open/floor/plasteel/brown{ + dir = 4 + }, +/area/space) +"sGq" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sGr" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sGs" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sGt" = ( +/turf/closed/wall/rust, +/area/crew_quarters/dorms) +"sGu" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/rust, +/area/crew_quarters/theatre) +"sGv" = ( +/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg2" + }, +/area/hallway/primary/central) +"sGw" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sGx" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall, +/area/hallway/primary/central) +"sGy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering{ + name = "Technology Storage"; + req_access_txt = "23" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/vault, +/area/hallway/primary/central) +"sGz" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sGA" = ( +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/hallway/primary/central) +"sGB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) +"sGC" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/escape{ + dir = 8 + }, +/area/hallway/secondary/exit) +"sGD" = ( +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) +"sGE" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sGF" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sGG" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sGH" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sGI" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sGJ" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sGK" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sGL" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sGM" = ( +/turf/closed/wall, +/area/space) +"sGN" = ( +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen/red, +/obj/item/stamp/denied{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/stamp, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/turf/open/floor/plasteel/brown{ + dir = 8 + }, +/area/space) +"sGO" = ( +/obj/structure/closet/crate, +/obj/machinery/ai_status_display{ + pixel_y = -32 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sGP" = ( +/obj/structure/closet/crate, +/obj/item/device/radio/intercom{ + name = "Station Intercom"; + pixel_y = -24 + }, +/obj/machinery/light, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sGQ" = ( +/obj/structure/closet/crate, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/space) +"sGR" = ( +/obj/structure/closet/crate, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/space) +"sGS" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sGT" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sGU" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 8 + }, +/turf/closed/wall/r_wall/rust, +/area/engine/atmos) +"sGV" = ( +/turf/closed/wall/r_wall/rust, +/area/engine/atmos) +"sGW" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, +/area/maintenance/port/central) +"sGX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sGY" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sGZ" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sHa" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sHb" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/hallway/primary/central) +"sHc" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sHd" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, +/area/hallway/primary/central) +"sHe" = ( +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sHf" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) +"sHg" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/escape{ + dir = 4 + }, +/area/hallway/secondary/exit) +"sHh" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHi" = ( +/obj/structure/window/reinforced/tinted/fulltile, +/obj/structure/grille, +/turf/open/floor/plating, +/area/space) +"sHj" = ( +/obj/structure/window/reinforced/tinted/fulltile, +/obj/structure/grille, +/turf/open/floor/plating, +/area/space) +"sHk" = ( +/obj/structure/window/reinforced/tinted/fulltile, +/obj/structure/grille, +/turf/open/floor/plating, +/area/space) +"sHl" = ( +/obj/structure/window/reinforced/tinted/fulltile, +/obj/structure/grille, +/turf/open/floor/plating, +/area/space) +"sHm" = ( +/obj/structure/window/reinforced/tinted/fulltile, +/obj/structure/grille, +/turf/open/floor/plating, +/area/space) +"sHn" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHo" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"sHp" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHq" = ( +/turf/closed/wall, +/area/space) +"sHr" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"sHs" = ( +/turf/closed/wall, +/area/space) +"sHt" = ( +/turf/closed/wall, +/area/space) +"sHu" = ( +/turf/closed/wall, +/area/space) +"sHv" = ( +/turf/closed/wall, +/area/space) +"sHw" = ( +/turf/closed/wall, +/area/space) +"sHx" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHy" = ( +/turf/closed/wall/r_wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"sHz" = ( +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, +/area/hallway/primary/central) +"sHA" = ( +/turf/closed/wall/rust, +/area/hallway/secondary/exit) +"sHB" = ( +/turf/open/floor/plasteel/escape{ + dir = 8 + }, +/area/hallway/secondary/exit) +"sHC" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/neutral/side{ + dir = 4 + }, +/area/hallway/secondary/exit) +"sHD" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHE" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/space) +"sHF" = ( +/obj/structure/table/wood, +/obj/item/storage/secure/briefcase, +/obj/item/restraints/handcuffs, +/obj/item/grenade/smokebomb, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/space) +"sHG" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/suit/jacket{ + desc = "All the class of a trenchcoat without the security fibers."; + icon_state = "greydet"; + name = "trenchcoat" + }, +/obj/item/clothing/suit/jacket{ + desc = "All the class of a trenchcoat without the security fibers."; + icon_state = "detective"; + name = "trenchcoat" + }, +/obj/item/clothing/head/fedora, +/obj/item/clothing/head/fedora{ + icon_state = "detective" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"sHH" = ( +/obj/structure/dresser, +/turf/open/floor/wood, +/area/space) +"sHI" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/space) +"sHJ" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHK" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"sHL" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"sHM" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHN" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHO" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHP" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHQ" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHR" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHS" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHT" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHU" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sHV" = ( +/turf/closed/wall/r_wall/rust, +/area/engine/engineering) +"sHW" = ( +/turf/closed/wall/rust, +/area/crew_quarters/dorms) +"sHX" = ( +/turf/closed/wall/rust, +/area/crew_quarters/dorms) +"sHY" = ( +/turf/closed/wall/rust, +/area/crew_quarters/dorms) +"sHZ" = ( +/turf/closed/wall/rust, +/area/crew_quarters/theatre) +"sIa" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/escape{ + dir = 1 + }, +/area/hallway/secondary/exit) +"sIb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) +"sIc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/airalarm{ + pixel_y = 24 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) +"sId" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/neutral/side{ + dir = 4 + }, +/area/hallway/secondary/exit) +"sIe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) +"sIf" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sIg" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/space) +"sIh" = ( +/obj/structure/table/wood, +/obj/item/crowbar/red, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/book/manual/detective, +/obj/item/device/camera/detective, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"sIi" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/obj/effect/landmark/revenantspawn, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/wood, +/area/space) +"sIj" = ( +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken" + }, +/area/space) +"sIk" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/space) +"sIl" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sIm" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) +"sIn" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"sIo" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"sIp" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"sIq" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"sIr" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"sIs" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"sIt" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/space, +/area/space) +"sIu" = ( +/turf/closed/wall/r_wall/rust, +/area/engine/gravity_generator) +"sIv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/escape, +/area/hallway/secondary/exit) +"sIw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = -28 + }, +/obj/machinery/camera{ + c_tag = "Departures Hallway"; + dir = 1 + }, +/turf/open/floor/plasteel/escape, +/area/hallway/secondary/exit) +"sIx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) +"sIy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/escape/corner{ + dir = 8 + }, +/area/hallway/secondary/exit) +"sIz" = ( +/turf/closed/wall/r_wall/rust, +/area/engine/gravity_generator) +"sIA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/engine/engineering) +"sIB" = ( +/turf/closed/wall/rust, +/area/hydroponics) +"sIC" = ( +/turf/closed/wall/rust, +/area/crew_quarters/kitchen) +"sID" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sIE" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall, +/area/hallway/secondary/exit) +"sIF" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sIG" = ( +/obj/machinery/vending/cigarette, +/obj/machinery/newscaster{ + pixel_y = -30 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, +/area/hallway/secondary/exit) +"sIH" = ( +/turf/closed/wall/r_wall/rust, +/area/engine/gravity_generator) +"sII" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall/rust, +/area/engine/gravity_generator) +"sIJ" = ( +/turf/closed/wall/r_wall/rust, +/area/engine/engineering) +"sIK" = ( +/turf/closed/wall/rust, +/area/janitor) +"sIL" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, +/area/maintenance/starboard/central) +"sIM" = ( +/obj/structure/closet/emcloset{ + anchored = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) +"sIN" = ( +/obj/structure/sign/securearea, +/turf/closed/wall/rust, +/area/hallway/secondary/exit) +"sIO" = ( +/turf/open/space/basic, +/area/space/nearstation) +"sIP" = ( +/obj/machinery/vending/cola/random, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/vault/side{ + dir = 4 + }, +/area/hallway/secondary/exit) +"sIQ" = ( +/turf/open/floor/plasteel/escape{ + dir = 8 + }, +/area/hallway/secondary/exit) +"sIR" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) +"sIS" = ( +/turf/closed/wall/rust, +/area/hydroponics) +"sIT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/hallway/secondary/exit) +"sIU" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sIV" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sIW" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sIX" = ( +/turf/closed/wall/rust, +/area/hallway/secondary/exit) +"sIY" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/rack, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/item/storage/toolbox/emergency, +/obj/item/crowbar/red, +/obj/item/clothing/mask/gas, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) +"sIZ" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall, +/area/hallway/secondary/exit) +"sJa" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/neutral/corner{ + dir = 4 + }, +/area/hallway/primary/central) +"sJb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/hallway/primary/central) +"sJc" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, +/area/hallway/secondary/exit) +"sJd" = ( +/obj/machinery/button/door{ + id = "supplybridge"; + name = "Shuttle Bay Space Bridge Control"; + pixel_y = 27; + req_access_txt = "0" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Bridge Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sJe" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sJf" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sJg" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/hallway/secondary/exit) +"sJh" = ( +/obj/machinery/button/door{ + id = "supplybridge"; + name = "Shuttle Bay Space Bridge Control"; + pixel_y = 27; + req_access_txt = "0" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Bridge Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sJi" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sJj" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sJk" = ( +/obj/machinery/light, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/escape{ + dir = 10 + }, +/area/hallway/secondary/exit) +"sJl" = ( +/turf/closed/wall/r_wall/rust, +/area/engine/gravity_generator) +"sJm" = ( +/turf/closed/wall/rust, +/area/janitor) +"sJn" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, +/area/crew_quarters/bar/atrium) +"sJo" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, +/area/maintenance/starboard/central) +"sJp" = ( +/turf/closed/wall/rust, +/area/hallway/secondary/exit) +"sJq" = ( +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: EXTERNAL AIRLOCK" + }, +/turf/closed/wall, +/area/hallway/secondary/exit) +"sJr" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sJs" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sJt" = ( +/obj/machinery/door/poddoor/shutters{ + id = "supplybridge" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit) +"sJu" = ( +/obj/structure/sign/vacuum, +/turf/closed/wall, +/area/hallway/secondary/exit) +"sJv" = ( +/turf/closed/wall/rust, +/area/hallway/secondary/exit) +"sJw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall/rust, +/area/engine/gravity_generator) +"sJx" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, +/area/hydroponics) +"sJy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/tcommsat/server) +"sJz" = ( +/turf/closed/wall/r_wall/rust, +/area/engine/engineering) +"sJA" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/vault/side, +/area/hallway/primary/central) +"sJB" = ( +/turf/closed/wall/rust, +/area/hallway/secondary/exit) +"sJC" = ( +/turf/closed/wall/rust, +/area/hallway/secondary/exit) +"sJD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall/r_wall/rust, +/area/tcommsat/server) +"sJE" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, /area/maintenance/port) +"sJF" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/tcommsat/server) +"sJG" = ( +/turf/closed/wall/r_wall/rust, +/area/engine/supermatter) +"sJH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/maintenance/port) +"sJI" = ( +/turf/closed/wall/rust, +/area/library) +"sJJ" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, +/area/hallway/primary/central) +"sJK" = ( +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, +/area/hallway/primary/central) +"sJL" = ( +/turf/closed/wall/r_wall, +/area/science/research) +"sJM" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sJN" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sJO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/vault/side, +/area/tcommsat/server) +"sJP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/vault/side, +/area/tcommsat/server) +"sJQ" = ( +/turf/closed/wall/r_wall, +/area/science/research) +"sJR" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sJS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken7" + }, +/area/library) +"sJT" = ( +/turf/closed/wall/rust, +/area/medical/morgue) +"sJU" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sJV" = ( +/turf/closed/wall/r_wall/rust, +/area/tcommsat/server) +"sJW" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/maintenance/port) +"sJX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/library) +"sJY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/library) +"sJZ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/library) +"sKa" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall/rust, +/area/science/research) +"sKb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/maintenance/port) +"sKc" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/maintenance/port) +"sKd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken" + }, +/area/library) +"sKe" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood{ + broken = 1; + icon_state = "wood-broken2" + }, +/area/library) +"sKf" = ( +/turf/closed/wall/rust, +/area/science/research) +"sKg" = ( +/turf/closed/wall/r_wall/rust, +/area/tcommsat/server) +"sKh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/science/research) +"sKi" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sKj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/vault/telecomms{ + dir = 5 + }, +/area/tcommsat/server) +"sKk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/vault/telecomms{ + dir = 5 + }, +/area/tcommsat/server) +"sKl" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sKm" = ( +/turf/closed/wall/r_wall/rust, +/area/tcommsat/server) +"sKn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/vault/telecomms{ + dir = 5 + }, +/area/tcommsat/server) +"sKo" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/maintenance/port) +"sKp" = ( +/turf/closed/wall/rust, +/area/medical/medbay/zone3) +"sKq" = ( +/turf/closed/wall/rust, +/area/hallway/primary/central) +"sKr" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sKs" = ( +/turf/closed/wall/r_wall/rust, +/area/tcommsat/server) +"sKt" = ( +/turf/closed/wall/r_wall/rust, +/area/tcommsat/server) +"sKu" = ( +/turf/closed/wall/rust, +/area/library) +"sKv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/science/research) +"sKw" = ( +/turf/closed/wall/r_wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"sKx" = ( +/turf/closed/wall/r_wall/rust, +/area/maintenance/port) +"sKy" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sKz" = ( +/turf/closed/wall/r_wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"sKA" = ( +/turf/closed/wall/rust, +/area/library) +"sKB" = ( +/turf/closed/wall/rust, +/area/security/checkpoint) +"sKC" = ( +/turf/closed/wall/r_wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"sKD" = ( +/turf/closed/wall/rust, +/area/library) +"sKE" = ( +/turf/closed/wall/rust, +/area/maintenance/port) +"sKF" = ( +/turf/closed/wall/rust, +/area/medical/medbay/zone3) +"sKG" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sKH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/rust, +/area/maintenance/port) +"sKI" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/rust, +/area/maintenance/port) +"sKJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/science/robotics/lab) +"sKK" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sKL" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall/rust, +/area/maintenance/port) +"sKM" = ( +/turf/closed/wall/rust, +/area/maintenance/port) +"sKN" = ( +/turf/closed/wall/rust, +/area/medical/medbay/zone3) +"sKO" = ( +/turf/closed/wall/rust, +/area/security/checkpoint) +"sKP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall/rust, +/area/science/robotics/mechbay) +"sKQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall/rust, +/area/science/robotics/lab) +"sKR" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sKS" = ( +/turf/closed/wall/rust, +/area/maintenance/port) +"sKT" = ( +/turf/closed/wall/rust, +/area/maintenance/port) +"sKU" = ( +/turf/closed/wall/rust, +/area/maintenance/port) +"sKV" = ( +/turf/closed/wall/rust, +/area/maintenance/port) +"sKW" = ( +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/maintenance/port) +"sKX" = ( +/turf/closed/wall/rust, +/area/maintenance/port) +"sKY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, +/area/maintenance/starboard) +"sKZ" = ( +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) +"sLa" = ( +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) +"sLb" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sLc" = ( +/obj/structure/barricade/wooden, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) +"sLd" = ( +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) +"sLe" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sLf" = ( +/turf/closed/wall/rust, +/area/chapel/main) +"sLg" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-22" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/vault/side{ + dir = 1 + }, +/area/maintenance/starboard) +"sLh" = ( +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) +"sLi" = ( +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) +"sLj" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sLk" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard) +"sLl" = ( +/turf/closed/wall/rust, +/area/ruin/unpowered{ + name = "Asteroid" + }) +"sLm" = ( +/turf/closed/wall/rust, +/area/hallway/secondary/entry) +"sLn" = ( +/turf/closed/wall/rust, +/area/chapel/main) +"sLo" = ( +/turf/closed/wall/rust, +/area/chapel/main) +"sLp" = ( +/turf/closed/wall/rust, +/area/chapel/main) +"sLq" = ( +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) +"sLr" = ( +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) +"sLs" = ( +/turf/closed/wall/rust, +/area/chapel/main) +"sLt" = ( +/turf/closed/wall/rust, +/area/chapel/main) +"sLu" = ( +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) +"sLv" = ( +/turf/closed/wall/rust, +/area/hallway/secondary/entry) (1,1,1) = {" aaa @@ -62091,11 +66893,11 @@ aad aad aad aGe +sIz aGe aGe aGe -aGe -aGe +sJl bwY abi aad @@ -62347,7 +67149,7 @@ aad aad aad aad -aGe +sIu aHe aIb aJh @@ -62605,14 +67407,14 @@ aad aad aad aGe -aHf +aId aIc aJi aKq aLE -bwY +sJw afM -abP +abu afM abi aad @@ -62865,22 +67667,22 @@ aGe aHg aId aHe -aKr +aKq aLF bxj +sJy bxl -bxl -bxl +sJF aSO aMJ aMJ +sJV aMJ aMJ aMJ +sKm aMJ -aMJ -aMJ -abP +abu aad aad aaa @@ -63120,7 +67922,7 @@ aad aad aGe aGe -aGe +sIH aJj aKs aLG @@ -63135,10 +67937,10 @@ aTX buH buJ buO -aRB +sKn aMJ acG -ahu +sKz aad aac aaa @@ -63386,12 +68188,12 @@ aNU aOw buC bxp -aRB +sJO aPG aQG aUO buK -aRB +sKj buR aMJ afM @@ -63891,7 +68693,7 @@ aad aad aad afL -bwY +sII aJm aKv aLJ @@ -63900,12 +68702,12 @@ aNW aOx buC bxp -aRB +sJP aPG buG buI buK -aRB +sKk buR aMJ aad @@ -64144,7 +68946,7 @@ aAh aBp aCr aqz -ahu +sHy ahu ahu aaV @@ -64164,7 +68966,7 @@ blq buN buQ buU -aMJ +sKs agE afL aad @@ -64404,27 +69206,27 @@ aDn aEn aFq aGf -aHh +sIA aIe aJo aKx aLL aMN aMN -aMN +sJD aMN bxt bwW aMJ aMJ aMJ +sKg aMJ aMJ -aMJ -aMJ +sKt abi ahu -ahu +sKC aac aaa aaa @@ -64644,11 +69446,11 @@ aad aad abi ajQ -aqz +sAx arr -asy +awC atz -aus +ayb avy awC axj @@ -64897,7 +69699,7 @@ aaW abj abj abu -abP +abu aad aad acF @@ -64914,7 +69716,7 @@ azj aAk aBq aCu -aDp +sGU aEp aFs aGh @@ -65160,7 +69962,7 @@ abi abu awL art -asA +atB atB auu avA @@ -65180,8 +69982,8 @@ aIh aJr aKz aLO -aMQ -aMQ +aOB +aOB aOB aLU aQK @@ -65193,7 +69995,7 @@ aVL aUR aUQ bvo -ahu +sKw aad aac bvI @@ -65422,9 +70224,9 @@ atC auv avB awF -axl +awF aye -axl +awF aAm aBs aCw @@ -65440,7 +70242,7 @@ buW aMR aMX aMX -buW +sJG aQK aRI aSS @@ -65451,7 +70253,7 @@ aWz aVL bvo ahu -bvh +bvg bvg aad aad @@ -65675,7 +70477,7 @@ anx aqC arv asC -atD +auw auw auw auw @@ -65706,7 +70508,7 @@ aUR aUU aWz aUQ -bvh +bvg bvo aad aad @@ -65924,7 +70726,7 @@ abu abj aad aaV -abP +abu amG anx aoq @@ -65944,7 +70746,7 @@ aBu aCy aDp aEt -aEt +sHV aGg aHn aIk @@ -65964,7 +70766,7 @@ aUU aWz aVL bvg -bvh +bvg aad aad aad @@ -66182,7 +70984,7 @@ abj abj abu abu -adw +acF anx aor apv @@ -66205,8 +71007,8 @@ aFw aGk aHo aIl -aJv -aKB +aLR +aMU aLR aMU aOa @@ -66434,25 +71236,25 @@ aad aad aad abi -ail +ael abj abu abu alG -adw +acF anx aoq apw aqF ary asF -atG +azm auz avE awI axn ayi -azn +azo aAo aBw aCA @@ -66477,7 +71279,7 @@ aUS aUU aWz aVL -bvh +bvg aad aad aad @@ -66726,7 +71528,7 @@ aMW aMW aOD buW -aQQ +aQK aRN aSX aPL @@ -66957,7 +71759,7 @@ agE abi aad abi -awL +sAy arA asH atI @@ -66970,7 +71772,7 @@ azp aAq aBy aCC -aqz +sGV aEt aEt aGg @@ -66995,11 +71797,11 @@ bvo aOH aZo baj -baj +sKE baj aZo aZo -baj +sKM baj aad aad @@ -67231,12 +72033,12 @@ aDs aEx aFz aGm -aHs +aHl aIp -aJx +aJw aKE aLU -aMY +aOE aOb aOE aLO @@ -67249,15 +72051,15 @@ aUU aWz aUQ aad -aOH +sKx aZp bak bbc bbQ -swy +bcF bdD beu -baj +sKS aad aad aad @@ -67454,7 +72256,7 @@ aac aad aad aad -aah +swF aad aad aad @@ -67491,15 +72293,15 @@ aGn aHt aIq aJy -aKF +aJy aLV aMZ -aOc +aMZ aOF aPM aQS aRQ -aSQ +bxu aUa aUU aUU @@ -67511,7 +72313,7 @@ aZq bal bbd bbR -bbR +bcG bdE bev baj @@ -67721,16 +72523,16 @@ afL ahu agF agF +syh agF agF agF -agF -agF +szn agF agF aqH arC -arC +sBu arC auE avJ @@ -67760,7 +72562,7 @@ aTa aEt bvo bvg -bvh +bvg bvo bvo aOH @@ -67975,7 +72777,7 @@ aad aad abT agE -ahu +sxc aim aiR ajR @@ -68003,7 +72805,7 @@ aEA aDv aDv aHv -aEt +sIJ aJA aKH aLX @@ -68011,14 +72813,14 @@ aEt aEt aOH aPO +sJH aQU aQU +sJW +sKb aQU aQU -aQU -aQU -aQU -aQU +sKo aQU aQU aZs @@ -68232,7 +73034,7 @@ aad aad afL abj -ahu +sxd ain aiS ajS @@ -68272,16 +73074,16 @@ bxR aRS aTb aUb -aRS +sKc aVM aTb -aXd -aQV aTb -aZt +aTb +aVM +aTb bao bbf -bbU +aZA bbR bdF bcK @@ -68523,7 +73325,7 @@ aKJ aLZ aNb aEt -aOJ +bbg aPQ aQW aQW @@ -68535,7 +73337,7 @@ aQW aQW aQW aQW -aQW +sKA aQW bbg aZz @@ -68741,7 +73543,7 @@ aad aad abi abi -abT +swN abi abT acG @@ -68762,7 +73564,7 @@ asM agF auI avN -aqz +sDk axw ayo azv @@ -68780,7 +73582,7 @@ aKK aMa aNc aEt -aOK +bbg aPR aQW aRT @@ -68795,11 +73597,11 @@ aYw aZu aQW aYA -aPV +sKH bcK bdH bex -baj +sKT aad aad aad @@ -69000,8 +73802,8 @@ aaW abj adv ael -abT -abP +swW +abu agF ahv aiq @@ -69036,14 +73838,14 @@ aJE aKL aMb aNd -aEt +sJz aOL aPS -aQW -aRU +sJI +aSc aTc aUd -aSa +sKd aVO aWB aVO @@ -69054,7 +73856,7 @@ aQW bbh aPV baj -bca +sKL baj aZo aad @@ -69259,7 +74061,7 @@ abu acF abi afN -agF +swZ ahw air aiW @@ -69294,7 +74096,7 @@ aKM aMa aNe aEt -aOL +sJE aPT aQW aRV @@ -69308,7 +74110,7 @@ aXM aYy aZw aQW -bbi +bbg bbV bcL bdI @@ -69512,7 +74314,7 @@ abj abj abS acD -adw +acF aem afb adw @@ -69564,7 +74366,7 @@ aVQ aQW aQW aQW -aQW +sKD bbj bbW bcM @@ -69770,9 +74572,9 @@ abj abu acE adx -aen +acF adz -afc +adw agF ahy ait @@ -69813,15 +74615,15 @@ aPV aQW aRX aTf -aUf +sJX aUX aVR aVQ aXg aQW aYz -aZx -aRS +aTb +aTb bbk bbV bcN @@ -69833,7 +74635,7 @@ aad aad abT abT -abT +sLl abT abT aad @@ -70026,12 +74828,12 @@ aad aaW abu acF -ady +acF aeo abi -afO -agF +acF agF +sxe agF aiZ ajZ @@ -70070,13 +74872,13 @@ aPW aQW aRY aTg -aUf +sJY bxS aVS aWE aXh aQW -aYA +bbg aZy bap bap @@ -70084,10 +74886,10 @@ bbX bcO bdL beB -baj -bfu +sKU bfu bfu +sLf bfu bhZ biF @@ -70284,7 +75086,7 @@ abi abi acG adz -abT +swR abi acF agG @@ -70327,21 +75129,21 @@ aPX aQX aRZ aTh -aUf +sJZ aUY aVT aVQ aXi aQW -aYB +bbg aZz baq bbl bbY bcP bdM -bcQ -baj +bcP +sKV bfv bfS bgB @@ -70540,13 +75342,13 @@ aad aad abT acH -acF +swO aep -afc acF +aem agH ahA -agF +sxB ajb akb ala @@ -70585,17 +75387,17 @@ aQY aSa aSa aUg -aUX +sKe aVU aWE aXj -aQW +sKu aYC aZA bar bbm bbZ -bcQ +bcP bcP bcP baj @@ -70607,7 +75409,7 @@ bib biH bjh bfu -bfu +sLp bfu aac aaa @@ -70798,11 +75600,11 @@ aad abT abT abT +swS +swX abT abT -abT -abT -abT +sxf agF ajc ajc @@ -70840,14 +75642,14 @@ aOR aPZ aQZ aSb -aSb +sJS aUh aUZ aVV aVQ aXk aQW -aYD +bbg aPV bas bbn @@ -71108,7 +75910,7 @@ aYE aZB bap bap -bap +sKI bap bap bap @@ -71332,7 +76134,7 @@ asT atN auS avX -awQ +sDl axE ayw azA @@ -71343,7 +76145,7 @@ aDD aEL awQ aGz -aHG +aGM aIB aJJ aKQ @@ -71362,13 +76164,13 @@ aWG aXl aQW aYF -bxU +bxR aRS -bbo +aTb bcb bcS -bdO -beD +aTb +aVM beR bfy bfT @@ -71379,7 +76181,7 @@ biG bjk bjA bjL -bfu +sLs aaa aaa aaa @@ -71566,7 +76368,7 @@ aac aac aad aad -abv +swG acK adC aes @@ -71579,7 +76381,7 @@ ajf ake ald abt -abt +syS abt abt apI @@ -71598,7 +76400,7 @@ aBP aCO aDE aEM -awQ +sHW aGA aHH aIC @@ -71611,7 +76413,7 @@ aOU aQc aRb aRb -aRb +sJT aRb aRb aRb @@ -71621,7 +76423,7 @@ aSh aSh aSh aSh -aSh +sKF bcc bcT bdP @@ -71633,7 +76435,7 @@ bgE bhr bif biL -bfu +sLn bfu bfu bfu @@ -71873,7 +76675,7 @@ aUk aVc aVY aWH -aSh +sKp aXO aYG aZC @@ -71883,7 +76685,7 @@ aSh aSh aSh aSh -beT +bbg bfA bfu bgF @@ -72096,7 +76898,7 @@ alU amP abt abt -apI +sAc aqU arR asW @@ -72106,7 +76908,7 @@ avZ awQ awQ awQ -awQ +sEI aAH bxK awQ @@ -72114,11 +76916,11 @@ awQ awQ awQ aGC -aHJ -aIB -aIB +aGK +sIK aIB aIB +sJm aIB aIB aOW @@ -72140,7 +76942,7 @@ bcd bcU bdQ aSh -beU +bbg bfA bfV bgG @@ -72340,7 +77142,7 @@ abv abv abv abv -abv +swT afi afU afU @@ -72351,7 +77153,7 @@ akh alf alV amQ -anK +anJ aoD apI aqV @@ -72360,16 +77162,16 @@ asX atR auV awa -awQ +sDm axH ayz azD aAH aBQ -sww +azD aDG aEO -awQ +sHX aGD aHK aIE @@ -72396,7 +77198,7 @@ aSh bce bcV bdR -aSh +sKN beV bfB bfW @@ -72407,7 +77209,7 @@ biO bfu bfu bfu -bfu +sLt aaa aaa aaa @@ -72609,7 +77411,7 @@ abt alW amR abt -abt +szG apI aqW arT @@ -72634,7 +77436,7 @@ aJM aKU aMj aNo -aOg +aJM aOY aQf abt @@ -72654,7 +77456,7 @@ bcf bcW blt aSh -beW +aOL bfA bfX bgI @@ -72853,12 +77655,12 @@ aad abw abw abw -abw +swP abw abw afW abw -abw +sxg abw ajk akj @@ -72887,14 +77689,14 @@ awQ bxN aHM aHM -aHM +sIS aHM aHM aHM aHM aOZ bxQ -ayV +sJJ aSh aTm aUo @@ -72911,7 +77713,7 @@ bcg bcX bdS aSh -bbg +aOL bfy bfY bgJ @@ -73107,7 +77909,7 @@ aad aad aad aad -abw +swC abX acO adG @@ -73120,12 +77922,12 @@ abw ajl akk alg -alg +syC alg alg alg apJ -apJ +sAz apI aHF atU @@ -73134,14 +77936,14 @@ apI awQ axJ ayB -swv +azD aAH aBS -swx +azD ayz aEQ -awQ -aGF +sHY +arY aHM aIG aJN @@ -73168,7 +77970,7 @@ aUn aWb bdT aSh -beY +bbg bfA bfZ bgK @@ -73404,11 +78206,11 @@ aIH aJO aKW aMl -aIH +sJx aOh aPb aQd -azU +sJK aSi aTo aUq @@ -73438,14 +78240,14 @@ aaa aaa aaa bgU -bkh +bkj bgU aae aaa aaa aae bgU -bkh +bkj bgU aaa aaa @@ -73635,7 +78437,7 @@ blf akm ali alZ -amU +anM bxB anM apL @@ -73647,16 +78449,16 @@ atc awe awQ awQ +sEk awQ awQ awQ -awQ -awQ +sGt awQ awQ awQ arY -aHM +sIB aII aJP aKX @@ -73689,7 +78491,7 @@ bgM bhx bin biT -bfu +sLo aae aae aae @@ -73900,18 +78702,18 @@ alg arX atd atW -atd -atd +sCr +aBU bxE -axL -ayD -atd -atd aBU -ayD -atd aBU -aFM +atd +atd +sFO +aBU +sGW +aBU +atd aGH aHM aIJ @@ -73939,7 +78741,7 @@ bci bcZ bdW aSh -beU +bbg bfA bfu bfu @@ -73962,7 +78764,7 @@ bgU bkj bgU bjY -bgP +sLv bgU bgU aae @@ -74150,7 +78952,7 @@ ako alj amb amW -anO +amW aoH apN alg @@ -74160,12 +78962,12 @@ ath auZ auZ auZ +sDK auZ auZ auZ auZ -auZ -auZ +sGu auZ auZ auZ @@ -74412,7 +79214,7 @@ aoI apO alg arZ -atf +sBv atX ava awf @@ -74453,7 +79255,7 @@ aWK bda bdX aSh -bfc +aYF bfE bdO bgO @@ -74646,11 +79448,11 @@ aaf aaa aai aay -aak +sww aam aak abw -abw +swH abw abw abw @@ -74665,10 +79467,10 @@ alg amd amY alg +szH alg alg -alg -asa +arY atf atY avb @@ -74682,7 +79484,7 @@ aBW aCQ aDK aET -aAL +sHZ aGK aHP aIM @@ -74710,7 +79512,7 @@ bcj bdb bdY aSh -bar +sKW bfF aZo bgP @@ -74909,8 +79711,8 @@ abk aby acd acU -adM -adM +aby +aby bxx age agV @@ -74935,7 +79737,7 @@ axN ayG azG aAM -atZ +sFP aCR aDL aEU @@ -74950,7 +79752,7 @@ aNv aOh aPb aQg -aRj +aRg aSn aTu aUw @@ -75187,8 +79989,8 @@ ath aua avd awi -awi -awi +sDn +sDL ayH azH auZ @@ -75209,7 +80011,7 @@ aPh aQk aRf aRg -aTv +aRf aRg aRf aRg @@ -75224,7 +80026,7 @@ aSh aWK bea beG -baj +sKX bfH baj bgQ @@ -75427,7 +80229,7 @@ aak aak aak aak -aak +sxa aak aak ajq @@ -75437,8 +80239,8 @@ ame ame abt aoL -apR -ara +arY +sAA ara ara aub @@ -75454,7 +80256,7 @@ aCT aDN aAL aAL -apS +aHF aHQ aIP aJV @@ -75679,7 +80481,7 @@ aba abm abB acg -acX +swJ adO aez afq @@ -76245,7 +81047,7 @@ aWQ abt aYc aYW -byo +sKB baI bby bcn @@ -76703,9 +81505,9 @@ aal aau aaG aaR -abc -abo -abD +swx +swy +swD aci adb adQ @@ -76756,7 +81558,7 @@ aUy aUy aUy aWS -abt +sKq aYe aYW byo @@ -76971,7 +81773,7 @@ afr afr ahc ahU -adQ +sxC ajv aky alr @@ -77022,7 +81824,7 @@ byo byo bdh byo -byo +sKO byo bfK avV @@ -77221,7 +82023,7 @@ abe abm abG acl -acX +swK adO aeF afs @@ -77258,7 +82060,7 @@ aHU aIQ aJX aLg -aAR +sJn ara aOr aPo @@ -77479,8 +82281,8 @@ aak abA acf add -aak -aak +swQ +swU aak aak aak @@ -77515,9 +82317,9 @@ aCe aCe aJY aLh -aMv +aAT ayP -ayV +sJA aPp aQt blp @@ -77550,14 +82352,14 @@ aaa bjO bjZ bka -bkm +bkb bka bkb bkb bkb bkb bkG -bkm +bkb bka bka aaa @@ -77728,7 +82530,7 @@ aaa aaf aae aae -aak +swv aaK aaT abg @@ -77741,7 +82543,7 @@ aeG aft agl ahe -ahW +agl abq ajy akB @@ -77772,7 +82574,7 @@ aCe aIR aJZ aLh -aMw +aso ayP ayP aPq @@ -77800,7 +82602,7 @@ bgl bgX bhL biA -bgP +sLm aae aae aae @@ -77996,7 +82798,7 @@ adf adT aeH afu -agm +acn ahf ahX aiC @@ -78029,7 +82831,7 @@ aHV aIS aKa aLh -aMx +sJo aNA ayP aPr @@ -78051,12 +82853,12 @@ bct bdl beg beL -bfi -bfP +aYu bfP bfP bfP bfP +sLh bfP bfP bfP @@ -78248,7 +83050,7 @@ aak aaj aak abs -abs +swI abs abs aeI @@ -78263,10 +83065,10 @@ alu amn ane alu +szI alu alu -alu -asm +asp atm aui avn @@ -78287,7 +83089,7 @@ aIT aKb aLh aCe -asn +aso ayP aPs aQv @@ -78307,8 +83109,8 @@ bbD bxV bdm beh -beL -bfj +sKP +bfp bfP blu bgY @@ -78522,7 +83324,7 @@ anf anU aoW aqc -alu +sAB bxC atm auj @@ -78532,7 +83334,7 @@ axb ara ayQ azN -aAU +asp aCe aCY aDV @@ -78544,7 +83346,7 @@ aIU aKc aLi aCe -asm +asp ayP aPt aQv @@ -78565,8 +83367,8 @@ bcv bdn bei beL -bfk -bfP +aTS +sKZ bgn bgZ bhM @@ -78574,7 +83376,7 @@ bfP bgn bgZ bhM -bfP +sLq aad aad aad @@ -79038,7 +83840,7 @@ aoX aqe alu asp -atm +sBw aul avq awv @@ -79053,7 +83855,7 @@ aDX aFe aFW aGW -aCe +sIC aIW aKe aLk @@ -79079,7 +83881,7 @@ aZe bdp aZe beL -bfi +aYu bfP bgp bhb @@ -79294,13 +84096,13 @@ anX ani aqf alu -asp +sAX atn aum avr aww aum -aum +sDM ayT azQ aAW @@ -79532,7 +84334,7 @@ aaa aae aaa abs -abs +swE acs adk adX @@ -79551,27 +84353,27 @@ anY aoY aqg alu -asq +aMx ato aun avs awx axe -axU +ato axe azR aAX -axU -aDb axe -aFg -avs +aDb ato -aHX +aFg +axe avs +axe +sIL aKf ato -avs +axe aNE ayP blo @@ -79796,14 +84598,14 @@ adX aeO afA agt -abs +sxb aic aiG ajE akI alu alu -alu +syT alu alu alu @@ -79812,7 +84614,7 @@ abt abt abt abt -abt +sCO abt abt abt @@ -79824,7 +84626,7 @@ abt abt abt abt -abt +sID abt abt abt @@ -79850,7 +84652,7 @@ baa bds baa aZl -bfi +aYu bfP bgs bhb @@ -80045,12 +84847,12 @@ aaa aad aah aad +swz abs abs abs abs -abs -abs +swV abs abs abs @@ -80090,11 +84892,11 @@ aNF ank aPw aQz -aVA -aVA +sJL +sJQ aTO aUH -aVA +sKf aVA aVA aXF @@ -80107,7 +84909,7 @@ bcy bdt bem beO -bfj +bfp bfP bgo bhe @@ -80302,7 +85104,7 @@ aad aad aad aad -bxZ +swA abL acu adm @@ -80311,7 +85113,7 @@ bym afB agu ahj -adY +bym aiH alz akK @@ -80330,7 +85132,7 @@ atp arj arj arj -arj +sEJ aBa aBa anl @@ -80341,7 +85143,7 @@ bsz aDZ aIY aDZ -aDZ +sJa arj arj anl @@ -80374,7 +85176,7 @@ bjb bju bjH bfP -bfP +sLu aad aad aad @@ -80565,10 +85367,10 @@ byi adn adn adn +swY adn adn -adn -adn +sxh adn ajH ado @@ -80592,13 +85394,13 @@ aBb aCh aDc aEa +sHz aFi -blX bsA aHY aIZ blm -ahZ +azU aMy aHY aDc @@ -80606,8 +85408,8 @@ aPy aQA abt aSD -aTQ -aUI +bfp +sKa aVC aWt aWZ @@ -80844,26 +85646,26 @@ acx axf abt abt -abt +sEK +sFl abt abt abt axW blL -blY bsB axW abt abt -abt +sJb abt abt abt anQ anQ -abt +sJM aSE -aTR +bfp aUI aVD aWu @@ -80871,19 +85673,19 @@ aXa aXI aYs aZj -bae +bac baY bbM bxW bdw bep aZl -bfp +sKY bfP bgm bhh bgm -bfP +sLi bjd bjw bjI @@ -81073,7 +85875,7 @@ aac aad aad aad -bxZ +swB byg byk adn @@ -81081,7 +85883,7 @@ aea aeQ afD agw -aeV +ajI aid aiJ agw @@ -81095,27 +85897,27 @@ aqk abt ass ats -abt +sBT avw awz axg abt -aaa -aaa -aaa -aaa -aaa +sEl +sEL +sFm +sFQ +sGv +sGX axW -blM -blZ +sIa bsC -axW -aaa -aaa -aaa -aaa -aaa -aaa +sIE +sIM +sIT +sJc +sJp +aae +aae aae aae aRy @@ -81123,10 +85925,10 @@ aSF aTS aUJ aVE +sKh aVE aVE -aVE -aVE +sKv aZk baf baZ @@ -81134,9 +85936,9 @@ bbN bcB bdx beq -aZl -bfo -bfP +sKQ +bfp +sLa bgm bhi bgm @@ -81144,7 +85946,7 @@ bfP bje bjx bjI -bfP +sLr aad aad aad @@ -81333,9 +86135,9 @@ aad bxZ byf byl -adn -aeb -aeR +swL +aed +aeT afE agx ahl @@ -81355,22 +86157,22 @@ att abt abt abt +sDo +abt +atr +sEM abt abt -aaa -aaa -aaa -aaa -aaa +abt +sGY axW -blN -blZ +sIb bsD axW -aaa -aaa -aaa -aaa +sIN +axW +sJd +sJq aaa bte aPz @@ -81380,9 +86182,9 @@ aSG aTT aUK aVF -aWv -aXb aXJ +aXb +aSC aYt aZl bag @@ -81394,7 +86196,7 @@ ber aZl bxX bfP -bfP +sLd bfP bfP bfP @@ -81588,13 +86390,13 @@ aad aad aad bvg -bvh -bvh +bvg +bvg adn aec aeS afF -agy +agx ahm adp aiL @@ -81606,38 +86408,38 @@ adn aoe ape aqm -abt -abN +sAC +sAY acw +sBU +sCs +sCP +sDp +sDN +sEm abt -aad -aad -aad -aaa -aaa -aaa -aaa -aaa -aaa +sFn +sFR +sGw +sGZ axW -blO bmb bsE axW -aaa -aaa -aaa -aaa -aaa +aae +sIU +sJe +sJr +aae bte aPA aQB aRz -aSH -aRz +sJR +sJU aSH aVG -aSH +sKi aRz aSH aYu @@ -81645,7 +86447,7 @@ aZm bah bah bah -bah +sKJ bah bah beQ @@ -81865,26 +86667,26 @@ apf aqn abt abO -atv -abt -aad -aad -aad -aaa -aaa -aaa -aaa -aaa -aaa -azb -blM -blZ -bsC -azb -aaa -aaa -aaa -aaa +atr +sBV +sCt +sCQ +sDq +sDO +sEn +sEN +sFo +sFS +sGx +sHa +axW +sIc +sIv +sIF +sIO +sIV +sJf +sJs aaa bte aPB @@ -81898,14 +86700,14 @@ aWw aRz aXK aYv -aZn -bai -bbb -bbP aXb -bdz +bai +aXJ +bbP +aUK +bdz +aXb aXJ -aZn bfr aSH bgv @@ -82119,30 +86921,30 @@ amA ano aog apg -aqo +aqk abt abN acy abt -aad -aac -aac -aaa -aaa -aaa -aaa -aaa -aaa -azb -blM +sCu +abt +abt +abt +abt +abt +sFp +sFT +sGy +sHb +axW bxM bsC -azb -aaa -aaa -aaa -aaa -aaa +axW +aae +sIW +sJg +sJt +aae bte aPC aQD @@ -82153,20 +86955,20 @@ aUM aVI aWx aRz +sKr +aRz +sKy aRz aRz -aRz -aRz -aRz -aRz +sKG aSH bdA aRz aRz -bfq -aRz +bfp +sLb bgw -bhl +bhk bhV aRy bvg @@ -82363,9 +87165,9 @@ aad aad ado aed -aeV +ajI afI -aeV +ajI ahp adn aiO @@ -82379,26 +87181,26 @@ aph aqp abt bvh -bvh -bvg -aac -aac -aae -aaa -aaa -aaa -aaa -aaa -aaa -azb +sBx +abt +aad +aad +aah +aad +aad +sEO +sFq +sFU +abt +sHc +sHA blM -blZ -bsC -azb -aaa -aaa -aaa -aaa +sIw +axW +axW +sIX +sJh +sJu aaa bte aPz @@ -82421,11 +87223,11 @@ bdB bes aRz bfs -aRA +sLc bgx bhm bhW -aRz +sLj aac aaa aaa @@ -82618,15 +87420,15 @@ aaa aaa aaa aac -adp -aef -aeW +swM +aeh +agB ado agB ahq adp ado -adn +sxV ado adn amC @@ -82636,37 +87438,37 @@ api amD amC amC -bvg +sBy +sBW +aad aac -aae -aae -aae -aaa -aaa -aaa -aaa -aaa -aaa -azb -blM -blZ +bvg +aad +aad +sEP +abt +abt +sGz +sHd +axW +bxM bsC -azb -aaa -aaa -aaa -aaa -aaa -aaa +sIG +axW +sIY +sJi +axW aae aae -aRz +aae +aae +sJN aRy aRy aRy aRy aRy -aRz +sKl aad aac aad @@ -82886,37 +87688,37 @@ aae aae aae aae -amC +syD anq aoi apj aqq ark amC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bvg +bvg +aac +aac +aae +aac +aad +abt +sFr +sFV +sGA +sHe axW blO -blZ bsJ axW axW +sIZ +sJj axW -axW -axW -aaa -aaa -aaa -aaa +aae +aaf +aaf +aae aaa aaa aaa @@ -82930,15 +87732,15 @@ aac aac aad aRz +sKK aRz aRz -aRz -aRz +sKR aRz aRz bgz bhk -bgw +sLg aRy bvg aac @@ -83134,9 +87936,9 @@ aaa aaa ado aeh -aeW +agB ado -aeW +agB ahq ado aaa @@ -83150,27 +87952,27 @@ apk aqr arl amC +bvg +aac +aac aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aae +aac +aac +sEQ +axW +sFW +sGB +axW axW -blU bmh -bsC -bmw -blZ +sIx +aKh +sIP bmC bmG axW -aaa +aae aaa aaa aaa @@ -83196,7 +87998,7 @@ aRz bgA bhn bhY -aRz +sLk aad aac aac @@ -83406,31 +88208,31 @@ aok apl aqs arm -amC +sAZ +aac aaa aaa aaa +aae aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -axW +aac +bvg +sFs +sFX +sGC +sHf +sHB blM +sIy blZ -bsC +sIQ blZ -blZ -blZ -blZ -axW -aaa -aaa -aaa +sJk +sJv +aae aaa +aaf +aaf aaa aaa aaa @@ -83450,7 +88252,7 @@ aac aad aad aRz -aRz +sLe aRz aRz aRz @@ -83646,8 +88448,8 @@ aaa aaa abQ acz -adr -adr +afa +afa afa afK afa @@ -83668,26 +88470,26 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -axW -blM -blZ +aae +aae +bvg +bvg +sFt +sFY +sGD +sHg +sHC +sId bsM bsS -bsS +sIR bsS bsY axW -aaa -aaa -aaa -aaa +aae +aae +aae +aaf aaa aaa aaa @@ -83908,9 +88710,9 @@ aej ads ads ads -adt -aih -aiP +ads +aii +aiQ ajN akR aaa @@ -83921,21 +88723,21 @@ apn aqu amD aae -aaa -aaa -aaa -aaa -aaa -axW +aae +aaf +aaf +aae +aae axW +sEo azb axW axW axW azb -aFj -aFZ -bsN +blL +blY +bsB azb axW aKh @@ -83943,8 +88745,8 @@ bsZ azb axW axW -aaa -aaa +aae +aaf aaa aaa aaa @@ -84160,21 +88962,21 @@ aaa aaa abQ buy -adt -adt -adt ads -adt +ads +ads +ads +ads ads aii -aiP -ajO +aiQ +ajN akR aaa aae ant aom -apo +apn aqv ant aae @@ -84182,7 +88984,7 @@ aaa aaa aaa aaa -aaa +aae axW ayW azV @@ -84191,7 +88993,7 @@ aCi aDd aEb aFk -aDh +sIe bsO aHZ aJa @@ -84200,8 +89002,8 @@ bta aMz aNG azb -aaa -aaa +aae +aaf aaa aaa aaa @@ -84416,8 +89218,8 @@ aaa aaa aaa abQ -acB -adt +acA +ads ads ads ads @@ -84425,7 +89227,7 @@ ads ads aii aiQ -ajO +ajN akR aaa aaa @@ -84438,8 +89240,8 @@ aaa aaa aaa aaa -aaa -aaa +aaf +aae axW ayX azW @@ -84457,7 +89259,7 @@ btb aIa aNH axW -aaa +aae aaa aaa aaa @@ -84674,12 +89476,12 @@ aaa aaa abQ acC -adu aek -adu +aek +aek buz aek -adu +aek aij abQ abQ @@ -84695,8 +89497,8 @@ amE aaa aaa aaa -aaa -aaa +aaf +aae axW ayY azX @@ -84713,8 +89515,8 @@ aKj btc aMA aNI -axW -aaa +sJB +aae aaa aaa aaa @@ -84945,15 +89747,15 @@ aaa amE anu aon -apq +aon aqw arn amE aaa aaa aaa -aaa -aaa +aaf +aae axW ayZ azY @@ -84970,9 +89772,9 @@ bsX btd aMB aNJ -axW -aaa -aaa +sJC +aae +aaf aaa aaa aaa @@ -85210,7 +90012,7 @@ aaa aaa aaa aaa -aaa +aae axW aza azZ @@ -85228,8 +90030,8 @@ aLt aMC aNK axW -aaa -aaa +aae +aaf aaa aaa aaa @@ -85466,9 +90268,9 @@ amE aaa aaa aaa -aaa -aaa -axW +aaf +aae +sDP azb azb aBh @@ -85485,8 +90287,8 @@ aDi azb azb axW -aaa -aaa +aae +aaf aaa aaa aaa @@ -85723,26 +90525,26 @@ amE aaa aaa aaa -aaa -aaa +aaf +aae aae aae azb -aBi +aDh azb -aBi +aDh azb aae aae aae azb -aBi +aDh azb -aLu +aDh azb aae aae -aaa +aae aaa aaa aaa @@ -85995,7 +90797,7 @@ aaa azb aDi azb -aLv +aDi azb aaa aaa @@ -87027,7 +91829,7 @@ aLx aMF aNN axY -aPF +aPE aQE aaa aaa @@ -87284,7 +92086,7 @@ aLy aMG aNO axX -aPF +aPE aQE aaa aaa @@ -87798,7 +92600,7 @@ aLA aMH aNP axX -aPF +aPE aQE aaa aaa @@ -88055,7 +92857,7 @@ aLB aLB aNQ axY -aPF +aPE aQE aaa aaa @@ -88312,7 +93114,7 @@ aLB aLB aNR axY -aPF +aPE aQE aaa aaa @@ -90591,32 +95393,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sxi +sxD +sxW +syi +sys +syE +syU +szo +szJ +sAd +sAD +sBa +sBz +sBX +sCv +sCR +sDr +sDQ +sEp +sER +sFu +sFZ +sGE +sHh +sHD +sIf aaa aaa aaa @@ -90848,32 +95650,32 @@ aaa aaa aaa aaa +sxj +sxE +sxX +syj +syt +syF +syV +szp +szK +sAe +sAE +sBb +sBA +sBY +sCw +sCS +sDs +sDR +sEq +sES +sFv +sGa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sHi +sHE +sIg aaa aaa aaa @@ -91105,32 +95907,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sxk +sxF +sxY +syk +syu +syG +syW +szq +szL +sAf +sAF +sBc +sBB +sBZ +sCx +sCT +sDt +sDS +sEr +sET +sFw +sGb +sGF +sHj +sHF +sIh aaa aaa aaa @@ -91362,32 +96164,32 @@ aaa aaa aaa aaa +sxl +sxG +sxZ +syl +syv +syH +syX +szr +szM +sAg +sAG +sBd +sBC +sCa +sCy +sCU +sDu +sDT aaa +sEU +sFx +sGc aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sHk +sHG +sIi aaa aaa aaa @@ -91619,32 +96421,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sxm +sxH +sya +sym +syw +syI +syY +szs +szN +sAh +sAH +sBe +sBD +sCb +sCz +sCV +sDv +sDU +sEs +sEV +sFy +sGd +sGG +sHl +sHH +sIj aaa aaa aaa @@ -91876,32 +96678,32 @@ aaa aaa aaa aaa +sxn +sxI +syb +syn +syx +syJ +syZ +szt +szO +sAi +sAI +sBf +sBE +sCc +sCA +sCW +sDw +sDV +sEt +sEW +sFz +sGe aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sHm +sHI +sIk aaa aaa aaa @@ -92133,32 +96935,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sxo +sxJ +syc +syo +syy +syK +sza +szu +szP +sAj +sAJ +sBg +sBF +sCd +sCB +sCX +sDx +sDW +sEu +sEX +sFA +sGf +sGH +sHn +sHJ +sIl aaa aaa aaa @@ -92390,32 +97192,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sxp +sxK +syd +syp +syz +syL +szb +szv +szQ +sAk +sAK +sBh +sBG +sCe +sCC +sCY +sDy +sDX +sEv +sEY +sFB +sGg +sGI +sHo +sHK +sIm aaa aaa aaa @@ -92647,29 +97449,29 @@ aaa aaa aaa aaa +sxq +sxL +sye +syq +syA aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +szc +szw +szR +sAl +sAL +sBi +sBH +sCf +sCD +sCZ +sDz +sDY +sEw +sEZ +sFC +sGh +sGJ aaa aaa aaa @@ -92904,32 +97706,32 @@ aaa aaa aaa aaa +sxr +sxM +syf aaa aaa aaa +szd aaa +szS +sAm +sAM +sBj +sBI +sCg +sCE +sDa +sDA +sDZ +sEx +sFa +sFD +sGi +sGK aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sHL +sIn aaa aaa aaa @@ -93161,32 +97963,32 @@ aaa aaa aaa aaa +sxs +sxN aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sze +szx +szT +sAn +sAN +sBk +sBJ +sCh +sCF +sDb +sDB +sEa +sEy +sFb +sFE +sGj +sGL +sHp +sHM +sIo aaa aaa aaa @@ -93418,32 +98220,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sxt +sxO +syg +syr +syB +syM +szf +szy +szU +sAo +sAO +sBl +sBK +sCi +sCG +sDc +sDC +sEb +sEz +sFc +sFF +sGk +sGM +sHq +sHN +sIp aaa aaa aaa @@ -93675,32 +98477,32 @@ aaa aaa aaa aaa +sxu +sxP aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +szg +szz +szV +sAp +sAP +sBm +sBL +sCj +sCH +sDd +sDD +sEc +sEA +sFd +sFG +sGl +sGN +sHr +sHO +sIq aaa aaa aaa @@ -93932,31 +98734,31 @@ aaa aaa aaa aaa +sxv aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +syN +szh +szA +szW +sAq +sAQ +sBn +sBM +sCk +sCI +sDe +sDE +sEd +sEB +sFe +sFH +sGm +sGO +sHs +sHP aaa aaa aaa @@ -94189,31 +98991,31 @@ aaa aaa aaa aaa +sxw +sxQ aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +syO +szi +szB +szX +sAr +sAR +sBo +sBN +sCl +sCJ +sDf +sDF +sEe +sEC +sFf +sFI +sGn +sGP +sHt +sHQ aaa aaa aaa @@ -94446,32 +99248,32 @@ aaa aaa aaa aaa +sxx +sxR aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +syP +szj +szC +szY +sAs +sAS +sBp +sBO +sCm +sCK +sDg +sDG +sEf +sED +sFg +sFJ +sGo +sGQ +sHu +sHR +sIr aaa aaa aaa @@ -94703,32 +99505,32 @@ aaa aaa aaa aaa +sxy +sxS aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +szk +szD +szZ +sAt +sAT +sBq +sBP +sCn +sCL +sDh +sDH +sEg +sEE +sFh +sFK +sGp +sGR +sHv +sHS +sIs aaa aaa aaa @@ -94960,32 +99762,32 @@ aaa aaa aaa aaa +sxz +sxT aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +syQ +szl +szE +sAa +sAu +sAU +sBr +sBQ +sCo +sCM +sDi +sDI +sEh +sEF +sFi +sFL +sGq +sGS +sHw +sHT +sIt aaa aaa aaa @@ -95217,31 +100019,31 @@ aaa aaa aaa aaa +sxA +sxU aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +syR +szm +szF +sAb +sAv +sAV +sBs +sBR +sCp +sCN +sDj +sDJ +sEi +sEG +sFj +sFM +sGr +sGT +sHx +sHU aaa aaa aaa @@ -95483,19 +100285,19 @@ aaa aaa aaa aaa +sAw +sAW +sBt +sBS +sCq aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sEj +sEH +sFk +sFN +sGs aaa aaa aaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index a504dc4a0b..1f5e67ba91 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -202,7 +202,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "AI Core"; req_access_txt = "65" }, @@ -241,7 +241,7 @@ /area/ai_monitored/turret_protected/ai) "act" = ( /obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "AI Core"; req_access_txt = "65" }, @@ -502,7 +502,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "AI Core"; req_access_txt = "65" }, @@ -2136,7 +2136,7 @@ /turf/open/floor/plasteel/dark, /area/security/execution/transfer) "ahm" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 2"; req_access_txt = "2" }, @@ -2156,7 +2156,7 @@ /turf/closed/wall, /area/security/prison) "ahp" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 1"; req_access_txt = "2" }, @@ -2864,7 +2864,6 @@ "aiY" = ( /obj/structure/table, /obj/item/device/flashlight/lamp, -/obj/item/storage/box/mousetraps, /turf/open/floor/plating, /area/maintenance/department/security/brig) "aiZ" = ( @@ -2908,7 +2907,7 @@ /area/security/prison) "ajd" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" }, @@ -2925,7 +2924,7 @@ /area/security/prison) "ajf" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" }, @@ -3137,19 +3136,19 @@ /area/maintenance/department/crew_quarters/dorms) "ajA" = ( /obj/docking_port/stationary{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 24; + dheight = 1; + dir = 8; + dwidth = 12; + height = 17; id = "syndicate_ne"; name = "northeast of station"; turf_type = /turf/open/space; - width = 18 + width = 23 }, /turf/open/space, /area/space/nearstation) "ajB" = ( -/obj/machinery/vending/kink, +/obj/item/storage/box/mousetraps, /turf/open/floor/plating, /area/maintenance/department/security/brig) "ajC" = ( @@ -4407,7 +4406,7 @@ /turf/open/floor/plasteel/dark, /area/security/main) "amt" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Head of Security"; req_access_txt = "58" }, @@ -5810,7 +5809,7 @@ /turf/open/floor/plating, /area/security/warden) "apM" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Brig Control"; req_access_txt = "3" }, @@ -6393,7 +6392,7 @@ /area/security/brig) "arj" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Labor Camp Shuttle Airlock"; req_access_txt = "2" }, @@ -7453,7 +7452,7 @@ /turf/open/floor/plating, /area/security/brig) "atE" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 2; id_tag = "innerbrig"; name = "Brig"; @@ -7478,7 +7477,7 @@ /turf/open/floor/plating, /area/security/brig) "atG" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 2; id_tag = "innerbrig"; name = "Brig"; @@ -7490,7 +7489,7 @@ }, /area/security/brig) "atH" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Brig Desk"; req_access_txt = "1" }, @@ -8781,7 +8780,7 @@ /area/shuttle/labor) "awH" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Labor Camp Shuttle Airlock"; req_access_txt = "0" }, @@ -8828,7 +8827,7 @@ /area/security/brig) "awL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 1; id_tag = "outerbrig"; name = "Brig"; @@ -8856,7 +8855,7 @@ /area/security/brig) "awN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ cyclelinkeddir = 1; id_tag = "outerbrig"; name = "Brig"; @@ -10634,7 +10633,7 @@ /area/crew_quarters/heads/captain) "aBq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 2; name = "Bridge"; req_access_txt = "19" @@ -10648,7 +10647,7 @@ "aBr" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 2; name = "Bridge"; req_access_txt = "19" @@ -10711,7 +10710,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 2; name = "Bridge"; req_access_txt = "19" @@ -13145,7 +13144,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 1; name = "Bridge"; req_access_txt = "19" @@ -13159,7 +13158,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 1; name = "Bridge"; req_access_txt = "19" @@ -13181,7 +13180,7 @@ /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ cyclelinkeddir = 1; name = "Bridge"; req_access_txt = "19" @@ -14830,7 +14829,7 @@ /area/storage/eva) "aLb" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "EVA Storage"; req_access_txt = "18" }, @@ -14847,7 +14846,7 @@ "aLd" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Teleporter"; req_access_txt = "17" }, @@ -14926,7 +14925,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aLs" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Holding Area"; req_access_txt = "2" }, @@ -16435,7 +16434,7 @@ }, /area/security/checkpoint/supply) "aOR" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Cargo Security Post"; req_access_txt = "63" }, @@ -17396,7 +17395,7 @@ /area/security/checkpoint/supply) "aRg" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Cargo Security Post"; req_access_txt = "63" }, @@ -17821,7 +17820,7 @@ /area/quartermaster/office) "aSg" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Mailroom"; req_access_txt = "0"; req_one_access_txt = "48;50" @@ -18751,7 +18750,7 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "aUo" = ( -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; req_access_txt = "0"; req_one_access_txt = "31;48" @@ -20921,7 +20920,7 @@ /area/quartermaster/office) "aZl" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; req_access_txt = "50" }, @@ -21872,7 +21871,7 @@ /turf/open/floor/plating, /area/quartermaster/qm) "bbG" = ( -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; req_access_txt = "41" }, @@ -26578,7 +26577,7 @@ /area/medical/genetics) "bnw" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Cloning"; req_access_txt = "0"; @@ -26636,7 +26635,7 @@ /area/security/checkpoint/medical) "bnB" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Medbay Security Post"; req_access_txt = "63" }, @@ -26776,7 +26775,7 @@ /area/science/server) "bnU" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Server Room"; req_access_txt = "30" }, @@ -28155,7 +28154,7 @@ /area/medical/genetics) "bra" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "GeneticsDoor"; name = "Cloning"; req_access_txt = "0"; @@ -29796,7 +29795,7 @@ /area/science/explab) "buA" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Experimentation Lab"; req_access_txt = "47" }, @@ -30020,7 +30019,7 @@ /area/science/xenobiology) "buV" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Kill Room"; req_access_txt = "55" }, @@ -30071,7 +30070,7 @@ /turf/closed/wall/r_wall, /area/medical/genetics) "bvd" = ( -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Genetics"; req_access_txt = "9" }, @@ -30168,7 +30167,7 @@ /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay/central) "bvq" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Chemistry Lab"; req_access_txt = "5; 33" @@ -31710,7 +31709,7 @@ /turf/open/floor/plating, /area/medical/sleeper) "byp" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Sleepers"; req_access_txt = "5" @@ -31722,7 +31721,7 @@ /turf/open/floor/plasteel/white, /area/medical/sleeper) "byq" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Sleepers"; req_access_txt = "5" @@ -32986,7 +32985,7 @@ /turf/open/floor/plasteel/white, /area/medical/sleeper) "bBd" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = "MedbaySleepers"; name = "Sleepers"; req_access_txt = "5" @@ -33532,7 +33531,7 @@ }, /area/medical/medbay/central) "bCq" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Chief Medical Office"; req_access_txt = "40" }, @@ -34149,7 +34148,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Toxins Storage"; req_access_txt = "8" }, @@ -34190,7 +34189,7 @@ /area/science/research) "bDU" = ( /obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/glass_research{ +/obj/machinery/door/airlock/research/glass{ name = "Toxins Lab"; req_access_txt = "8" }, @@ -34432,6 +34431,10 @@ pixel_x = -3; pixel_y = -3 }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, @@ -34447,6 +34450,10 @@ pixel_x = -3; pixel_y = -3 }, +/obj/machinery/door/window/southleft{ + name = "First-Aid Supplies"; + req_access_txt = "5" + }, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, @@ -34462,6 +34469,10 @@ pixel_x = -3; pixel_y = -3 }, +/obj/machinery/door/window/southright{ + name = "First-Aid Supplies"; + req_access_txt = "5" + }, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, @@ -34477,6 +34488,7 @@ pixel_x = -3; pixel_y = -3 }, +/obj/structure/window/reinforced, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, @@ -35159,7 +35171,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bFR" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Medbay Storage"; req_access_txt = "45" @@ -35243,7 +35255,7 @@ /turf/closed/wall, /area/hallway/primary/aft) "bGb" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Research Security Post"; req_access_txt = "63" }, @@ -35611,7 +35623,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bGY" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Medbay Storage"; req_access_txt = "45" @@ -36619,7 +36631,7 @@ }, /area/medical/medbay/central) "bJq" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Recovery Room"; req_access_txt = "0" @@ -37044,7 +37056,7 @@ /area/medical/virology) "bKo" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Isolation B"; req_access_txt = "39" }, @@ -37053,7 +37065,7 @@ /area/medical/virology) "bKp" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_virology{ +/obj/machinery/door/airlock/virology/glass{ name = "Isolation A"; req_access_txt = "39" }, @@ -37739,7 +37751,7 @@ "bLX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ cyclelinkeddir = 0; name = "Atmospherics"; req_access_txt = "24" @@ -38189,7 +38201,7 @@ dir = 4 }, /obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Monitoring"; req_access_txt = "24" }, @@ -38618,7 +38630,7 @@ dir = 4 }, /obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Monitoring"; req_access_txt = "24" }, @@ -40514,7 +40526,7 @@ /area/hallway/primary/aft) "bSQ" = ( /obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/glass_atmos{ +/obj/machinery/door/airlock/atmos/glass{ cyclelinkeddir = 0; name = "Atmospherics Monitoring"; req_access_txt = "24" @@ -41457,7 +41469,7 @@ }, /area/security/checkpoint/engineering) "bUY" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Engineering Security Post"; req_access_txt = "63" }, @@ -42725,7 +42737,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/chief) "bYa" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Chief Engineer"; req_access_txt = "56" }, @@ -42772,7 +42784,7 @@ /area/engine/engine_smes) "bYh" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Power Storage"; req_access_txt = "11"; req_one_access_txt = "0" @@ -47230,7 +47242,7 @@ /turf/open/floor/plasteel/dark, /area/library) "clm" = ( -/obj/machinery/vending/kink, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel/dark, /area/library) "cln" = ( @@ -47545,7 +47557,7 @@ }, /area/tcommsat/computer) "cmj" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Control Room"; req_access_txt = "19; 61" }, @@ -47674,7 +47686,7 @@ }, /area/tcommsat/computer) "cmw" = ( -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ cyclelinkeddir = 2; name = "Server Room"; req_access_txt = "61" @@ -47749,7 +47761,7 @@ /turf/open/floor/plating, /area/tcommsat/computer) "cmF" = ( -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ cyclelinkeddir = 1; name = "Server Room"; req_access_txt = "61" @@ -51358,18 +51370,6 @@ /obj/machinery/vending/games, /turf/open/floor/plasteel/dark, /area/library) -"cCX" = ( -/obj/machinery/vending/kink, -/turf/open/floor/plating, -/area/maintenance/department/crew_quarters/dorms) -"cCY" = ( -/obj/machinery/vending/kink, -/turf/open/floor/plating, -/area/maintenance/department/engine) -"cCZ" = ( -/obj/machinery/vending/kink, -/turf/open/floor/plating, -/area/maintenance/department/engine) (1,1,1) = {" aaa @@ -73874,7 +73874,7 @@ bvb bDj bEo bva -cCY +bva bHQ bJg bKl @@ -74130,7 +74130,7 @@ bnv bnv bDi bmf -bva +bsn bva bHS bJh @@ -79029,7 +79029,7 @@ cCF cCH bTn bPB -cCZ +bDi bVC bQj bPA @@ -88702,7 +88702,7 @@ aaa aaa aaa aiU -cCX +ajv aju ajt alQ diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 0ef75448e6..a6ee357241 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -310,7 +310,7 @@ /turf/open/floor/plating, /area/engine/engineering) "aU" = ( -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Gravity Generator"; req_access_txt = "11"; req_one_access_txt = "0" @@ -339,7 +339,7 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "aX" = ( -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Gravity Generator"; req_access_txt = "11"; req_one_access_txt = "0" diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index d58594c865..1866665519 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -9446,7 +9446,7 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "zk" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Infirmary" }, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index dc75cd1fa6..3eba8d7a61 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -197,7 +197,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aP" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Emergency Shuttle Brig"; req_access_txt = "2" }, @@ -297,7 +297,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "bg" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Emergency Shuttle Cockpit"; req_access_txt = "19" }, @@ -355,7 +355,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bq" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "5" @@ -363,7 +363,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "br" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0" diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index 6ba0875a66..b5104569ac 100644 --- a/_maps/shuttles/emergency_bar.dmm +++ b/_maps/shuttles/emergency_bar.dmm @@ -387,7 +387,7 @@ /turf/open/floor/plasteel/freezer, /area/shuttle/escape) "bq" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Medbay" }, /turf/open/floor/mineral/titanium, diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm index 3b2617bfe1..3b62aa9d7b 100644 --- a/_maps/shuttles/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency_birdboat.dmm @@ -93,7 +93,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "as" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "bridge door"; req_access_txt = "19" }, @@ -134,7 +134,7 @@ /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "az" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "security airlock"; req_access_txt = "63" }, diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 2090fbe199..f860593b6e 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -399,7 +399,7 @@ }, /area/shuttle/escape) "bn" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Emergency Shuttle Brig"; req_access_txt = "2" }, @@ -717,7 +717,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "ce" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Emergency Shuttle Medbay" }, /turf/open/floor/plasteel/whiteblue, @@ -986,7 +986,7 @@ }, /area/shuttle/escape) "cP" = ( -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engine Room"; req_one_access_txt = "10;24" }, diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index caa457f43a..6e22434fcd 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -306,7 +306,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "aF" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0" @@ -422,7 +422,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "aV" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0" @@ -649,14 +649,14 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "bt" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Holding Area"; req_access_txt = "2" }, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "bu" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Cockpit"; req_access_txt = "19" }, diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index 3ffdee6461..9824fec026 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -260,7 +260,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aH" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Cockpit"; req_access_txt = "19" }, @@ -377,14 +377,14 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "aY" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Brig"; req_access_txt = "2" }, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "aZ" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0" diff --git a/_maps/shuttles/emergency_meteor.dmm b/_maps/shuttles/emergency_meteor.dmm index 2b712a4943..6f9c0450d4 100644 --- a/_maps/shuttles/emergency_meteor.dmm +++ b/_maps/shuttles/emergency_meteor.dmm @@ -86,7 +86,7 @@ dwidth = 20; height = 40; movement_force = list("KNOCKDOWN" = 3, "THROW" = 6); - name = "a meteor with engines strapped to it"; + name = "\proper a meteor with engines strapped to it"; timid = 1; width = 40 }, diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm index 13f4b803a8..6a4d35124c 100644 --- a/_maps/shuttles/emergency_mini.dmm +++ b/_maps/shuttles/emergency_mini.dmm @@ -82,14 +82,14 @@ /turf/open/floor/plating, /area/shuttle/escape) "o" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Escape Shuttle Cell"; req_access_txt = "2" }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "p" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0" @@ -214,7 +214,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "I" = ( -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Escape Shuttle Cockpit"; req_access_txt = "19" }, diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm index 1adc770925..b68eeba8e3 100644 --- a/_maps/shuttles/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency_russiafightpit.dmm @@ -197,7 +197,7 @@ /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "aI" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Emergency Shuttle Brig"; req_access_txt = "2" }, @@ -231,7 +231,7 @@ /turf/open/floor/engine, /area/shuttle/escape) "aO" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Emergency Shuttle Airlock"; req_access_txt = "2" }, @@ -280,7 +280,7 @@ name = "Box emergency shuttle"; timid = 1 }, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Emergency Shuttle Airlock" }, /turf/open/floor/plating, @@ -418,7 +418,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "br" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Emergency Shuttle Airlock" }, /turf/open/floor/plating, @@ -438,7 +438,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bu" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Emergency Shuttle Cargo" }, /turf/open/floor/mineral/plastitanium, @@ -448,7 +448,7 @@ /turf/closed/wall, /area/shuttle/escape) "bw" = ( -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security/glass{ name = "Emergency Shuttle Infirmary" }, /turf/open/floor/mineral/plastitanium, diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 78dabd2576..659408ffdf 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -201,7 +201,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/machinery/door/airlock/glass_maintenance{ +/obj/machinery/door/airlock/maintenance/glass{ name = "Maintenance" }, /turf/open/floor/plasteel, @@ -252,7 +252,7 @@ }, /area/shuttle/abandoned) "aA" = ( -/obj/machinery/door/airlock/glass_maintenance{ +/obj/machinery/door/airlock/maintenance/glass{ name = "Maintenance" }, /turf/open/floor/plasteel, @@ -1014,7 +1014,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Infirmary"; req_access_txt = "0" @@ -1295,7 +1295,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/machinery/door/airlock/glass_engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engineering Storage" }, /turf/open/floor/plasteel/neutral/side{ @@ -1614,7 +1614,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/machinery/door/airlock/glass_command{ +/obj/machinery/door/airlock/command/glass{ name = "Bridge"; welded = 1 }, diff --git a/_maps/templates/pirate_ship.dmm b/_maps/templates/pirate_ship.dmm index e9be381c99..02da197578 100644 --- a/_maps/templates/pirate_ship.dmm +++ b/_maps/templates/pirate_ship.dmm @@ -538,7 +538,7 @@ /turf/open/floor/pod/dark, /area/shuttle/pirate/vault) "bs" = ( -/obj/machinery/door/airlock/glass_medical{ +/obj/machinery/door/airlock/medical/glass{ name = "Medbay" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, diff --git a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm index 901a8610a6..712b3425e0 100644 --- a/code/game/alternate_appearance.dm +++ b/code/game/alternate_appearance.dm @@ -78,6 +78,7 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances) QDEL_NULL(ghost_appearance) /datum/atom_hud/alternate_appearance/basic/add_to_hud(atom/A) + LAZYINITLIST(A.hud_list) A.hud_list[appearance_key] = theImage . = ..() diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm index a5216fb44c..9d42b67bf9 100644 --- a/code/game/area/ai_monitored.dm +++ b/code/game/area/ai_monitored.dm @@ -28,4 +28,4 @@ for(var/X in motioncameras) var/obj/machinery/camera/cam = X cam.lostTargetRef(WEAKREF(O)) - return + return \ No newline at end of file diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm index 51399ca7e1..10e3249d64 100644 --- a/code/game/area/areas/holodeck.dm +++ b/code/game/area/areas/holodeck.dm @@ -123,4 +123,4 @@ /area/holodeck/rec_center/thunderdome1218 name = "Holodeck - 1218 AD" - restricted = 1 \ No newline at end of file + restricted = 1 diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index d322e8644c..4fd3204040 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -32,9 +32,44 @@ /area/ruin/powered/seedvault icon_state = "dk_yellow" -/area/ruin/powered/syndicate_lava_base +/area/ruin/unpowered/syndicate_lava_base name = "Secret Base" icon_state = "dk_yellow" + ambientsounds = HIGHSEC + +/area/ruin/unpowered/syndicate_lava_base/engineering + name = "Syndicate Lavaland Engineering" + +/area/ruin/unpowered/syndicate_lava_base/medbay + name = "Syndicate Lavaland Medbay" + +/area/ruin/unpowered/syndicate_lava_base/arrivals + name = "Syndicate Lavaland Arrivals" + +/area/ruin/unpowered/syndicate_lava_base/bar + name = "Syndicate Lavaland Bar" + +/area/ruin/unpowered/syndicate_lava_base/main + name = "Syndicate Lavaland Primary Hallway" + +/area/ruin/unpowered/syndicate_lava_base/cargo + name = "Syndicate Lavaland Cargo Bay" + +/area/ruin/unpowered/syndicate_lava_base/chemistry + name = "Syndicate Lavaland Chemistry" + +/area/ruin/unpowered/syndicate_lava_base/virology + name = "Syndicate Lavaland Virology" + +/area/ruin/unpowered/syndicate_lava_base/testlab + name = "Syndicate Lavaland Experimentation Lab" + +/area/ruin/unpowered/syndicate_lava_base/dormitories + name = "Syndicate Lavaland Dormitories" + +/area/ruin/unpowered/syndicate_lava_base/telecomms + name = "Syndicate Lavaland Telecommunications" + //Xeno Nest diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index c606cb1d3b..83012750e0 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -132,44 +132,12 @@ if (orbiting) orbiting.Check() - if(flags_1 & CLEAN_ON_MOVE_1) - clean_on_move() - var/datum/proximity_monitor/proximity_monitor = src.proximity_monitor if(proximity_monitor) proximity_monitor.HandleMove() return 1 -/atom/movable/proc/clean_on_move() - var/turf/tile = loc - if(isturf(tile)) - tile.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD) - for(var/A in tile) - if(is_cleanable(A)) - qdel(A) - else if(istype(A, /obj/item)) - var/obj/item/cleaned_item = A - cleaned_item.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD) - else if(ishuman(A)) - var/mob/living/carbon/human/cleaned_human = A - if(cleaned_human.lying) - if(cleaned_human.head) - cleaned_human.head.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD) - cleaned_human.update_inv_head() - if(cleaned_human.wear_suit) - cleaned_human.wear_suit.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD) - cleaned_human.update_inv_wear_suit() - else if(cleaned_human.w_uniform) - cleaned_human.w_uniform.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD) - cleaned_human.update_inv_w_uniform() - if(cleaned_human.shoes) - cleaned_human.shoes.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD) - cleaned_human.update_inv_shoes() - cleaned_human.clean_blood() - cleaned_human.wash_cream() - to_chat(cleaned_human, "[src] cleans your face!") - /atom/movable/Destroy(force) var/inform_admins = (flags_2 & INFORM_ADMINS_ON_RELOCATE_2) var/stationloving = (flags_2 & STATIONLOVING_2) @@ -712,4 +680,4 @@ return FALSE if(anchored || throwing) return FALSE - return TRUE \ No newline at end of file + return TRUE diff --git a/code/game/communications.dm b/code/game/communications.dm index d60a5d8301..212a99f966 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -86,109 +86,55 @@ GLOBAL_LIST_EMPTY(all_radios) for(var/freq in GLOB.all_radios) GLOB.all_radios["[freq]"] -= radio -/* -Frequency range: 1200 to 1600 -Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency, even during mapmaking) - -Radio: -1459 - standard radio chat -1351 - Science -1353 - Command -1355 - Medical -1357 - Engineering -1359 - Security -1337 - death squad -1443 - Confession Intercom -1349 - Miners -1347 - Cargo techs -1447 - AI Private - -Devices: -1451 - tracking implant -1457 - RSD default - -On the map: -1311 for prison shuttle console (in fact, it is not used) -1435 for status displays -1437 for atmospherics/fire alerts -1439 for engine components -1439 for air pumps, air scrubbers, atmo control -1441 for atmospherics - supply tanks -1443 for atmospherics - distribution loop/mixed air tank -1445 for bot nav beacons -1447 for mulebot, secbot and ed209 control -1449 for airlock controls, electropack, magnets -1451 for toxin lab access -1453 for engineering access -1455 for AI access -*/ +// For information on what objects or departments use what frequencies, +// see __DEFINES/radio.dm. Mappers may also select additional frequencies for +// use in maps, such as in intercoms. GLOBAL_LIST_INIT(radiochannels, list( - "Common" = 1459, - "Science" = 1351, - "Command" = 1353, - "Medical" = 1355, - "Engineering" = 1357, - "Security" = 1359, - "CentCom" = 1337, - "Syndicate" = 1213, - "Supply" = 1347, - "Service" = 1349, - "AI Private" = 1447, - "Red Team" = 1215, - "Blue Team" = 1217 + "Common" = FREQ_COMMON, + "Science" = FREQ_SCIENCE, + "Command" = FREQ_COMMAND, + "Medical" = FREQ_MEDICAL, + "Engineering" = FREQ_ENGINEERING, + "Security" = FREQ_SECURITY, + "CentCom" = FREQ_CENTCOM, + "Syndicate" = FREQ_SYNDICATE, + "Supply" = FREQ_SUPPLY, + "Service" = FREQ_SERVICE, + "AI Private" = FREQ_AI_PRIVATE, + "Red Team" = FREQ_CTF_RED, + "Blue Team" = FREQ_CTF_BLUE )) GLOBAL_LIST_INIT(reverseradiochannels, list( - "1459" = "Common", - "1351" = "Science", - "1353" = "Command", - "1355" = "Medical", - "1357" = "Engineering", - "1359" = "Security", - "1337" = "CentCom", - "1213" = "Syndicate", - "1347" = "Supply", - "1349" = "Service", - "1447" = "AI Private", - "1215" = "Red Team", - "1217" = "Blue Team" + "[FREQ_COMMON]" = "Common", + "[FREQ_SCIENCE]" = "Science", + "[FREQ_COMMAND]" = "Command", + "[FREQ_MEDICAL]" = "Medical", + "[FREQ_ENGINEERING]" = "Engineering", + "[FREQ_SECURITY]" = "Security", + "[FREQ_CENTCOM]" = "CentCom", + "[FREQ_SYNDICATE]" = "Syndicate", + "[FREQ_SUPPLY]" = "Supply", + "[FREQ_SERVICE]" = "Service", + "[FREQ_AI_PRIVATE]" = "AI Private", + "[FREQ_CTF_RED]" = "Red Team", + "[FREQ_CTF_BLUE]" = "Blue Team" )) -//depenging helpers -GLOBAL_VAR_CONST(SYND_FREQ, 1213) //nuke op frequency, coloured dark brown in chat window -GLOBAL_VAR_CONST(SUPP_FREQ, 1347) //supply, coloured light brown in chat window -GLOBAL_VAR_CONST(SERV_FREQ, 1349) //service, coloured green in chat window -GLOBAL_VAR_CONST(SCI_FREQ, 1351) //science, coloured plum in chat window -GLOBAL_VAR_CONST(COMM_FREQ, 1353) //command, colored gold in chat window -GLOBAL_VAR_CONST(MED_FREQ, 1355) //medical, coloured blue in chat window -GLOBAL_VAR_CONST(ENG_FREQ, 1357) //engineering, coloured orange in chat window -GLOBAL_VAR_CONST(SEC_FREQ, 1359) //security, coloured red in chat window -GLOBAL_VAR_CONST(CENTCOM_FREQ, 1337) //centcom frequency, coloured grey in chat window -GLOBAL_VAR_CONST(AIPRIV_FREQ, 1447) //AI private, colored magenta in chat window -GLOBAL_VAR_CONST(REDTEAM_FREQ, 1215) // red team (CTF) frequency, coloured red -GLOBAL_VAR_CONST(BLUETEAM_FREQ, 1217) // blue team (CTF) frequency, coloured blue - -#define TRANSMISSION_WIRE 0 -#define TRANSMISSION_RADIO 1 - -/* filters */ -GLOBAL_VAR_INIT(RADIO_TO_AIRALARM, "1") -GLOBAL_VAR_INIT(RADIO_FROM_AIRALARM, "2") -GLOBAL_VAR_INIT(RADIO_CHAT, "3") //deprecated -GLOBAL_VAR_INIT(RADIO_ATMOSIA, "4") -GLOBAL_VAR_INIT(RADIO_NAVBEACONS, "5") -GLOBAL_VAR_INIT(RADIO_AIRLOCK, "6") -GLOBAL_VAR_INIT(RADIO_MAGNETS, "9") - /datum/radio_frequency - var/frequency as num var/list/list/obj/devices = list() +/datum/radio_frequency/New(freq) + frequency = freq + //If range > 0, only post to devices on the same z_level and within range //Use range = -1, to restrain to the same z_level without limiting range /datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, filter = null as text|null, range = null as num|null) + // Ensure the signal's data is fully filled + signal.source = source + signal.frequency = frequency //Apply filter to the signal. If none supply, broadcast to every devices //_default channel is always checked @@ -217,7 +163,7 @@ GLOBAL_VAR_INIT(RADIO_MAGNETS, "9") continue if(start_point.z != end_point.z || (range > 0 && get_dist(start_point, end_point) > range)) continue - device.receive_signal(signal, TRANSMISSION_RADIO, frequency) + device.receive_signal(signal) /datum/radio_frequency/proc/add_listener(obj/device, filter as text|null) if (!filter) @@ -225,8 +171,7 @@ GLOBAL_VAR_INIT(RADIO_MAGNETS, "9") var/list/devices_line = devices[filter] if(!devices_line) - devices_line = list() - devices[filter] = devices_line + devices[filter] = devices_line = list() devices_line += device @@ -240,70 +185,15 @@ GLOBAL_VAR_INIT(RADIO_MAGNETS, "9") devices -= devices_filter - - - -/client/proc/print_pointers() - set name = "Debug Signals" - set category = "Debug" - - if(!holder) - return - - var/datum/signal/S - to_chat(src, "There are [S.pointers.len] pointers:") - for(var/p in S.pointers) - to_chat(src, p) - S = locate(p) - if(istype(S)) - to_chat(src, S.debug_print()) - -/obj/proc/receive_signal(datum/signal/signal, receive_method, receive_param) +/obj/proc/receive_signal(datum/signal/signal) return /datum/signal var/obj/source - - var/transmission_method = 0 - //0 = wire - //1 = radio transmission - //2 = subspace transmission - - var/data = list() - var/encryption - var/frequency = 0 - var/static/list/pointers = list() + var/transmission_method + var/list/data -/datum/signal/New() - ..() - pointers += "[REF(src)]" - -/datum/signal/Destroy() - pointers -= "[REF(src)]" - return ..() - -/datum/signal/proc/copy_from(datum/signal/model) - source = model.source - transmission_method = model.transmission_method - data = model.data - encryption = model.encryption - frequency = model.frequency - -/datum/signal/proc/debug_print() - if (source) - . = "signal = {source = '[source]' [COORD(source)]\n" - else - . = "signal = {source = '[source]' ()\n" - for (var/i in data) - . += "data\[\"[i]\"\] = \"[data[i]]\"\n" - if(islist(data[i])) - var/list/L = data[i] - for(var/t in L) - . += "data\[\"[i]\"\] list has: [t]" - -/datum/signal/proc/sanitize_data() - for(var/d in data) - var/val = data[d] - if(istext(val)) - data[d] = html_encode(val) +/datum/signal/New(data, transmission_method = TRANSMISSION_RADIO) + src.data = data || list() + src.transmission_method = transmission_method diff --git a/code/game/gamemodes/antag_hud.dm b/code/game/gamemodes/antag_hud.dm index b047ff92ea..447a87ce20 100644 --- a/code/game/gamemodes/antag_hud.dm +++ b/code/game/gamemodes/antag_hud.dm @@ -48,4 +48,6 @@ newhud.join_hud(current) /datum/mind/proc/leave_all_antag_huds() - for(var/datum/atom_hud/antag/hud in GLOB.huds) \ No newline at end of file + for(var/datum/atom_hud/antag/hud in GLOB.huds) + if(hud.hudusers[current]) + hud.leave_hud(current) \ No newline at end of file diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 4315f382f4..3b8937d9fb 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -125,7 +125,7 @@ return used = TRUE var/mob/dead/observer/theghost = pick(nuke_candidates) - spawn_antag(theghost.client, get_turf(src), "syndieborg") + spawn_antag(theghost.client, get_turf(src), "syndieborg", user.mind) do_sparks(4, TRUE, src) qdel(src) else @@ -219,7 +219,7 @@ return used = 1 var/mob/dead/observer/theghost = pick(demon_candidates) - spawn_antag(theghost.client, get_turf(src), initial(demon_type.name)) + spawn_antag(theghost.client, get_turf(src), initial(demon_type.name),user.mind) to_chat(user, shatter_msg) to_chat(user, veil_msg) playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1) @@ -237,15 +237,15 @@ S.mind.special_role = S.name SSticker.mode.traitors += S.mind var/datum/objective/assassinate/new_objective - if(usr) + if(user) new_objective = new /datum/objective/assassinate new_objective.owner = S.mind - new_objective.target = usr.mind - new_objective.explanation_text = "[objective_verb] [usr.real_name], the one who summoned you." + new_objective.target = user + new_objective.explanation_text = "[objective_verb] [user.name], the one who summoned you." S.mind.objectives += new_objective var/datum/objective/new_objective2 = new /datum/objective new_objective2.owner = S.mind - new_objective2.explanation_text = "[objective_verb] everyone[usr ? " else while you're at it":""]." + new_objective2.explanation_text = "[objective_verb] everyone[user ? " else while you're at it":""]." S.mind.objectives += new_objective2 S.mind.add_antag_datum(/datum/antagonist/auto_custom) to_chat(S, S.playstyle_string) diff --git a/code/game/gamemodes/blob/blobs/shield.dm b/code/game/gamemodes/blob/blobs/shield.dm index fedc2eb6ab..551ec5d418 100644 --- a/code/game/gamemodes/blob/blobs/shield.dm +++ b/code/game/gamemodes/blob/blobs/shield.dm @@ -30,4 +30,4 @@ name = initial(name) desc = initial(desc) atmosblock = TRUE - air_update_turf(1) \ No newline at end of file + air_update_turf(1) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index cc96a69f34..f65c9ca768 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) /mob/camera/blob/proc/validate_location() var/turf/T = get_turf(src) var/area/A = get_area(T) - if(((A && !A.blob_allowed) || !T || !(T.z in GLOB.station_z_levels)) && LAZYLEN(GLOB.blobstart)) + if(((A && !A.blob_allowed) || !T || !is_station_level(T.z)) && LAZYLEN(GLOB.blobstart)) T = get_turf(pick(GLOB.blobstart)) if(!T) CRASH("No blobspawnpoints and blob spawned in nullspace.") @@ -83,7 +83,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) max_blob_points = INFINITY blob_points = INFINITY addtimer(CALLBACK(src, .proc/victory), 450) - + if(!victory_in_progress && max_count < blobs_legit.len) max_count = blobs_legit.len ..() @@ -95,7 +95,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) for(var/i in GLOB.mob_living_list) var/mob/living/L = i var/turf/T = get_turf(L) - if(!T || !(T.z in GLOB.station_z_levels)) + if(!T || !is_station_level(T.z)) continue if(L in GLOB.overminds || (L.pass_flags & PASSBLOB)) diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 0c642692f0..b9a8ee6046 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -348,4 +348,4 @@ icon_state = "blob" name = "blob" desc = "A thick wall of writhing tendrils." - brute_resist = 0.25 \ No newline at end of file + brute_resist = 0.25 diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm index 4e8db74ac8..829b0a8512 100644 --- a/code/game/gamemodes/changeling/powers/panacea.dm +++ b/code/game/gamemodes/changeling/powers/panacea.dm @@ -10,17 +10,6 @@ /obj/effect/proc_holder/changeling/panacea/sting_action(mob/user) to_chat(user, "We cleanse impurities from our form.") - - var/mob/living/simple_animal/borer/B = user.has_brain_worms() - if(B) - if(B.controlling) - B.detatch() - B.leave_victim() - if(iscarbon(user)) - var/mob/living/carbon/C = user - C.vomit(0, toxic = TRUE) - to_chat(user, "A parasite exits our form.") - var/list/bad_organs = list( user.getorgan(/obj/item/organ/body_egg), user.getorgan(/obj/item/organ/zombie_infection)) diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 807d268cc9..450a482822 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -209,7 +209,7 @@ /obj/effect/proc_holder/changeling/sting/blind/sting_action(mob/user, mob/living/carbon/target) add_logs(user, target, "stung", "blind sting") to_chat(target, "Your eyes burn horrifically!") - target.become_nearsighted() + target.become_nearsighted(EYE_DAMAGE) target.blind_eyes(20) target.blur_eyes(40) return TRUE diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index e4f75ea563..f5484e91f5 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -196,7 +196,7 @@ Credit where due: /datum/game_mode/clockwork_cult/proc/check_clockwork_victory() return main_clockcult.check_clockwork_victory() -/datum/game_mode/clock_cult/set_round_result() +/datum/game_mode/clockwork_cult/set_round_result() ..() if(GLOB.clockwork_gateway_activated) SSticker.news_report = CLOCK_SUMMON diff --git a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm index 74493c6cc5..3d41d8aa8a 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm @@ -98,12 +98,12 @@ if(severity == 1 && uses) uses = 0 visible_message("[src] is disrupted!") - animate(src, alpha = 0, transform = matrix()*2, time = 10, flags_1 = ANIMATION_END_NOW) + animate(src, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW) deltimer(timerid) timerid = QDEL_IN(src, 10) linked_gateway.uses = 0 linked_gateway.visible_message("[linked_gateway] is disrupted!") - animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 10, flags_1 = ANIMATION_END_NOW) + animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW) deltimer(linked_gateway.timerid) linked_gateway.timerid = QDEL_IN(linked_gateway, 10) return TRUE @@ -144,13 +144,13 @@ uses = max(0, uses - 1) linked_gateway.uses = max(0, linked_gateway.uses - 1) if(!uses) - animate(src, transform = matrix() * 0.1, time = 10, flags_1 = ANIMATION_END_NOW) - animate(linked_gateway, transform = matrix() * 0.1, time = 10, flags_1 = ANIMATION_END_NOW) + animate(src, transform = matrix() * 0.1, time = 10, flags = ANIMATION_END_NOW) + animate(linked_gateway, transform = matrix() * 0.1, time = 10, flags = ANIMATION_END_NOW) density = FALSE linked_gateway.density = FALSE else - animate(src, transform = matrix() / 1.5, time = 10, flags_1 = ANIMATION_END_NOW) - animate(linked_gateway, transform = matrix() / 1.5, time = 10, flags_1 = ANIMATION_END_NOW) + animate(src, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW) + animate(linked_gateway, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW) addtimer(CALLBACK(src, .proc/check_uses), 10) return TRUE diff --git a/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm index 74f7119193..570f6527f8 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm @@ -132,7 +132,7 @@ var/doortype = /obj/machinery/door/airlock/clockwork if(glass) doortype = /obj/machinery/door/airlock/clockwork/brass - return list("operation_time" = 60, "new_obj_type" = doortype, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = dir) + return list("operation_time" = 60, "new_obj_type" = doortype, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = dir, "transfer_name" = TRUE) /obj/machinery/door/airlock/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) return FALSE @@ -188,7 +188,7 @@ //Windoor conversion /obj/machinery/door/window/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) - return list("operation_time" = 30, "new_obj_type" = /obj/machinery/door/window/clockwork, "power_cost" = POWER_STANDARD, "spawn_dir" = dir, "dir_in_new" = TRUE) + return list("operation_time" = 30, "new_obj_type" = /obj/machinery/door/window/clockwork, "power_cost" = POWER_STANDARD, "spawn_dir" = dir, "dir_in_new" = TRUE, "transfer_name" = TRUE) /obj/machinery/door/window/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) return FALSE diff --git a/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm b/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm index c3888d6dae..2656d430d1 100644 --- a/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm +++ b/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm @@ -86,6 +86,7 @@ construct_type = /mob/living/simple_animal/drone/cogscarab w_class = WEIGHT_CLASS_SMALL var/infinite_resources = TRUE + var/static/obj/item/seasonal_hat //Share it with all other scarabs, since we're from the same cult! /obj/item/clockwork/construct_chassis/cogscarab/Initialize() . = ..() @@ -96,6 +97,12 @@ if(infinite_resources) //During rounds where they can't interact with the station, let them experiment with builds construct_type = /mob/living/simple_animal/drone/cogscarab/ratvar + if(!seasonal_hat) + var/obj/item/drone_shell/D = locate() in GLOB.poi_list + if(D && D.possible_seasonal_hats.len) + seasonal_hat = pick(D.possible_seasonal_hats) + else + seasonal_hat = "none" /obj/item/clockwork/construct_chassis/cogscarab/post_spawn(mob/living/construct) if(infinite_resources) //Allow them to build stuff and recite scripture @@ -104,3 +111,6 @@ F.uses_power = FALSE for(var/obj/item/clockwork/slab/S in cached_stuff) S.no_cost = TRUE + if(seasonal_hat && seasonal_hat != "none") + var/obj/item/hat = new seasonal_hat(construct) + construct.equip_to_slot_or_del(hat, slot_head) diff --git a/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm b/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm index bc8a5d47a5..fc11da9971 100644 --- a/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm +++ b/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm @@ -144,10 +144,14 @@ else if(new_thing_type) if(fabrication_values["dir_in_new"]) - new new_thing_type(get_turf(target), fabrication_values["spawn_dir"]) //please verify that your new object actually wants to get a dir in New() + var/atom/A = new new_thing_type(get_turf(target), fabrication_values["spawn_dir"]) //please verify that your new object actually wants to get a dir in New() + if(fabrication_values["transfer_name"]) + A.name = target.name else var/atom/A = new new_thing_type(get_turf(target)) A.setDir(fabrication_values["spawn_dir"]) + if(fabrication_values["transfer_name"]) + A.name = target.name if(!fabrication_values["no_target_deletion"]) //for some cases where fabrication_vals() modifies the object but doesn't want it deleted qdel(target) adjust_clockwork_power(-fabrication_values["power_cost"]) diff --git a/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm b/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm index c414ac2cce..60f95d6716 100644 --- a/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm +++ b/code/game/gamemodes/clock_cult/clock_items/wraith_spectacles.dm @@ -51,7 +51,7 @@ to_chat(victim, "\"It looks like Nar-Sie's dogs really don't value their eyes.\"") to_chat(victim, "Your eyes explode with horrific pain!") victim.emote("scream") - victim.become_blind() + victim.become_blind(EYE_DAMAGE) victim.adjust_blurriness(30) victim.adjust_blindness(30) return TRUE @@ -142,8 +142,8 @@ apply_eye_damage(H) else if(GLOB.ratvar_awakens) - H.cure_nearsighted() - H.cure_blind() + H.cure_nearsighted(list(EYE_DAMAGE)) + H.cure_blind(list(EYE_DAMAGE)) H.adjust_eye_damage(-eye_damage_done) eye_damage_done = 0 else if(prob(50) && eye_damage_done) @@ -166,5 +166,7 @@ if(eye_damage_done >= blind_breakpoint) if(!H.has_disability(DISABILITY_BLIND)) to_chat(H, "A piercing white light floods your vision. Suddenly, all goes dark!") + H.become_blind(EYE_DAMAGE) + if(prob(min(20, 5 + eye_damage_done))) to_chat(H, "Your eyes continue to burn.") diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm index 20c1d38389..b53caee281 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm @@ -1,3 +1,7 @@ +//Helper proc to get an Eminence mob if it exists +/proc/get_eminence() + return locate(/mob/camera/eminence) in servants_and_ghosts() + //The Eminence is a unique mob that functions like the leader of the cult. It's incorporeal but can interact with the world in several ways. /mob/camera/eminence name = "\the Emininence" @@ -12,6 +16,7 @@ layer = FLY_LAYER faction = list("ratvar") lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + var/turf/last_failed_turf var/static/superheated_walls = 0 /mob/camera/eminence/CanPass(atom/movable/mover, turf/target) @@ -20,25 +25,38 @@ /mob/camera/eminence/Move(NewLoc, direct) var/OldLoc = loc if(NewLoc && !istype(NewLoc, /turf/open/indestructible/reebe_void)) - forceMove(get_turf(NewLoc)) + var/turf/T = get_turf(NewLoc) + if(T.flags_1 & NOJAUNT_1) + if(last_failed_turf != T) + T.visible_message("[T] suddenly emits a ringing sound!", ignore_mob = src) + playsound(T, 'sound/machines/clockcult/ark_damage.ogg', 75, FALSE) + last_failed_turf = T + to_chat(src, "This turf is consecrated and can't be crossed!") + return + if(!GLOB.ratvar_awakens && istype(get_area(T), /area/chapel)) + to_chat(src, "The Chapel is hallowed ground under a heretical deity, and can't be accessed!") + return + forceMove(T) Moved(OldLoc, direct) if(GLOB.ratvar_awakens) for(var/turf/T in range(5, src)) if(prob(166 - (get_dist(src, T) * 33))) T.ratvar_act() //Causes moving to leave a swath of proselytized area behind the Eminence +/mob/camera/eminence/Process_Spacemove(movement_dir = 0) + return TRUE + /mob/camera/eminence/Login() ..() + add_servant_of_ratvar(src, TRUE) var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE) - if(!C) - add_servant_of_ratvar(src, TRUE) - C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE) - if(C && C.clock_team) - if(C.clock_team.eminence) - remove_servant_of_ratvar(src,TRUE) - qdel(src) - else - C.clock_team.eminence = src + if(C && C.clock_team) + if(C.clock_team.eminence && C.clock_team.eminence != src) + remove_servant_of_ratvar(src,TRUE) + qdel(src) + return + else + C.clock_team.eminence = src to_chat(src, "You have been selected as the Eminence!") to_chat(src, "As the Eminence, you lead the servants. Anything you say will be heard by the entire cult.") to_chat(src, "Though you can move through walls, you're also incorporeal, and largely can't interact with the world except for a few ways.") @@ -53,6 +71,12 @@ E.Grant(src) /mob/camera/eminence/say(message) + if(client) + if(client.prefs.muted & MUTE_IC) + to_chat(src, "You cannot send IC messages (muted).") + return + if(client.handle_spam_prevention(message,MUTE_IC)) + return message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) if(!message) return @@ -60,7 +84,13 @@ if(GLOB.ratvar_awakens) visible_message("You feel light slam into your mind and form words: \"[capitalize(message)]\"") playsound(src, 'sound/machines/clockcult/ark_scream.ogg', 50, FALSE) - hierophant_message("The Eminence: \"[message]\"") + message = "The [GLOB.ratvar_awakens ? "Radiance" : "Eminence"]: \"[message]\"" + for(var/mob/M in servants_and_ghosts()) + if(isobserver(M)) + var/link = FOLLOW_LINK(M, src) + to_chat(M, "[link] [message]") + else + to_chat(M, message) /mob/camera/eminence/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode) if(is_reebe(z) || is_servant_of_ratvar(speaker) || GLOB.ratvar_approaches || GLOB.ratvar_awakens) //Away from Reebe, the Eminence can't hear anything diff --git a/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm b/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm index 562814dfeb..73bcd6b47f 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm @@ -21,7 +21,7 @@ loot = list(/obj/item/clockwork/component/geis_capacitor/fallen_armor) light_range = 2 light_power = 1.1 - playstyle_string = "You are a clockwork marauder, a well-rounded frontline construct of Ratvar. Although you have no \ + playstyle_string = "You are a clockwork marauder, a well-rounded frontline construct of Ratvar. Although you have no \ unique abilities, you're a fearsome fighter in one-on-one combat, and your shield protects from projectiles!

Obey the Servants and do as they \ tell you. Your primary goal is to defend the Ark from destruction; they are your allies in this, and should be protected from harm." empower_string = "The Anima Bulwark's power flows through you! Your weapon will strike harder, your armor is sturdier, and your shield is more durable." diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm index 63fea1eeb6..21d1159541 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -113,7 +113,7 @@ /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/mass_recall() for(var/V in SSticker.mode.servants_of_ratvar) var/datum/mind/M = V - if(!M.current.stat) + if(M.current.stat != DEAD) M.current.forceMove(get_turf(src)) M.current.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) M.current.clear_fullscreen("flash", 5) diff --git a/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm b/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm index 495bfaeaa8..2edaba3b23 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm @@ -38,7 +38,6 @@ /obj/structure/destructible/clockwork/eminence_spire/attack_ghost(mob/user) if(!IsAdminGhost(user)) return - var/datum/antagonist/clockcult/random_cultist = locate() in GLOB.antagonists //if theres no cultists new team without eminence will be created anyway. if(random_cultist && random_cultist.clock_team && random_cultist.clock_team.eminence) to_chat(user, "There's already an Eminence - too late!") diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index da222fe521..1ce45eaace 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -163,7 +163,7 @@ /obj/item/twohanded/required/cult_bastard/afterattack(atom/target, mob/user, proximity, click_parameters) . = ..() - if(dash_toggled && jaunt.IsAvailable()) + if(dash_toggled) jaunt.Teleport(user, target) return if(!proximity) @@ -577,21 +577,21 @@ if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return if(!cultist_to_receive) - to_chat(user, "You require a destination!") + to_chat(user, "You require a destination!") log_game("Void torch failed - no target") return if(cultist_to_receive.stat == DEAD) - to_chat(user, "[cultist_to_receive] has died!") + to_chat(user, "[cultist_to_receive] has died!") log_game("Void torch failed - target died") return if(!iscultist(cultist_to_receive)) - to_chat(user, "[cultist_to_receive] is not a follower of the Geometer!") + to_chat(user, "[cultist_to_receive] is not a follower of the Geometer!") log_game("Void torch failed - target was deconverted") return if(A in user.GetAllContents()) - to_chat(user, "[A] must be on a surface in order to teleport it!") + to_chat(user, "[A] must be on a surface in order to teleport it!") return - to_chat(user, "You ignite [A] with \the [src], turning it to ash, but through the torch's flames you see that [A] has reached [cultist_to_receive]!") + to_chat(user, "You ignite [A] with \the [src], turning it to ash, but through the torch's flames you see that [A] has reached [cultist_to_receive]!") cultist_to_receive.put_in_hands(A) charges-- to_chat(user, "\The [src] now has [charges] charge\s.") diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 440dfaede6..a921868f22 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -10,7 +10,7 @@ ..() to_chat(user, "\The [src] is [anchored ? "":"not "]secured to the floor.") if((iscultist(user) || isobserver(user)) && cooldowntime > world.time) - to_chat(user, "The magic in [src] is too weak, [p_they()] will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") + to_chat(user, "The magic in [src] is too weak, [p_they()] will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") /obj/structure/destructible/cult/examine_status(mob/user) if(iscultist(user) || isobserver(user)) @@ -62,10 +62,10 @@ to_chat(user, "You're pretty sure you know exactly what this is used for and you can't seem to touch it.") return if(!anchored) - to_chat(user, "You need to anchor [src] to the floor with a tome first.") + to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") return var/choice = alert(user,"You study the schematics etched into the forge...",,"Eldritch Whetstone","Zealot's Blindfold","Flask of Unholy Water") var/pickedtype @@ -79,7 +79,7 @@ if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time) cooldowntime = world.time + 2400 var/obj/item/N = new pickedtype(get_turf(src)) - to_chat(user, "You kneel before the altar and your faith is rewarded with an [N]!") + to_chat(user, "You kneel before the altar and your faith is rewarded with an [N]!") /obj/structure/destructible/cult/forge @@ -95,15 +95,14 @@ to_chat(user, "The heat radiating from [src] pushes you back.") return if(!anchored) - to_chat(user, "You need to anchor [src] to the floor with a tome first.") + to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") return - var/option = "Shielded Robe" - option = input(user, "You study the schematics etched into the forge...", "[src]", option) as null|anything in list("Shielded Robe", "Flagellant's Robe", "Bastard Sword", "Nar-Sien Hardsuit") + var/choice = alert(user,"You study the schematics etched into the forge...",,"Shielded Robe","Flagellant's Robe","Bastard Sword") var/pickedtype - switch(option) + switch(choice) if("Shielded Robe") pickedtype = /obj/item/clothing/suit/hooded/cultrobes/cult_shield if("Flagellant's Robe") @@ -113,16 +112,13 @@ pickedtype = /obj/item/twohanded/required/cult_bastard else cooldowntime = 12000 - (world.time - SSticker.round_start_time) - to_chat(user, "The forge fires are not yet hot enough for this weapon, give it another [DisplayTimeText(cooldowntime)].") + to_chat(user, "The forge fires are not yet hot enough for this weapon, give it another [DisplayTimeText(cooldowntime)].") cooldowntime = 0 return - if("Nar-Sien Hardsuit") - pickedtype = /obj/item/clothing/suit/space/hardsuit/cult - if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time) cooldowntime = world.time + 2400 var/obj/item/N = new pickedtype(get_turf(src)) - to_chat(user, "You work the forge as dark knowledge guides your hands, creating [N]!") + to_chat(user, "You work the forge as dark knowledge guides your hands, creating [N]!") @@ -212,10 +208,10 @@ to_chat(user, "All of these books seem to be gibberish.") return if(!anchored) - to_chat(user, "You need to anchor [src] to the floor with a tome first.") + to_chat(user, "You need to anchor [src] to the floor with a tome first.") return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") + to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") return var/choice = alert(user,"You flip through the black pages of the archives...",,"Supply Talisman","Shuttle Curse","Veil Walker Set") var/list/pickedtype = list() @@ -231,7 +227,7 @@ cooldowntime = world.time + 2400 for(var/N in pickedtype) var/obj/item/D = new N(get_turf(src)) - to_chat(user, "You summon [D] from the archives!") + to_chat(user, "You summon [D] from the archives!") /obj/effect/gateway name = "gateway" diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 30e78ff1af..3f05cb4bfe 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -265,6 +265,7 @@ This file contains the arcane tome files. if(locate(/obj/effect/rune) in T) to_chat(user, "There is already a rune here.") return FALSE + if(!is_station_level(T.z) && !is_mining_level(T.z)) to_chat(user, "The veil is not weak enough here.") return FALSE diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 2da551fb07..2ddf5b05ee 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -140,7 +140,7 @@ structure_check() searches for nearby cultist structures required for the invoca L.say(invocation, language = /datum/language/common, ignore_spam = TRUE) if(invoke_damage) L.apply_damage(invoke_damage, BRUTE) - to_chat(L, "[src] saps your strength!") + to_chat(L, "[src] saps your strength!") do_invoke_glow() /obj/effect/rune/proc/do_invoke_glow() @@ -201,12 +201,12 @@ structure_check() searches for nearby cultist structures required for the invoca var/obj/item/paper/talisman/talisman_type var/list/possible_talismans = list() if(!papers_on_rune.len) - to_chat(user, "There must be a blank paper on top of [src]!") + to_chat(user, "There must be a blank paper on top of [src]!") fail_invoke() log_game("Talisman Creation rune failed - no blank papers on rune") return if(rune_in_use) - to_chat(user, "[src] can only support one ritual at a time!") + to_chat(user, "[src] can only support one ritual at a time!") fail_invoke() log_game("Talisman Creation rune failed - already in use") return @@ -222,7 +222,7 @@ structure_check() searches for nearby cultist structures required for the invoca return papers_on_rune = checkpapers() if(!papers_on_rune.len) - to_chat(user, "There must be a blank paper on top of [src]!") + to_chat(user, "There must be a blank paper on top of [src]!") fail_invoke() log_game("Talisman Creation rune failed - no blank papers on rune") return @@ -394,9 +394,9 @@ structure_check() searches for nearby cultist structures required for the invoca SSticker.mode.add_cultist(convertee.mind, 1) new /obj/item/tome(get_turf(src)) convertee.mind.special_role = "Cultist" - to_chat(convertee, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \ + to_chat(convertee, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \ and something evil takes root.") - to_chat(convertee, "Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve the Geometer above all else. Bring it back.\ + to_chat(convertee, "Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve the Geometer above all else. Bring it back.\ ") return 1 @@ -412,7 +412,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/big_sac = FALSE if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || C.cult_team.is_sacrifice_target(sacrificial.mind)) && invokers.len < 3) for(var/M in invokers) - to_chat(M, "[sacrificial] is too greatly linked to the world! You need three acolytes!") + to_chat(M, "[sacrificial] is too greatly linked to the world! You need three acolytes!") log_game("Offer rune failed - not enough acolytes and target is living or sac target") return FALSE if(sacrificial.mind) @@ -515,10 +515,10 @@ structure_check() searches for nearby cultist structures required for the invoca message_admins("[key_name_admin(user)] erased a Narsie rune with a null rod") ..() -//Rite of Resurrection: Requires the corpse of a cultist and that there have been less revives than the number of people GLOB.sacrificed +//Rite of Resurrection: Requires a dead or inactive cultist. When reviving the dead, you can only perform one revival for every sacrifice your cult has carried out. /obj/effect/rune/raise_dead - cultist_name = "Resurrect Cultist" - cultist_desc = "requires the corpse of a cultist placed upon the rune. Provided there have been sufficient sacrifices, they will be revived." + cultist_name = "Revive Cultist" + cultist_desc = "requires a dead, mindless, or inactive cultist placed upon the rune. Provided there have been sufficient sacrifices, they will be given a new life." invocation = "Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!" //Depends on the name of the user - see below icon_state = "1" color = RUNE_COLOR_MEDIUMRED @@ -539,16 +539,11 @@ structure_check() searches for nearby cultist structures required for the invoca return rune_in_use = TRUE for(var/mob/living/M in T.contents) - if(iscultist(M) && M.stat == DEAD) + if(iscultist(M) && (M.stat == DEAD || !M.client || M.client.is_afk())) potential_revive_mobs |= M if(!potential_revive_mobs.len) - to_chat(user, "There are no dead cultists on the rune!") - log_game("Raise Dead rune failed - no corpses to revive") - fail_invoke() - rune_in_use = FALSE - return - if(LAZYLEN(GLOB.sacrificed) <= revives_used) - to_chat(user, "You have sacrificed too few people to revive a cultist!") + to_chat(user, "There are no dead cultists on the rune!") + log_game("Raise Dead rune failed - no cultists to revive") fail_invoke() rune_in_use = FALSE return @@ -564,9 +559,25 @@ structure_check() searches for nearby cultist structures required for the invoca else invocation = initial(invocation) ..() - revives_used++ - mob_to_revive.revive(1, 1) //This does remove disabilities and such, but the rune might actually see some use because of it! - mob_to_revive.grab_ghost() + if(mob_to_revive.stat == DEAD) + if(LAZYLEN(GLOB.sacrificed) <= revives_used) + to_chat(user, "Your cult must carry out another sacrifice before it can revive a cultist!") + fail_invoke() + rune_in_use = FALSE + return + revives_used++ + mob_to_revive.revive(1, 1) //This does remove disabilities and such, but the rune might actually see some use because of it! + mob_to_revive.grab_ghost() + else if(!mob_to_revive.client || mob_to_revive.client.is_afk()) + set waitfor = FALSE + var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [mob_to_revive.name], an inactive blood cultist?", "[name]", null, "Blood Cultist", 50, mob_to_revive) + var/mob/dead/observer/theghost = null + if(candidates.len) + theghost = pick(candidates) + to_chat(mob_to_revive.mind, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form.") + message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(mob_to_revive)]) to replace an AFK player.") + mob_to_revive.ghostize(0) + mob_to_revive.key = theghost.key to_chat(mob_to_revive, "\"PASNAR SAVRAE YAM'TOTH. Arise.\"") mob_to_revive.visible_message("[mob_to_revive] draws in a huge breath, red light shining from [mob_to_revive.p_their()] eyes.", \ "You awaken suddenly from the void. You're alive!") @@ -582,13 +593,13 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() return FALSE if(!(target_mob in T.contents)) - to_chat(user, "The cultist to revive has been moved!") + to_chat(user, "The cultist to revive has been moved!") fail_invoke() log_game("Raise Dead rune failed - revival target moved") return FALSE var/mob/dead/observer/ghost = target_mob.get_ghost(TRUE) if(!ghost && (!target_mob.mind || !target_mob.mind.active)) - to_chat(user, "The corpse to revive has no spirit!") + to_chat(user, "The corpse to revive has no spirit!") fail_invoke() log_game("Raise Dead rune failed - revival target has no ghost") return FALSE @@ -655,16 +666,16 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/spirit/examine(mob/user) ..() if(affecting) - to_chat(user, "A translucent field encases [affecting] above the rune!") + to_chat(user, "A translucent field encases [affecting] above the rune!") /obj/effect/rune/spirit/can_invoke(mob/living/user) if(rune_in_use) - to_chat(user, "[src] cannot support more than one body!") + to_chat(user, "[src] cannot support more than one body!") log_game("Spirit Sight rune failed - more than one user") return list() var/turf/T = get_turf(src) if(!(user in T)) - to_chat(user, "You must be standing on top of [src]!") + to_chat(user, "You must be standing on top of [src]!") log_game("Spirit Sight rune failed - user not standing on rune") return list() return ..() @@ -694,11 +705,11 @@ structure_check() searches for nearby cultist structures required for the invoca if(affecting.stat == UNCONSCIOUS) if(prob(1)) var/mob/dead/observer/G = affecting.get_ghost() - to_chat(G, "You feel the link between you and your body weakening... you must hurry!") + to_chat(G, "You feel the link between you and your body weakening... you must hurry!") else if(affecting.stat == DEAD) affecting.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED) var/mob/dead/observer/G = affecting.get_ghost() - to_chat(G, "You suddenly feel your physical form pass on. [src]'s exertion has killed you!") + to_chat(G, "You suddenly feel your physical form pass on. [src]'s exertion has killed you!") break sleep(1) affecting = null @@ -722,7 +733,7 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/wall/examine(mob/user) ..() if(density) - to_chat(user, "There is a barely perceptible shimmering of the air above [src].") + to_chat(user, "There is a barely perceptible shimmering of the air above [src].") /obj/effect/rune/wall/Destroy() density = FALSE @@ -744,7 +755,7 @@ structure_check() searches for nearby cultist structures required for the invoca spread_density() var/carbon_user = iscarbon(user) user.visible_message("[user] [carbon_user ? "places [user.p_their()] hands on":"stares intently at"] [src], and [density ? "the air above it begins to shimmer" : "the shimmer above it fades"].", \ - "You channel [carbon_user ? "your life ":""]energy into [src], [density ? "temporarily preventing" : "allowing"] passage above it.") + "You channel [carbon_user ? "your life ":""]energy into [src], [density ? "temporarily preventing" : "allowing"] passage above it.") if(carbon_user) var/mob/living/carbon/C = user C.apply_damage(2, BRUTE, pick("l_arm", "r_arm")) @@ -806,17 +817,17 @@ structure_check() searches for nearby cultist structures required for the invoca if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return if(!cultist_to_summon) - to_chat(user, "You require a summoning target!") + to_chat(user, "You require a summoning target!") fail_invoke() log_game("Summon Cultist rune failed - no target") return if(cultist_to_summon.stat == DEAD) - to_chat(user, "[cultist_to_summon] has died!") + to_chat(user, "[cultist_to_summon] has died!") fail_invoke() log_game("Summon Cultist rune failed - target died") return if(!iscultist(cultist_to_summon)) - to_chat(user, "[cultist_to_summon] is not a follower of the Geometer!") + to_chat(user, "[cultist_to_summon] is not a follower of the Geometer!") fail_invoke() log_game("Summon Cultist rune failed - target was deconverted") return @@ -826,7 +837,7 @@ structure_check() searches for nearby cultist structures required for the invoca log_game("Summon Cultist rune failed - target in away mission") return cultist_to_summon.visible_message("[cultist_to_summon] suddenly disappears in a flash of red light!", \ - "Overwhelming vertigo consumes you as you are hurled through the air!") + "Overwhelming vertigo consumes you as you are hurled through the air!") ..() visible_message("A foggy shape materializes atop [src] and solidifes into [cultist_to_summon]!") cultist_to_summon.forceMove(get_turf(src)) @@ -914,17 +925,17 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/manifest/can_invoke(mob/living/user) if(!(user in get_turf(src))) - to_chat(user, "You must be standing on [src]!") + to_chat(user, "You must be standing on [src]!") fail_invoke() log_game("Manifest rune failed - user not standing on rune") return list() if(user.has_status_effect(STATUS_EFFECT_SUMMONEDGHOST)) - to_chat(user, "Ghosts can't summon more ghosts!") + to_chat(user, "Ghosts can't summon more ghosts!") fail_invoke() log_game("Manifest rune failed - user is a ghost") return list() if(ghosts >= ghost_limit) - to_chat(user, "You are sustaining too many ghosts to summon more!") + to_chat(user, "You are sustaining too many ghosts to summon more!") fail_invoke() log_game("Manifest rune failed - too many summoned ghosts") return list() @@ -933,7 +944,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(O.client && !jobban_isbanned(O, ROLE_CULTIST)) ghosts_on_rune += O if(!ghosts_on_rune.len) - to_chat(user, "There are no spirits near [src]!") + to_chat(user, "There are no spirits near [src]!") fail_invoke() log_game("Manifest rune failed - no nearby ghosts") return list() @@ -955,13 +966,13 @@ structure_check() searches for nearby cultist structures required for the invoca ghosts++ playsound(src, 'sound/magic/exit_blood.ogg', 50, 1) visible_message("A cloud of red mist forms above [src], and from within steps... a [new_human.gender == FEMALE ? "wo":""]man.") - to_chat(user, "Your blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...") + to_chat(user, "Your blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...") var/turf/T = get_turf(src) var/obj/structure/emergency_shield/invoker/N = new(T) new_human.key = ghost_to_spawn.key SSticker.mode.add_cultist(new_human.mind, 0) - to_chat(new_human, "You are a servant of the Geometer. You have been made semi-corporeal by the cult of Nar-Sie, and you are to serve them at all costs.") + to_chat(new_human, "You are a servant of the Geometer. You have been made semi-corporeal by the cult of Nar-Sie, and you are to serve them at all costs.") while(!QDELETED(src) && !QDELETED(user) && !QDELETED(new_human) && (user in T)) if(user.stat || new_human.InCritical()) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 855dfa7255..588b45d5f6 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -39,7 +39,7 @@ invocation = "Ra'sha yoka!" /obj/item/paper/talisman/malformed/invoke(mob/living/user, successfuluse = 1) - to_chat(user, "You feel a pain in your head. The Geometer is displeased.") + to_chat(user, "You feel a pain in your head. The Geometer is displeased.") if(iscarbon(user)) var/mob/living/carbon/C = user C.apply_damage(10, BRUTE, "head") @@ -79,7 +79,7 @@ to_chat(user, "The target rune is blocked. Attempting to teleport to it would be massively unwise.") return ..(user, 0) user.visible_message("Dust flows from [user]'s hand, and [user.p_they()] disappear[user.p_s()] with a sharp crack!", \ - "You speak the words of the talisman and find yourself somewhere else!", "You hear a sharp crack.") + "You speak the words of the talisman and find yourself somewhere else!", "You hear a sharp crack.") user.forceMove(target) target.visible_message("There is a boom of outrushing air as something appears above the rune!", null, "You hear a boom.") return ..() @@ -96,10 +96,10 @@ /obj/item/paper/talisman/summon_tome/invoke(mob/living/user, successfuluse = 1) . = ..() user.visible_message("[user]'s hand glows red for a moment.", \ - "You speak the words of the talisman!") + "You speak the words of the talisman!") new /obj/item/tome(get_turf(user)) user.visible_message("A tome appears at [user]'s feet!", \ - "An arcane tome materializes at your feet.") + "An arcane tome materializes at your feet.") /obj/item/paper/talisman/true_sight cultist_name = "Talisman of Veiling" @@ -115,14 +115,14 @@ . = ..() if(!revealing) user.visible_message("Thin grey dust falls from [user]'s hand!", \ - "You speak the words of the talisman, hiding nearby runes.") + "You speak the words of the talisman, hiding nearby runes.") invocation = "Nikt'o barada kla'atu!" revealing = TRUE for(var/obj/effect/rune/R in range(4,user)) R.talismanhide() else user.visible_message("A flash of light shines from [user]'s hand!", \ - "You speak the words of the talisman, revealing nearby runes.") + "You speak the words of the talisman, revealing nearby runes.") for(var/obj/effect/rune/R in range(3,user)) R.talismanreveal() @@ -137,7 +137,7 @@ /obj/item/paper/talisman/emp/invoke(mob/living/user, successfuluse = 1) . = ..() user.visible_message("[user]'s hand flashes a bright blue!", \ - "You speak the words of the talisman, emitting an EMP blast.") + "You speak the words of the talisman, emitting an EMP blast.") empulse(src, 4, 8) @@ -162,7 +162,7 @@ if(iscultist(user)) invoke(user, 1) user.visible_message("[user] holds up [src], which explodes in a flash of red light!", \ - "You stun [target] with the talisman!") + "You stun [target] with the talisman!") var/obj/item/nullrod/N = locate() in target if(N) target.visible_message("[target]'s holy weapon absorbs the talisman's light!", \ @@ -197,7 +197,7 @@ /obj/item/paper/talisman/armor/invoke(mob/living/user, successfuluse = 1) . = ..() user.visible_message("Otherworldly armor suddenly appears on [user]!", \ - "You speak the words of the talisman, arming yourself!") + "You speak the words of the talisman, arming yourself!") user.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), slot_head) user.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), slot_wear_suit) user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult/alt(user), slot_shoes) @@ -226,7 +226,7 @@ /obj/item/paper/talisman/horror/afterattack(mob/living/target, mob/living/user) if(iscultist(user) && (get_dist(user, target) < 7)) if(iscarbon(target)) - to_chat(user, "You disturb [target] with visions of madness!") + to_chat(user, "You disturb [target] with visions of madness!") var/mob/living/carbon/H = target H.reagents.add_reagent("mindbreaker", 12) if(is_servant_of_ratvar(target)) @@ -254,7 +254,7 @@ /obj/item/paper/talisman/construction/attack(obj/M,mob/living/user) if(iscultist(user)) - to_chat(user, "This talisman will only work on a stack of metal or plasteel sheets!") + to_chat(user, "This talisman will only work on a stack of metal or plasteel sheets!") log_game("Construct talisman failed - not a valid target") else ..() @@ -306,7 +306,7 @@ /obj/item/paper/talisman/shackle/attack(mob/living/carbon/target, mob/living/user) if(iscultist(user) && istype(target)) if(target.stat == DEAD) - user.visible_message("This talisman's magic does not affect the dead!") + user.visible_message("This talisman's magic does not affect the dead!") return CuffAttack(target, user) return diff --git a/code/game/gamemodes/devil/imp/imp.dm b/code/game/gamemodes/devil/imp/imp.dm index 70ed6dfc1d..88ff9f1668 100644 --- a/code/game/gamemodes/devil/imp/imp.dm +++ b/code/game/gamemodes/devil/imp/imp.dm @@ -34,7 +34,7 @@ var/boost = 0 bloodcrawl = BLOODCRAWL_EAT var/list/consumed_mobs = list() - var/playstyle_string = "You are an imp, a mischevious creature from hell. You are the lowest rank on the hellish totem pole \ + var/playstyle_string = "You are an imp, a mischevious creature from hell. You are the lowest rank on the hellish totem pole \ Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \ of intentionally harming a fellow devil." diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index a4b9398de4..8962476491 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -304,7 +304,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( sleep(30) if(!owner || QDELETED(owner)) return - priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", 'sound/AI/aimalf.ogg') + priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", 'sound/ai/aimalf.ogg') set_security_level("delta") var/obj/machinery/doomsday_device/DOOM = new(owner_AI) owner_AI.nuking = TRUE @@ -367,12 +367,12 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( var/sec_left = seconds_remaining() if(!sec_left) timing = FALSE - detonate(T.z) + detonate() else if(world.time >= next_announce) minor_announce("[sec_left] SECONDS UNTIL DOOMSDAY DEVICE ACTIVATION!", "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4", TRUE) next_announce += DOOMSDAY_ANNOUNCE_INTERVAL -/obj/machinery/doomsday_device/proc/detonate(z_level = ZLEVEL_STATION_PRIMARY) +/obj/machinery/doomsday_device/proc/detonate() sound_to_playing_players('sound/machines/alarm.ogg') sleep(100) for(var/i in GLOB.mob_living_list) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 780be71694..9e0c965271 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -105,7 +105,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event /obj/effect/meteor/Move() if(z != z_original || loc == dest) qdel(src) - return + return FALSE . = ..() //process movement... @@ -317,7 +317,6 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event /obj/effect/meteor/meaty/xeno/New() meteordrop += subtypesof(/obj/item/organ/alien) - meteordrop -= /obj/item/organ/alien/eggsac ..() /obj/effect/meteor/meaty/xeno/ram_turf(turf/T) diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index 508f4e9f13..7e49415834 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -300,11 +300,10 @@ /obj/item/organ/heart/gland/plasma/activate() to_chat(owner, "You feel bloated.") - sleep(150) - if(!owner) - return - to_chat(owner, "A massive stomachache overcomes you.") - sleep(50) + addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, owner, "A massive stomachache overcomes you."), 150) + addtimer(CALLBACK(src, .proc/vomit_plasma), 200) + +/obj/item/organ/heart/gland/plasma/proc/vomit_plasma() if(!owner) return owner.visible_message("[owner] vomits a cloud of plasma!") diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 956af60580..729a273c53 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -322,10 +322,6 @@ to_chat(S, "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting.") return FALSE -/obj/machinery/message_server/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting.") - return FALSE - /obj/machinery/deepfryer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "This kitchen appliance should be preserved, it will make delicious unhealthy snacks for our masters in the future. Aborting.") return FALSE diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm index ff426ab625..15ae0a7fe1 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm @@ -1,8 +1,8 @@ /datum/round_event_control/spawn_swarmer name = "Spawn Swarmer Shell" typepath = /datum/round_event/spawn_swarmer - weight = 0 - max_occurrences = 0 //Only once okay fam + weight = 7 + max_occurrences = 1 //Only once okay fam earliest_start = 18000 //30 minutes min_players = 15 @@ -16,7 +16,7 @@ return 0 new /obj/effect/mob_spawn/swarmer(get_turf(GLOB.the_gateway)) if(prob(25)) //25% chance to announce it to the crew - var/swarmer_report = "[command_name()] High-Priority Update" + var/swarmer_report = "[command_name()] High-Priority Update" swarmer_report += "

Our long-range sensors have detected an odd signal emanating from your station's gateway. We recommend immediate investigation of your gateway, as something may have come through." print_command_report(swarmer_report, announce=TRUE) diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm index 2ebc21adac..158ba09d43 100644 --- a/code/game/gamemodes/miniantags/morph/morph.dm +++ b/code/game/gamemodes/miniantags/morph/morph.dm @@ -41,7 +41,7 @@ /mob/living/simple_animal/hostile/morph, /obj/effect)) - var/playstyle_string = "You are a morph, an abomination of science created primarily with changeling cells. \ + var/playstyle_string = "You are a morph, an abomination of science created primarily with changeling cells. \ You may take the form of anything nearby by shift-clicking it. This process will alert any nearby \ observers, and can only be performed once every five seconds. While morphed, you move faster, but do \ less damage. In addition, anyone within three tiles will note an uncanny wrongness if examining you. \ diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index 441689fb9b..002e1b3809 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -64,7 +64,7 @@ /mob/living/simple_animal/revenant/Login() ..() - to_chat(src, "You are a revenant.") + to_chat(src, "You are a revenant.") to_chat(src, "Your formerly mundane spirit has been infused with alien energies and empowered into a revenant.") to_chat(src, "You are not dead, not alive, but somewhere in between. You are capable of limited interaction with both worlds.") to_chat(src, "You are invincible and invisible to everyone but other ghosts. Most abilities will reveal you, rendering you vulnerable.") diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 8739ba22eb..e8eb95aa7b 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -35,7 +35,7 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE var/boost = 0 bloodcrawl = BLOODCRAWL_EAT - var/playstyle_string = "You are a slaughter demon, a terrible creature from another realm. You have a single desire: To kill. \ + var/playstyle_string = "You are a slaughter demon, a terrible creature from another realm. You have a single desire: To kill. \ You may use the \"Blood Crawl\" ability near blood pools to travel through them, appearing and disappearing from the station at will. \ Pulling a dead or unconscious mob while you enter a pool will pull them in with you, allowing you to feast and regain your health. \ You move quickly upon leaving a pool of blood, but the material world will soon sap your strength and leave you sluggish. " @@ -136,8 +136,8 @@ // Keep the people we hug! var/list/consumed_mobs = list() - playstyle_string = "You are a laughter \ - demon, a wonderful creature from another realm. You have a single \ + playstyle_string = "You are a laughter \ + demon, a wonderful creature from another realm. You have a single \ desire: To hug and tickle.
\ You may use the \"Blood Crawl\" ability near blood pools to travel \ through them, appearing and disappearing from the station at will. \ diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 890a3bb456..f131046cac 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -141,8 +141,8 @@ /datum/outfit/syndicate/post_equip(mob/living/carbon/human/H) var/obj/item/device/radio/R = H.ears - R.set_frequency(GLOB.SYND_FREQ) - R.freqlock = 1 + R.set_frequency(FREQ_SYNDICATE) + R.freqlock = TRUE if(command_radio) R.command = TRUE diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index bf85215f94..1cc0abe76a 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -572,4 +572,4 @@ This is here to make the tiles around the station mininuke change when it's arme user.visible_message("[user] is pretending to go delta! It looks like [user.p_theyre()] trying to commit suicide!") playsound(src, 'sound/machines/alarm.ogg', 30, -1, 1) addtimer(CALLBACK(src, .proc/manual_suicide, user), 101) - return MANUAL_SUICIDE + return MANUAL_SUICIDE \ No newline at end of file diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index a505d6248b..4b147e9446 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1,6 +1,6 @@ /datum/objective var/datum/mind/owner //The primary owner of the objective. !!SOMEWHAT DEPRECATED!! Prefer using 'team' for new code. - var/datum/objective_team/team //An alternative to 'owner': a team. Use this when writing new code. + var/datum/team/team //An alternative to 'owner': a team. Use this when writing new code. var/explanation_text = "Nothing" //What that person is supposed to do. var/team_explanation_text //For when there are multiple owners. var/datum/mind/target = null //If they are focused on a particular person. @@ -47,9 +47,9 @@ . = list() for(var/V in GLOB.data_core.locked) var/datum/data/record/R = V - var/mob/M = R.fields["reference"] - if(M && M.mind) - . += M.mind + var/datum/mind/M = R.fields["mindref"] + if(M) + . += M /datum/objective/proc/find_target() var/list/datum/mind/owners = get_owners() @@ -524,7 +524,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) var/list/otherwise = M.GetAllContents() for(var/obj/item/disk/tech_disk/TD in otherwise) TD.stored_research.copy_research_to(checking) - return checking.researched_nodes.len >= target + return checking.researched_nodes.len >= target_amount /datum/objective/capture @@ -537,25 +537,25 @@ GLOBAL_LIST_EMPTY(possible_items_special) var/captured_amount = 0 var/area/centcom/holding/A = locate() in GLOB.sortedAreas for(var/mob/living/carbon/human/M in A)//Humans. - if(M.stat==2)//Dead folks are worth less. + if(M.stat == DEAD)//Dead folks are worth less. captured_amount+=0.5 continue captured_amount+=1 for(var/mob/living/carbon/monkey/M in A)//Monkeys are almost worthless, you failure. captured_amount+=0.1 for(var/mob/living/carbon/alien/larva/M in A)//Larva are important for research. - if(M.stat==2) + if(M.stat == DEAD) captured_amount+=0.5 continue captured_amount+=1 for(var/mob/living/carbon/alien/humanoid/M in A)//Aliens are worth twice as much as humans. if(istype(M, /mob/living/carbon/alien/humanoid/royal/queen))//Queens are worth three times as much as humans. - if(M.stat==2) + if(M.stat == DEAD) captured_amount+=1.5 else captured_amount+=3 continue - if(M.stat==2) + if(M.stat == DEAD) captured_amount+=1 continue captured_amount+=2 diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 101a33e551..13b4234622 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -27,7 +27,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) //items that shouldn't spawn on the floor because they would bug or act weird var/global/list/spawn_forbidden = list( /obj/item/tk_grab, /obj/item/implant, // not implanter, the actual thing that is inside you - /obj/item/assembly, /obj/item/device/onetankbomb, /obj/item/radio, /obj/item/device/pda/ai, + /obj/item/assembly, /obj/item/device/onetankbomb, /obj/item/device/pda/ai, /obj/item/smallDelivery, /obj/item/projectile, /obj/item/borg/sight, /obj/item/borg/stun, /obj/item/robot_module) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 0d9655ae8e..1d423802d1 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -47,7 +47,7 @@ for(var/datum/mind/wizard in wizards) if(isliving(wizard.current) && wizard.current.stat!=DEAD) return FALSE - + for(var/obj/item/phylactery/P in GLOB.poi_list) //TODO : IsProperlyDead() if(P.mind && P.mind.has_antag_datum(/datum/antagonist/wizard)) return FALSE @@ -55,7 +55,7 @@ if(SSevents.wizardmode) //If summon events was active, turn it off SSevents.toggleWizardmode() SSevents.resetFrequency() - + return TRUE /datum/game_mode/wizard/set_round_result() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 61a5d7271d..52702868f7 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -15,7 +15,7 @@ state_open = TRUE circuit = /obj/item/circuitboard/machine/sleeper var/efficiency = 1 - var/min_health = 30 + var/min_health = -25 var/list/available_chems var/controls_inside = FALSE var/list/possible_chems = list( @@ -42,7 +42,7 @@ I += M.rating efficiency = initial(efficiency)* E - min_health = initial(min_health) - (10*E) + min_health = initial(min_health) - (10*(E-1)) // CIT CHANGE - changes min health equation to be min_health - (matterbin rating * 10) available_chems = list() for(var/i in 1 to I) available_chems |= possible_chems[i] diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 01651e6e08..2170636f43 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -8,7 +8,7 @@ /obj/machinery/door/airlock/receive_signal(datum/signal/signal) - if(!signal || signal.encryption) + if(!signal) return if(id_tag != signal.data["tag"] || !signal.data["command"]) @@ -52,15 +52,13 @@ /obj/machinery/door/airlock/proc/send_status() if(radio_connection) - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.data["tag"] = id_tag - signal.data["timestamp"] = world.time - - signal.data["door_status"] = density?("closed"):("open") - signal.data["lock_status"] = locked?("locked"):("unlocked") - - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = GLOB.RADIO_AIRLOCK) + var/datum/signal/signal = new(list( + "tag" = id_tag, + "timestamp" = world.time, + "door_status" = density ? "closed" : "open", + "lock_status" = locked ? "locked" : "unlocked" + )) + radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) /obj/machinery/door/airlock/open(surpress_send) @@ -79,10 +77,10 @@ SSradio.remove_object(src, frequency) if(new_frequency) frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_AIRLOCK) + radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK) /obj/machinery/door/airlock/Destroy() - if(frequency && SSradio) + if(frequency) SSradio.remove_object(src,frequency) return ..() @@ -97,7 +95,7 @@ var/id_tag var/master_tag - var/frequency = 1449 + var/frequency = FREQ_AIRLOCK_CONTROL var/datum/radio_frequency/radio_connection @@ -115,36 +113,34 @@ icon_state = "airlock_sensor_off" /obj/machinery/airlock_sensor/attack_hand(mob/user) - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.data["tag"] = master_tag - signal.data["command"] = "cycle" + var/datum/signal/signal = new(list( + "tag" = master_tag, + "command" = "cycle" + )) - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = GLOB.RADIO_AIRLOCK) + radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) flick("airlock_sensor_cycle", src) /obj/machinery/airlock_sensor/process() if(on) - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.data["tag"] = id_tag - signal.data["timestamp"] = world.time - var/datum/gas_mixture/air_sample = return_air() - var/pressure = round(air_sample.return_pressure(),0.1) alert = (pressure < ONE_ATMOSPHERE*0.8) - signal.data["pressure"] = num2text(pressure) + var/datum/signal/signal = new(list( + "tag" = id_tag, + "timestamp" = world.time, + "pressure" = num2text(pressure) + )) - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = GLOB.RADIO_AIRLOCK) + radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) update_icon() /obj/machinery/airlock_sensor/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_AIRLOCK) + radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK) /obj/machinery/airlock_sensor/Initialize() . = ..() @@ -152,4 +148,4 @@ /obj/machinery/airlock_sensor/Destroy() SSradio.remove_object(src,frequency) - return ..() + return ..() \ No newline at end of file diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 4cd7e7f0fe..b216d1752f 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -53,7 +53,7 @@ radio = new(src) radio.keyslot = new radio_key - radio.subspace_transmission = 1 + radio.subspace_transmission = TRUE radio.canhear_range = 0 radio.recalculateChannels() diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 085b55c2e1..9c28be28b7 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -44,8 +44,7 @@ /obj/item/grenade/chem_grenade/glitter/blue = 1, /obj/item/grenade/chem_grenade/glitter/white = 1, /obj/item/toy/eightball = 2, - /obj/item/toy/windupToolbox = 2, - /obj/item/toy/sword/cx = 2) + /obj/item/toy/windupToolbox = 2) light_color = LIGHT_COLOR_GREEN @@ -418,17 +417,17 @@ dat += "
You ran out of food and starved." if(emagged) user.nutrition = 0 //yeah you pretty hongry - to_chat(user, "Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.") + to_chat(user, "Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.") if(fuel <= 0) dat += "
You ran out of fuel, and drift, slowly, into a star." if(emagged) var/mob/living/M = user M.adjust_fire_stacks(5) M.IgniteMob() //flew into a star, so you're on fire - to_chat(user, "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.") + to_chat(user, "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.") if(emagged) - to_chat(user, "You're never going to make it to Orion...") + to_chat(user, "You're never going to make it to Orion...") user.death() emagged = FALSE //removes the emagged status after you lose gameStatus = ORION_STATUS_START diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index f5115c7e2a..94f5e63afb 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -6,7 +6,7 @@ icon_keyboard = "atmos_key" var/list/priority_alarms = list() var/list/minor_alarms = list() - var/receive_frequency = 1437 + var/receive_frequency = FREQ_ATMOS_ALARMS var/datum/radio_frequency/radio_connection light_color = LIGHT_COLOR_CYAN @@ -57,10 +57,10 @@ /obj/machinery/computer/atmos_alert/proc/set_frequency(new_frequency) SSradio.remove_object(src, receive_frequency) receive_frequency = new_frequency - radio_connection = SSradio.add_object(src, receive_frequency, GLOB.RADIO_ATMOSIA) + radio_connection = SSradio.add_object(src, receive_frequency, RADIO_ATMOSIA) /obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal) - if(!signal || signal.encryption) + if(!signal) return var/zone = signal.data["zone"] diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index a4881546cf..3c53c395f4 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -11,7 +11,7 @@ var/on = TRUE var/id_tag - var/frequency = 1441 + var/frequency = FREQ_ATMOS_STORAGE var/datum/radio_frequency/radio_connection /obj/machinery/air_sensor/update_icon() @@ -19,31 +19,29 @@ /obj/machinery/air_sensor/process_atmos() if(on) - var/datum/signal/signal = new var/datum/gas_mixture/air_sample = return_air() - signal.transmission_method = 1 //radio signal - signal.data = list( + var/datum/signal/signal = new(list( "sigtype" = "status", "id_tag" = id_tag, "timestamp" = world.time, "pressure" = air_sample.return_pressure(), "temperature" = air_sample.temperature, "gases" = list() - ) + )) var/total_moles = air_sample.total_moles() if(total_moles) for(var/gas_id in air_sample.gases) var/gas_name = air_sample.gases[gas_id][GAS_META][META_GAS_NAME] signal.data["gases"][gas_name] = air_sample.gases[gas_id][MOLES] / total_moles * 100 - radio_connection.post_signal(src, signal, filter = GLOB.RADIO_ATMOSIA) + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) /obj/machinery/air_sensor/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_ATMOSIA) + radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) /obj/machinery/air_sensor/Initialize() . = ..() @@ -66,7 +64,7 @@ icon_keyboard = "atmos_key" circuit = /obj/item/circuitboard/computer/atmos_control - var/frequency = 1441 + var/frequency = FREQ_ATMOS_STORAGE var/list/sensors = list( "n2_sensor" = "Nitrogen Tank", "o2_sensor" = "Oxygen Tank", @@ -117,7 +115,7 @@ return data /obj/machinery/computer/atmos_control/receive_signal(datum/signal/signal) - if(!signal || signal.encryption) + if(!signal) return var/id_tag = signal.data["id_tag"] @@ -129,7 +127,7 @@ /obj/machinery/computer/atmos_control/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_ATMOSIA) + radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) ///////////////////////////////////////////////////////////// // LARGE TANK CONTROL @@ -138,7 +136,7 @@ /obj/machinery/computer/atmos_control/tank var/input_tag var/output_tag - frequency = 1441 + frequency = FREQ_ATMOS_STORAGE circuit = /obj/item/circuitboard/computer/atmos_control/tank var/list/input_info @@ -147,7 +145,7 @@ // This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this /obj/machinery/computer/atmos_control/tank/proc/reconnect(mob/user) var/list/IO = list() - var/datum/radio_frequency/freq = SSradio.return_frequency(1441) + var/datum/radio_frequency/freq = SSradio.return_frequency(FREQ_ATMOS_STORAGE) var/list/devices = freq.devices["_default"] for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices) var/list/text = splittext(U.id_tag, "_") @@ -194,10 +192,7 @@ /obj/machinery/computer/atmos_control/tank/ui_act(action, params) if(..() || !radio_connection) return - var/datum/signal/signal = new - signal.transmission_method = 1 - signal.source = src - signal.data = list("sigtype" = "command") + var/datum/signal/signal = new(list("sigtype" = "command")) switch(action) if("reconnect") reconnect(usr) @@ -214,10 +209,10 @@ target = CLAMP(target, 0, 50 * ONE_ATMOSPHERE) signal.data += list("tag" = output_tag, "set_internal_pressure" = target) . = TRUE - radio_connection.post_signal(src, signal, filter = GLOB.RADIO_ATMOSIA) + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) /obj/machinery/computer/atmos_control/tank/receive_signal(datum/signal/signal) - if(!signal || signal.encryption) + if(!signal) return var/id_tag = signal.data["tag"] @@ -227,4 +222,4 @@ else if(output_tag == id_tag) output_info = signal.data else - ..(signal) \ No newline at end of file + ..(signal) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index a8199190fd..c90b6152d0 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -311,6 +311,9 @@ else if(isspaceturf(T)) to_chat(user, "[prob(1) ? "Servant cannot into space." : "You can't teleport into space."]") return + else if(T.flags_1 & NOJAUNT_1) + to_chat(user, "This tile is blessed by holy water and deflects the warp.") + return var/area/AR = get_area(T) if(!AR.clockwork_warp_allowed) to_chat(user, "[AR.clockwork_warp_fail]") diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 2cb4528de4..0707ca0427 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -28,7 +28,6 @@ var/const/STATE_TOGGLE_EMERGENCY = 10 var/const/STATE_PURCHASE = 11 - var/status_display_freq = "1435" var/stat_msg1 var/stat_msg2 @@ -136,6 +135,7 @@ to_chat(usr, "Arrays recycling. Please stand by.") playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) return + var/input = stripped_multiline_input(usr, "Please choose a message to transmit to allied stations. Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "") if(!input || !(usr in view(1,src))) return @@ -228,7 +228,7 @@ log_game("[key_name(usr)] answered [currmsg.title] comm message. Answer : [currmsg.answered]") if(currmsg) currmsg.answer_callback.Invoke() - + state = STATE_VIEWMESSAGE if("status") state = STATE_STATUSDISPLAY @@ -464,8 +464,9 @@ if (authenticated==2) dat += "

Captain Functions" dat += "
\[ Make a Captain's Announcement \]" - if(CONFIG_GET(string/cross_server_address)) - dat += "
\[ Send a message to an allied station \]" + var/cross_servers_count = length(CONFIG_GET(keyed_string_list/cross_server)) + if(cross_servers_count) + dat += "
\[ Send a message to [cross_servers_count == 1 ? "an " : ""]allied station[cross_servers_count > 1 ? "s" : ""] \]" if(SSmapping.config.allow_custom_shuttles) dat += "
\[ Purchase Shuttle \]" dat += "
\[ Change Alert Level \]" @@ -693,16 +694,12 @@ /obj/machinery/computer/communications/proc/post_status(command, data1, data2) - var/datum/radio_frequency/frequency = SSradio.return_frequency(1435) + var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS) if(!frequency) return - var/datum/signal/status_signal = new - status_signal.source = src - status_signal.transmission_method = 1 - status_signal.data["command"] = command - + var/datum/signal/status_signal = new(list("command" = command)) switch(command) if("message") status_signal.data["msg1"] = data1 diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 37225cbf19..5bdd6a7b27 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -108,9 +108,9 @@ else scanner_status = "Closed" if(connected.locked) - scanner_status += " (Locked)" + scanner_status += "(Locked)" else - scanner_status += " (Unlocked)" + scanner_status += "(Unlocked)" else @@ -143,27 +143,27 @@ status += "
Pulse Duration:
[radduration]
" status += "
  \> Accuracy:
[chance_to_hit]
" status += "
" // Close statusDisplay div - var/list/buttons = list("Scan ") + var/list/buttons = list("Scan") if(connected) - buttons += " [connected.state_open ? "Close" : "Open"] Scanner " + buttons += "[connected.state_open ? "Close" : "Open"] Scanner" if (connected.state_open) - buttons += "[connected.locked ? "Unlock" : "Lock"] Scanner " + buttons += "[connected.locked ? "Unlock" : "Lock"] Scanner" else - buttons += "[connected.locked ? "Unlock" : "Lock"] Scanner " + buttons += "[connected.locked ? "Unlock" : "Lock"] Scanner" else - buttons += "Open Scanner Lock Scanner " + buttons += "Open Scanner Lock Scanner" if(viable_occupant) - buttons += "Inject Rejuvenators " + buttons += "Inject Rejuvenators" else - buttons += "Inject Rejuvenators " + buttons += "Inject Rejuvenators" if(diskette) - buttons += "Eject Disk " + buttons += "Eject Disk" else - buttons += "Eject Disk " + buttons += "Eject Disk" if(current_screen == "buffer") - buttons += "Radiation Emitter Menu " + buttons += "Radiation Emitter Menu" else - buttons += "Buffer Menu " + buttons += "Buffer Menu" switch(current_screen) if("working") @@ -182,15 +182,15 @@ if( !buffer_slot || !buffer_slot.len || !buffer_slot["name"] || !((buffer_slot["UI"] && buffer_slot["UE"]) || buffer_slot["SE"]) ) temp_html += "
\tNo Data" if(viable_occupant) - temp_html += "
Save to Buffer " + temp_html += "
Save to Buffer" else - temp_html += "
Save to Buffer " - temp_html += "Clear Buffer " + temp_html += "
Save to Buffer" + temp_html += "Clear Buffer" if(diskette) - temp_html += "Load from Disk " + temp_html += "Load from Disk" else - temp_html += "Load from Disk " - temp_html += "Save to Disk " + temp_html += "Load from Disk" + temp_html += "Save to Disk" else var/ui = buffer_slot["UI"] var/se = buffer_slot["SE"] @@ -204,10 +204,10 @@ temp_html += "
\tBlood Type: [blood_type]" temp_html += "
\tUE: [ue] " if(viable_occupant) - temp_html += "Occupant " + temp_html += "Occupant" else temp_html += "Occupant" - temp_html += "Occupant:Delayed " + temp_html += "Occupant:Delayed" if(injectorready < world.time) temp_html += "Injector" else @@ -218,10 +218,10 @@ if(ui) temp_html += "
\tUI: [ui] " if(viable_occupant) - temp_html += "Occupant " + temp_html += "Occupant" else temp_html += "Occupant" - temp_html += "Occupant:Delayed " + temp_html += "Occupant:Delayed" if(injectorready < world.time) temp_html += "Injector" else @@ -231,10 +231,10 @@ if(ue && name && blood_type && ui) temp_html += "
\tUI+UE: [ui]/[ue] " if(viable_occupant) - temp_html += "Occupant " + temp_html += "Occupant" else temp_html += "Occupant" - temp_html += "Occupant:Delayed " + temp_html += "Occupant:Delayed" if(injectorready < world.time) temp_html += "UI+UE Injector" else @@ -242,10 +242,10 @@ if(se) temp_html += "
\tSE: [se] " if(viable_occupant) - temp_html += "Occupant " + temp_html += "Occupant" else - temp_html += "Occupant " - temp_html += "Occupant:Delayed " + temp_html += "Occupant" + temp_html += "Occupant:Delayed" if(injectorready < world.time ) temp_html += "Injector" else @@ -253,18 +253,18 @@ else temp_html += "
\tSE: No Data" if(viable_occupant) - temp_html += "
Save to Buffer " + temp_html += "
Save to Buffer" else - temp_html += "
Save to Buffer " - temp_html += "Clear Buffer " + temp_html += "
Save to Buffer" + temp_html += "Clear Buffer" if(diskette) - temp_html += "Load from Disk " + temp_html += "Load from Disk" else - temp_html += "Load from Disk " + temp_html += "Load from Disk" if(diskette && !diskette.read_only) - temp_html += "Save to Disk " + temp_html += "Save to Disk" else - temp_html += "Save to Disk " + temp_html += "Save to Disk" else temp_html += status temp_html += buttons @@ -528,7 +528,7 @@ var/mob/living/carbon/viable_occupant = null if(connected) viable_occupant = connected.occupant - if(!istype(viable_occupant) || !viable_occupant.dna || (viable_occupant.has_disability(DISABILITY_NOCLONE))) + if(!istype(viable_occupant) || !viable_occupant.dna || (RADIMMUNE in viable_occupant.dna.species.species_traits) || (viable_occupant.has_disability(DISABILITY_NOCLONE))) viable_occupant = null return viable_occupant diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 8679652a10..08210bf706 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -156,8 +156,6 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E ..() var/list/nukeops = get_antagonists(/datum/antagonist/nukeop) var/danger = GLOB.joined_player_list.len - nukeops.len -// var/list/nukeops = get_antagonists(/datum/antagonist/nukeop) -// var/danger = GLOB.joined_player_list.len - nukeops.len danger = CEILING(danger, 10) scaleTC(danger) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index 704576f2c0..9f9791beec 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -173,12 +173,8 @@ if(M.stat == DEAD) if(M.timeofdeath + 6000 < world.time) continue - var/turf/T = get_turf(M) - if(!T) - continue - if(T.z == ZLEVEL_CENTCOM) - continue - L[avoid_assoc_duplicate_keys(M.real_name, areaindex)] = I + if(is_eligible(I)) + L[avoid_assoc_duplicate_keys(M.real_name, areaindex)] = I var/desc = input("Please select a location to lock in.", "Locking Computer") as null|anything in L target = L[desc] diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 4328a22222..97830393bd 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -257,4 +257,5 @@ for(var/X in components) var/obj/item/I = X I.forceMove(loc) + ..() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index ec89cc514d..b36cc1e4c4 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -34,7 +34,7 @@ #define AIRLOCK_INTEGRITY_N 300 // Normal airlock integrity #define AIRLOCK_INTEGRITY_MULTIPLIER 1.5 // How much reinforced doors health increases -#define AIRLOCK_DAMAGE_DEFLECTION_N 20 // Normal airlock damage deflection +#define AIRLOCK_DAMAGE_DEFLECTION_N 20 // Normal airlock damage deflection // CIT CHANGE - CHANGES DEFAULT AIRLOCK DEFLECTION FROM 21 TO 20 #define AIRLOCK_DAMAGE_DEFLECTION_R 30 // Reinforced airlock damage deflection #define NOT_ELECTRIFIED 0 @@ -209,23 +209,27 @@ /obj/machinery/door/airlock/narsie_act() var/turf/T = get_turf(src) var/runed = prob(20) + var/obj/machinery/door/airlock/cult/A if(glass) if(runed) - new/obj/machinery/door/airlock/cult/glass(T) + A = new/obj/machinery/door/airlock/cult/glass(T) else - new/obj/machinery/door/airlock/cult/unruned/glass(T) + A = new/obj/machinery/door/airlock/cult/unruned/glass(T) else if(runed) - new/obj/machinery/door/airlock/cult(T) + A = new/obj/machinery/door/airlock/cult(T) else - new/obj/machinery/door/airlock/cult/unruned(T) + A = new/obj/machinery/door/airlock/cult/unruned(T) + A.name = name qdel(src) /obj/machinery/door/airlock/ratvar_act() //Airlocks become pinion airlocks that only allow servants + var/obj/machinery/door/airlock/clockwork/A if(glass) - new/obj/machinery/door/airlock/clockwork/brass(get_turf(src)) + A = new/obj/machinery/door/airlock/clockwork/brass(get_turf(src)) else - new/obj/machinery/door/airlock/clockwork(get_turf(src)) + A = new/obj/machinery/door/airlock/clockwork(get_turf(src)) + A.name = name qdel(src) /obj/machinery/door/airlock/Destroy() @@ -251,16 +255,13 @@ note = null update_icon() -/obj/machinery/door/airlock/proc/unzap() //for addtimer - justzap = FALSE - /obj/machinery/door/airlock/bumpopen(mob/living/user) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite if(!issilicon(usr)) if(isElectrified()) if(!justzap) if(shock(user, 100)) justzap = TRUE - addtimer(CALLBACK(src, .proc/unzap), 10) + addtimer(VARSET_CALLBACK(src, justzap, FALSE) , 10) return else return @@ -568,6 +569,8 @@ /obj/machinery/door/airlock/examine(mob/user) ..() + if(emagged) + to_chat(user, "Its access panel is smoking slightly.") if(charge && !panel_open && in_range(user, src)) to_chat(user, "The maintenance panel seems haphazardly fastened.") if(charge && panel_open) @@ -1231,7 +1234,6 @@ if(!open()) update_icon(AIRLOCK_CLOSED, 1) emagged = TRUE - desc = "Its access panel is smoking slightly." lights = FALSE locked = TRUE loseMainPower() diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index f303b892b3..08e5b42a46 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -79,69 +79,49 @@ opacity = 0 glass = TRUE -/obj/machinery/door/airlock/glass_command - icon = 'icons/obj/doors/airlocks/station/command.dmi' +/obj/machinery/door/airlock/command/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_com glass = TRUE normal_integrity = 400 -/obj/machinery/door/airlock/glass_engineering - icon = 'icons/obj/doors/airlocks/station/engineering.dmi' +/obj/machinery/door/airlock/engineering/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_eng glass = TRUE -/obj/machinery/door/airlock/glass_security - icon = 'icons/obj/doors/airlocks/station/security.dmi' +/obj/machinery/door/airlock/security/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_sec glass = TRUE normal_integrity = 400 -/obj/machinery/door/airlock/glass_security/abandoned +/obj/machinery/door/airlock/security/glass/abandoned abandoned = TRUE -/obj/machinery/door/airlock/glass_medical - icon = 'icons/obj/doors/airlocks/station/medical.dmi' +/obj/machinery/door/airlock/medical/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_med glass = TRUE -/obj/machinery/door/airlock/glass_research - icon = 'icons/obj/doors/airlocks/station/research.dmi' +/obj/machinery/door/airlock/research/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_research glass = TRUE -/obj/machinery/door/airlock/glass_mining - icon = 'icons/obj/doors/airlocks/station/mining.dmi' +/obj/machinery/door/airlock/mining/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_min glass = TRUE -/obj/machinery/door/airlock/glass_atmos - icon = 'icons/obj/doors/airlocks/station/atmos.dmi' +/obj/machinery/door/airlock/atmos/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_atmo glass = TRUE -/obj/machinery/door/airlock/glass_science - icon = 'icons/obj/doors/airlocks/station/science.dmi' +/obj/machinery/door/airlock/science/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_science glass = TRUE -/obj/machinery/door/airlock/glass_virology - icon = 'icons/obj/doors/airlocks/station/virology.dmi' +/obj/machinery/door/airlock/virology/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_viro glass = TRUE -/obj/machinery/door/airlock/glass_maintenance - icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' +/obj/machinery/door/airlock/maintenance/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_mai glass = TRUE /obj/machinery/door/airlock/maintenance/external/glass diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 5630b3ffb0..1649082138 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -7,7 +7,7 @@ glass = TRUE var/datum/radio_frequency/air_connection - var/air_frequency = 1437 + var/air_frequency = FREQ_ATMOS_ALARMS autoclose = FALSE /obj/machinery/door/airlock/alarmlock/New() @@ -22,7 +22,7 @@ /obj/machinery/door/airlock/alarmlock/Initialize() . = ..() SSradio.remove_object(src, air_frequency) - air_connection = SSradio.add_object(src, air_frequency, GLOB.RADIO_TO_AIRALARM) + air_connection = SSradio.add_object(src, air_frequency, RADIO_TO_AIRALARM) open() /obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal) @@ -41,4 +41,4 @@ close() if("minor", "clear") autoclose = FALSE - open() + open() \ No newline at end of file diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index a622f0af3d..bf3baf8b6f 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -112,8 +112,8 @@ return 0 if(!forced) - Radio.set_frequency(GLOB.SEC_FREQ) - Radio.talk_into(src, "Timer has expired. Releasing prisoner.", GLOB.SEC_FREQ, get_default_language()) + Radio.set_frequency(FREQ_SECURITY) + Radio.talk_into(src, "Timer has expired. Releasing prisoner.", FREQ_SECURITY) timing = FALSE activation_time = null diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 30ae436289..85ec73cdc6 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -32,11 +32,27 @@ var/datum/effect_system/spark_spread/spark_system var/damage_deflection = 10 var/real_explosion_block //ignore this, just use explosion_block + var/red_alert_access = FALSE //if TRUE, this door will always open on red alert /obj/machinery/door/examine(mob/user) ..() + if(red_alert_access) + if(GLOB.security_level >= SEC_LEVEL_RED) + to_chat(user, "Due to a security threat, its access requirements have been lifted!") + else + to_chat(user, "In the event of a red alert, its access requirements will automatically lift.") to_chat(user, "Its maintenance panel is screwed in place.") +/obj/machinery/door/check_access(access) + if(red_alert_access && GLOB.security_level >= SEC_LEVEL_RED) + return TRUE + return ..() + +/obj/machinery/door/check_access_list(list/access_list) + if(red_alert_access && GLOB.security_level >= SEC_LEVEL_RED) + return TRUE + return ..() + /obj/machinery/door/New() ..() if(density) @@ -96,7 +112,7 @@ /obj/machinery/door/Move() var/turf/T = loc - ..() + . = ..() move_update_air(T) /obj/machinery/door/CanPass(atom/movable/mover, turf/target) @@ -195,7 +211,7 @@ /obj/machinery/door/emp_act(severity) if(prob(20/severity) && (istype(src, /obj/machinery/door/airlock) || istype(src, /obj/machinery/door/window)) ) INVOKE_ASYNC(src, .proc/open) - if(prob(40/severity)) + if(prob(severity*10 - 20)) if(secondsElectrified == 0) secondsElectrified = -1 shockedby += "\[[time_stamp()]\]EM Pulse" diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 0cd33b1925..77267a49a4 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -26,4 +26,4 @@ /obj/machinery/door/poddoor/shutters/close(ignorepower = 0) ..() - layer = CLOSED_DOOR_LAYER + layer = CLOSED_DOOR_LAYER \ No newline at end of file diff --git a/code/game/machinery/doors/unpowered.dm b/code/game/machinery/doors/unpowered.dm index 4b7ec4b3dd..2960335813 100644 --- a/code/game/machinery/doors/unpowered.dm +++ b/code/game/machinery/doors/unpowered.dm @@ -1,25 +1,25 @@ -/obj/machinery/door/unpowered - +/obj/machinery/door/unpowered + /obj/machinery/door/unpowered/CollidedWith(atom/movable/AM) - if(src.locked) - return - ..() - return - - -/obj/machinery/door/unpowered/attackby(obj/item/I, mob/user, params) - if(locked) - return - else - return ..() - -/obj/machinery/door/unpowered/emag_act() - return - -/obj/machinery/door/unpowered/shuttle - icon = 'icons/turf/shuttle.dmi' - name = "door" - icon_state = "door1" - opacity = 1 + if(src.locked) + return + ..() + return + + +/obj/machinery/door/unpowered/attackby(obj/item/I, mob/user, params) + if(locked) + return + else + return ..() + +/obj/machinery/door/unpowered/emag_act() + return + +/obj/machinery/door/unpowered/shuttle + icon = 'icons/turf/shuttle.dmi' + name = "door" + icon_state = "door1" + opacity = 1 density = TRUE explosion_block = 1 \ No newline at end of file diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index dce884b794..bd1a553863 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -192,7 +192,8 @@ add_atom_colour("#7D1919", FIXED_COLOUR_PRIORITY) /obj/machinery/door/window/ratvar_act() - new/obj/machinery/door/window/clockwork(src.loc, dir) + var/obj/machinery/door/window/clockwork/C = new(loc, dir) + C.name = name qdel(src) /obj/machinery/door/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index c13dfc9b88..cdfb72a6ef 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -19,6 +19,10 @@ GLOBAL_LIST_EMPTY(doppler_arrays) GLOB.doppler_arrays -= src return ..() +/obj/machinery/doppler_array/examine(mob/user) + ..() + to_chat(user, "Its dish is facing to the [dir2text(dir)].") + /obj/machinery/doppler_array/process() return PROCESS_KILL diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index f34191370d..35b700801d 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -17,7 +17,7 @@ var/target_state = AIRLOCK_STATE_CLOSED var/sensor_pressure = null -/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param) +/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal) var/receive_tag = signal.data["tag"] if(!receive_tag) return @@ -68,19 +68,17 @@ state = AIRLOCK_STATE_CLOSED process_again = 1 else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) + post_signal(new /datum/signal(list( + "tag" = interior_door_tag, + "command" = "secure_close" + ))) else if(memory["pump_status"] != "off") - var/datum/signal/signal = new - signal.data = list( + post_signal(new /datum/signal(list( "tag" = airpump_tag, "power" = 0, - "sigtype"="command" - ) - post_signal(signal) + "sigtype" = "command" + ))) if(AIRLOCK_STATE_PRESSURIZE) if(target_state < state) @@ -89,16 +87,15 @@ state = AIRLOCK_STATE_INOPEN process_again = 1 else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - signal.data["command"] = "secure_open" - post_signal(signal) + post_signal(new /datum/signal(list( + "tag" = interior_door_tag, + "command" = "secure_open" + ))) else - var/datum/signal/signal = new - signal.data = list( + var/datum/signal/signal = new(list( "tag" = airpump_tag, - "sigtype"="command" - ) + "sigtype" = "command" + )) if(memory["pump_status"] == "siphon") signal.data["stabalize"] = 1 else if(memory["pump_status"] != "release") @@ -114,29 +111,27 @@ state = AIRLOCK_STATE_DEPRESSURIZE process_again = 1 else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) + post_signal(new /datum/signal(list( + "tag" = interior_door_tag, + "command" = "secure_close" + ))) else if(target_state < state) if(memory["exterior_status"] == "closed") state = AIRLOCK_STATE_PRESSURIZE process_again = 1 else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) + post_signal(new /datum/signal(list( + "tag" = exterior_door_tag, + "command" = "secure_close" + ))) else if(memory["pump_status"] != "off") - var/datum/signal/signal = new - signal.data = list( + post_signal(new /datum/signal(list( "tag" = airpump_tag, "power" = 0, - "sigtype"="command" - ) - post_signal(signal) + "sigtype" = "command" + ))) if(AIRLOCK_STATE_DEPRESSURIZE) var/target_pressure = ONE_ATMOSPHERE*0.05 @@ -148,10 +143,10 @@ if(memory["exterior_status"] == "open") state = AIRLOCK_STATE_OUTOPEN else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - signal.data["command"] = "secure_open" - post_signal(signal) + post_signal(new /datum/signal(list( + "tag" = exterior_door_tag, + "command" = "secure_open" + ))) else if(target_state < state) state = AIRLOCK_STATE_CLOSED process_again = 1 @@ -159,12 +154,10 @@ state = AIRLOCK_STATE_CLOSED process_again = 1 else - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.data = list( + var/datum/signal/signal = new(list( "tag" = airpump_tag, - "sigtype"="command" - ) + "sigtype" = "command" + )) if(memory["pump_status"] == "release") signal.data["purge"] = 1 else if(memory["pump_status"] != "siphon") @@ -181,19 +174,17 @@ state = AIRLOCK_STATE_CLOSED process_again = 1 else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - signal.data["command"] = "secure_close" - post_signal(signal) + post_signal(new /datum/signal(list( + "tag" = exterior_door_tag, + "command" = "secure_close" + ))) else if(memory["pump_status"] != "off") - var/datum/signal/signal = new - signal.data = list( + post_signal(new /datum/signal(list( "tag" = airpump_tag, "power" = 0, - "sigtype"="command" - ) - post_signal(signal) + "sigtype" = "command" + ))) memory["sensor_pressure"] = sensor_pressure memory["processing"] = state != target_state @@ -209,7 +200,7 @@ name = "airlock console" density = FALSE - frequency = 1449 + frequency = FREQ_AIRLOCK_CONTROL power_channel = ENVIRON // Setup parameters only @@ -293,4 +284,4 @@ [state_options]"} - return output + return output \ No newline at end of file diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 16691160f2..2ead1d99d7 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -11,7 +11,7 @@ /datum/computer/file/embedded_program/proc/receive_user_command(command) -/datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal, receive_method, receive_param) +/datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal) return null /datum/computer/file/embedded_program/process() @@ -43,13 +43,9 @@ /obj/machinery/embedded_controller/proc/post_signal(datum/signal/signal, comm_line) return 0 -/obj/machinery/embedded_controller/receive_signal(datum/signal/signal, receive_method, receive_param) - if(!signal || signal.encryption) - return - - if(program) - program.receive_signal(signal, receive_method, receive_param) - //spawn(5) program.process() //no, program.process sends some signals and machines respond and we here again and we lag -rastaf0 +/obj/machinery/embedded_controller/receive_signal(datum/signal/signal) + if(istype(signal) && program) + program.receive_signal(signal) /obj/machinery/embedded_controller/Topic(href, href_list) if(..()) diff --git a/code/game/machinery/embedded_controller/simple_vent_controller.dm b/code/game/machinery/embedded_controller/simple_vent_controller.dm index af945c7ccb..2a5faef0e1 100644 --- a/code/game/machinery/embedded_controller/simple_vent_controller.dm +++ b/code/game/machinery/embedded_controller/simple_vent_controller.dm @@ -5,34 +5,27 @@ /datum/computer/file/embedded_program/simple_vent_controller/receive_user_command(command) switch(command) if("vent_inactive") - var/datum/signal/signal = new - signal.data = list( + post_signal(new /datum/signal(list( "tag" = airpump_tag, - "sigtype"="command" - ) - signal.data["power"] = 0 - post_signal(signal) + "sigtype" = "command", + "power" = 0 + ))) if("vent_pump") - var/datum/signal/signal = new - signal.data = list( + post_signal(new /datum/signal(list( "tag" = airpump_tag, - "sigtype"="command" - ) - signal.data["stabalize"] = 1 - signal.data["power"] = 1 - post_signal(signal) + "sigtype" = "command", + "stabalize" = 1, + "power" = 1 + ))) if("vent_clear") - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.data = list( + post_signal(new /datum/signal(list( "tag" = airpump_tag, - "sigtype"="command" - ) - signal.data["purge"] = 1 - signal.data["power"] = 1 - post_signal(signal) + "sigtype" = "command", + "purge" = 1, + "power" = 1 + ))) /datum/computer/file/embedded_program/simple_vent_controller/process() return 0 @@ -45,7 +38,7 @@ name = "vent controller" density = FALSE - frequency = 1229 + frequency = FREQ_ATMOS_CONTROL power_channel = ENVIRON // Setup parameters only diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 198d368d59..7aa3859cdf 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -213,4 +213,4 @@ to_chat(user, "[attached ? attached : "No one"] is attached.") #undef IV_TAKING -#undef IV_INJECTING +#undef IV_INJECTING \ No newline at end of file diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index aa3bf465f2..8263795c60 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -15,7 +15,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 50 - var/freq = 1449 // radio frequency + var/freq = FREQ_MAGNETS // radio frequency var/electricity_level = 1 // intensity of the magnetic pull var/magnetic_field = 1 // the range of magnetic attraction var/code = 0 // frequency code, they should be different unless you have a group of magnets working together or something @@ -33,7 +33,7 @@ var/turf/T = loc hide(T.intact) center = T - SSradio.add_object(src, freq, GLOB.RADIO_MAGNETS) + SSradio.add_object(src, freq, RADIO_MAGNETS) return INITIALIZE_HINT_LATELOAD /obj/machinery/magnetic_module/LateInitialize() @@ -198,7 +198,7 @@ anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 45 - var/frequency = 1449 + var/frequency = FREQ_MAGNETS var/code = 0 var/list/magnets = list() var/title = "Magnetic Control Console" @@ -224,7 +224,7 @@ if(path) // check for default path filter_path() // renders rpath - radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_MAGNETS) + radio_connection = SSradio.add_object(src, frequency, RADIO_MAGNETS) /obj/machinery/magnetic_controller/Destroy() SSradio.remove_object(src, frequency) @@ -278,11 +278,7 @@ if(href_list["radio-op"]) // Prepare signal beforehand, because this is a radio operation - var/datum/signal/signal = new - signal.transmission_method = 1 // radio transmission - signal.source = src - signal.frequency = frequency - signal.data["code"] = code + var/datum/signal/signal = new(list("code" = code)) // Apply any necessary commands switch(href_list["radio-op"]) @@ -302,7 +298,7 @@ // Broadcast the signal - radio_connection.post_signal(src, signal, filter = GLOB.RADIO_MAGNETS) + radio_connection.post_signal(src, signal, filter = RADIO_MAGNETS) spawn(1) updateUsrDialog() // pretty sure this increases responsiveness @@ -345,11 +341,7 @@ looping = 1 // Prepare the radio signal - var/datum/signal/signal = new - signal.transmission_method = 1 // radio transmission - signal.source = src - signal.frequency = frequency - signal.data["code"] = code + var/datum/signal/signal = new(list("code" = code)) if(pathpos > rpath.len) // if the position is greater than the length, we just loop through the list! pathpos = 1 @@ -370,7 +362,7 @@ // Broadcast the signal spawn() - radio_connection.post_signal(src, signal, filter = GLOB.RADIO_MAGNETS) + radio_connection.post_signal(src, signal, filter = RADIO_MAGNETS) if(speed == 10) sleep(1) @@ -393,4 +385,4 @@ if(!(nextchar in list(";", "&", "*", " "))) // if char is a separator, ignore rpath += copytext(path, i, i+1) // else, add to list - // there doesn't HAVE to be separators but it makes paths syntatically visible \ No newline at end of file + // there doesn't HAVE to be separators but it makes paths syntatically visible diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index e62d25e5fa..fe2926f150 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -15,7 +15,7 @@ var/open = FALSE // true if cover is open var/locked = TRUE // true if controls are locked - var/freq = 1445 // radio frequency + var/freq = FREQ_NAV_BEACON var/location = "" // location response text var/list/codes // assoc. list of transponder codes var/codes_txt = "" // codes as set on map: "tag1;tag2" or "tag1=value;tag2=value" @@ -205,4 +205,4 @@ Transponder Codes:
    "} codes[newkey] = newval - updateDialog() + updateDialog() \ No newline at end of file diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index bf3c94646c..6a04ca0886 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -15,17 +15,17 @@ var/teleporting = 0 //if it's in the process of teleporting var/power_efficiency = 1 var/obj/machinery/quantumpad/linked_pad - + //mapping var/static/list/mapped_quantum_pads = list() var/map_pad_id = "" as text //what's my name var/map_pad_link_id = "" as text //who's my friend - + /obj/machinery/quantumpad/Initialize() . = ..() if(map_pad_id) mapped_quantum_pads[map_pad_id] = src - + /obj/machinery/quantumpad/Destroy() mapped_quantum_pads -= map_pad_id return ..() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index f0e6eb2df0..c65b9a321a 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -315,13 +315,13 @@ GLOBAL_LIST_EMPTY(allConsoles) var/radio_freq switch(text2num(href_list["emergency"])) if(1) //Security - radio_freq = GLOB.SEC_FREQ + radio_freq = FREQ_SECURITY emergency = "Security" if(2) //Engineering - radio_freq = GLOB.ENG_FREQ + radio_freq = FREQ_ENGINEERING emergency = "Engineering" if(3) //Medical - radio_freq = GLOB.MED_FREQ + radio_freq = FREQ_MEDICAL emergency = "Medical" if(radio_freq) Radio.set_frequency(radio_freq) @@ -341,28 +341,28 @@ GLOBAL_LIST_EMPTY(allConsoles) sending += "
    " screen = 7 //if it's successful, this will get overrwritten (7 = unsufccessfull, 6 = successfull) if (sending) - var/pass = 0 - for (var/obj/machinery/message_server/MS in GLOB.machines) - if(!MS.active) - continue - MS.send_rc_message(href_list["department"],department,log_msg,msgStamped,msgVerified,priority) - pass = 1 + var/pass = FALSE + var/datum/data_rc_msg/log = new(href_list["department"], department, log_msg, msgStamped, msgVerified, priority) + for (var/obj/machinery/telecomms/message_server/MS in GLOB.telecomms_list) + if (MS.toggled) + MS.rc_msgs += log + pass = TRUE if(pass) var/radio_freq = 0 switch(href_list["department"]) if("bridge") - radio_freq = GLOB.COMM_FREQ + radio_freq = FREQ_COMMAND if("medbay") - radio_freq = GLOB.MED_FREQ + radio_freq = FREQ_MEDICAL if("science") - radio_freq = GLOB.SCI_FREQ + radio_freq = FREQ_SCIENCE if("engineering") - radio_freq = GLOB.ENG_FREQ + radio_freq = FREQ_ENGINEERING if("security") - radio_freq = GLOB.SEC_FREQ + radio_freq = FREQ_SECURITY if("cargobay" || "mining") - radio_freq = GLOB.SUPP_FREQ + radio_freq = FREQ_SUPPLY Radio.set_frequency(radio_freq) var/authentic if(msgVerified || msgStamped) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index cdbdb195cc..b681845a10 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -22,7 +22,7 @@ /obj/structure/emergency_shield/Move() var/turf/T = loc - ..() + . = ..() move_update_air(T) /obj/structure/emergency_shield/emp_act(severity) @@ -180,19 +180,25 @@ anchored = FALSE else if(W.GetID()) - if(allowed(user)) + if(allowed(user) && !emagged) locked = !locked to_chat(user, "You [locked ? "lock" : "unlock"] the controls.") + else if(emagged) + to_chat(user, "Error, access controller damaged!") else to_chat(user, "Access denied.") else return ..() -/obj/machinery/shieldgen/emag_act() - if(!(stat & BROKEN)) - stat |= BROKEN - update_icon() +/obj/machinery/shieldgen/emag_act(mob/user) + if(emagged) + to_chat(user, "The access controller is damaged!") + return + emagged = TRUE + locked = FALSE + playsound(src, "sparks", 100, 1) + to_chat(user, "You short out the access controller.") /obj/machinery/shieldgen/update_icon() if(active) @@ -337,9 +343,11 @@ default_unfasten_wrench(user, W, 0) else if(W.GetID()) - if(allowed(user)) + if(allowed(user) && !emagged) locked = !locked to_chat(user, "You [src.locked ? "lock" : "unlock"] the controls.") + else if(emagged) + to_chat(user, "Error, access controller damaged!") else to_chat(user, "Access denied.") @@ -372,6 +380,14 @@ update_activity() add_fingerprint(user) +/obj/machinery/shieldwallgen/emag_act(mob/user) + if(emagged) + to_chat(user, "The access controller is damaged!") + return + emagged = TRUE + locked = FALSE + playsound(src, "sparks", 100, 1) + to_chat(user, "You short out the access controller.") //////////////Containment Field START /obj/machinery/shieldwall diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index bdbee201b8..706e14cae6 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -32,7 +32,7 @@ var/index1 // display index for scrolling messages or 0 if non-scrolling var/index2 - var/frequency = 1435 // radio frequency + var/frequency = FREQ_STATUS_DISPLAYS var/supply_display = 0 // true if a supply shuttle display var/shuttle_id // Id used for "generic shuttle timer" mode diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm index aebccdddd2..7d795c9ce2 100644 --- a/code/game/machinery/telecomms/broadcasting.dm +++ b/code/game/machinery/telecomms/broadcasting.dm @@ -53,132 +53,141 @@ **/ +// Subtype of /datum/signal with additional processing information. +/datum/signal/subspace + transmission_method = TRANSMISSION_SUBSPACE + var/server_type = /obj/machinery/telecomms/server + var/datum/signal/subspace/original + var/list/levels -/proc/Broadcast_Message(var/atom/movable/AM, - var/vmask, var/obj/item/device/radio/radio, - var/message, var/name, var/job, var/realname, - var/data, var/compression, var/list/level, var/freq, var/list/spans, - var/verb_say, var/verb_ask, var/verb_exclaim, var/verb_yell, var/datum/language/language) +/datum/signal/subspace/New(data) + src.data = data || list() +/datum/signal/subspace/proc/copy() + var/datum/signal/subspace/copy = new + copy.original = src + copy.source = source + copy.levels = levels + copy.frequency = frequency + copy.server_type = server_type + copy.transmission_method = transmission_method + copy.data = data.Copy() + return copy + +/datum/signal/subspace/proc/mark_done() + var/datum/signal/subspace/current = src + while (current) + current.data["done"] = TRUE + current = current.original + +/datum/signal/subspace/proc/send_to_receivers() + for(var/obj/machinery/telecomms/receiver/R in GLOB.telecomms_list) + R.receive_signal(src) + for(var/obj/machinery/telecomms/allinone/R in GLOB.telecomms_list) + R.receive_signal(src) + +/datum/signal/subspace/proc/broadcast() set waitfor = FALSE - message = copytext(message, 1, MAX_BROADCAST_LEN) +// Vocal transmissions (i.e. using saycode). +// Despite "subspace" in the name, these transmissions can also be RADIO +// (intercoms and SBRs) or SUPERSPACE (CentCom). +/datum/signal/subspace/vocal + var/atom/movable/virtualspeaker/virt + var/datum/language/language +/datum/signal/subspace/vocal/New( + obj/source, // the originating radio + frequency, // the frequency the signal is taking place on + atom/movable/virtualspeaker/speaker, // representation of the method's speaker + datum/language/language, // the langauge of the message + message, // the text content of the message + spans // the list of spans applied to the message +) + src.source = source + src.frequency = frequency + src.language = language + virt = speaker + var/datum/language/lang_instance = GLOB.language_datum_instances[language] + data = list( + "name" = speaker.name, + "job" = speaker.job, + "message" = message, + "compression" = rand(35, 65), + "language" = lang_instance.name, + "spans" = spans + ) + var/turf/T = get_turf(source) + levels = list(T.z) + +/datum/signal/subspace/vocal/copy() + var/datum/signal/subspace/vocal/copy = new(source, frequency, virt, language) + copy.original = src + copy.data = data.Copy() + copy.levels = levels + return copy + +// This is the meat function for making radios hear vocal transmissions. +/datum/signal/subspace/vocal/broadcast() + set waitfor = FALSE + + // Perform final composition steps on the message. + var/message = copytext(data["message"], 1, MAX_BROADCAST_LEN) if(!message) return - - var/list/radios = list() - - var/atom/movable/virtualspeaker/virt = new /atom/movable/virtualspeaker(null) - virt.name = name - virt.job = job - virt.source = AM - virt.radio = radio - virt.verb_say = verb_say - virt.verb_ask = verb_ask - virt.verb_exclaim = verb_exclaim - virt.verb_yell = verb_yell - + var/compression = data["compression"] if(compression > 0) message = Gibberish(message, compression + 40) - // --- Broadcast only to intercom devices --- + // Assemble the list of radios + var/list/radios = list() + switch (transmission_method) + if (TRANSMISSION_SUBSPACE) + // Reaches any radios on the levels + for(var/obj/item/device/radio/R in GLOB.all_radios["[frequency]"]) + if(R.can_receive(frequency, levels)) + radios += R - if(data == 1) - for(var/obj/item/device/radio/intercom/R in GLOB.all_radios["[freq]"]) - if(R.receive_range(freq, level) > -1) - radios += R + // Syndicate radios can hear all well-known radio channels + if (num2text(frequency) in GLOB.reverseradiochannels) + for(var/obj/item/device/radio/R in GLOB.all_radios["[FREQ_SYNDICATE]"]) + if(R.can_receive(FREQ_SYNDICATE, list(R.z))) + radios |= R - // --- Broadcast only to intercoms and station-bounced radios --- + if (TRANSMISSION_RADIO) + // Only radios not currently in subspace mode + for(var/obj/item/device/radio/R in GLOB.all_radios["[frequency]"]) + if(!R.subspace_transmission && R.can_receive(frequency, levels)) + radios += R - else if(data == 2) + if (TRANSMISSION_SUPERSPACE) + // Only radios which are independent + for(var/obj/item/device/radio/R in GLOB.all_radios["[frequency]"]) + if(R.independent && R.can_receive(frequency, levels)) + radios += R - for(var/obj/item/device/radio/R in GLOB.all_radios["[freq]"]) - if(R.subspace_transmission) - continue + // From the list of radios, find all mobs who can hear those. + var/list/receive = get_mobs_in_radio_ranges(radios) - if(R.receive_range(freq, level) > -1) - radios += R - - // --- This space left blank for Syndicate data --- - - // --- CentCom radio, yo. --- - - else if(data == 5) - - for(var/obj/item/device/radio/R in GLOB.all_radios["[freq]"]) - if(!R.independent) - continue - - if(R.receive_range(freq, level) > -1) - radios += R - - // --- Broadcast to ALL radio devices --- - - else - for(var/obj/item/device/radio/R in GLOB.all_radios["[freq]"]) - if(R.receive_range(freq, level) > -1) - radios += R - - var/freqtext = num2text(freq) - for(var/obj/item/device/radio/R in GLOB.all_radios["[GLOB.SYND_FREQ]"]) //syndicate radios use magic that allows them to hear everything. this was already the case, now it just doesn't need the allinone anymore. solves annoying bugs that aren't worth solving. - if(R.receive_range(GLOB.SYND_FREQ, list(R.z)) > -1 && freqtext in GLOB.reverseradiochannels) - radios |= R - - // Get a list of mobs who can hear from the radios we collected. - var/list/receive = get_mobs_in_radio_ranges(radios) //this includes all hearers. - - for(var/mob/R in receive) //Filter receiver list. - if (R.client && R.client.holder && !(R.client.prefs.chat_toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios. + // Cut out mobs with clients who are admins and have radio chatter disabled. + for(var/mob/R in receive) + if (R.client && R.client.holder && !(R.client.prefs.chat_toggles & CHAT_RADIO)) receive -= R - for(var/mob/M in GLOB.player_list) - if(isobserver(M) && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTRADIO)) + // Add observers who have ghost radio enabled. + for(var/mob/dead/observer/M in GLOB.player_list) + if(M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTRADIO)) receive |= M - var/rendered = virt.compose_message(virt, language, message, freq, spans) //Always call this on the virtualspeaker to advoid issues. + // Render the message and have everybody hear it. + // Always call this on the virtualspeaker to avoid issues. + var/spans = data["spans"] + var/rendered = virt.compose_message(virt, language, message, frequency, spans) for(var/atom/movable/hearer in receive) - hearer.Hear(rendered, virt, language, message, freq, spans) + hearer.Hear(rendered, virt, language, message, frequency, spans) + // This following recording is intended for research and feedback in the use of department radio channels if(length(receive)) - // --- This following recording is intended for research and feedback in the use of department radio channels --- - SSblackbox.LogBroadcast(freq) + SSblackbox.LogBroadcast(frequency) - sleep(50) - if(!QDELETED(virt)) //It could happen to YOU - qdel(virt) - -//Use this to test if an obj can communicate with a Telecommunications Network - -/atom/proc/test_telecomms() - var/datum/signal/signal = telecomms_process() - var/turf/position = get_turf(src) - return (position.z in signal.data["level"] && signal.data["done"]) - -/atom/proc/telecomms_process() - - // First, we want to generate a new radio signal - var/datum/signal/signal = new - signal.transmission_method = 2 // 2 would be a subspace transmission. - var/turf/pos = get_turf(src) - - // --- Finally, tag the actual signal with the appropriate values --- - signal.data = list( - "slow" = 0, // how much to sleep() before broadcasting - simulates net lag - "message" = "TEST", - "compression" = rand(45, 50), // If the signal is compressed, compress our message too. - "traffic" = 0, // dictates the total traffic sum that the signal went through - "type" = 4, // determines what type of radio input it is: test broadcast - "reject" = 0, - "done" = 0, - "level" = pos.z // The level it is being broadcasted at. - ) - signal.frequency = 1459// Common channel - - //#### Sending the signal to all subspace receivers ####// - for(var/obj/machinery/telecomms/receiver/R in GLOB.telecomms_list) - R.receive_signal(signal) - - sleep(rand(10,25)) - - return signal + QDEL_IN(virt, 50) // Make extra sure the virtualspeaker gets qdeleted diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm new file mode 100644 index 0000000000..3a4ee731ce --- /dev/null +++ b/code/game/machinery/telecomms/computers/message.dm @@ -0,0 +1,456 @@ +/* + The monitoring computer for the messaging server. + Lets you read PDA and request console messages. +*/ + +// The monitor itself. +/obj/machinery/computer/message_monitor + name = "message monitor console" + desc = "Used to monitor the crew's PDA messages, as well as request console messages." + icon_screen = "comm_logs" + circuit = /obj/item/circuitboard/computer/message_monitor + //Server linked to. + var/obj/machinery/telecomms/message_server/linkedServer = null + //Sparks effect - For emag + var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread + //Messages - Saves me time if I want to change something. + var/noserver = "ALERT: No server detected." + var/incorrectkey = "ALERT: Incorrect decryption key!" + var/defaultmsg = "Welcome. Please select an option." + var/rebootmsg = "%$&(�: Critical %$$@ Error // !RestArting! - ?pLeaSe wAit!" + //Computer properties + var/screen = 0 // 0 = Main menu, 1 = Message Logs, 2 = Hacked screen, 3 = Custom Message + var/hacking = 0 // Is it being hacked into by the AI/Cyborg + var/message = "System bootup complete. Please select an option." // The message that shows on the main menu. + var/auth = 0 // Are they authenticated? + var/optioncount = 7 + // Custom Message Properties + var/customsender = "System Administrator" + var/obj/item/device/pda/customrecepient = null + var/customjob = "Admin" + var/custommessage = "This is a test, please ignore." + + light_color = LIGHT_COLOR_GREEN + +/obj/machinery/computer/message_monitor/attackby(obj/item/O, mob/living/user, params) + if(istype(O, /obj/item/screwdriver) && emagged) + //Stops people from just unscrewing the monitor and putting it back to get the console working again. + to_chat(user, "It is too hot to mess with!") + else + return ..() + +/obj/machinery/computer/message_monitor/emag_act(mob/user) + if(emagged) + return + if(!isnull(linkedServer)) + emagged = TRUE + screen = 2 + spark_system.set_up(5, 0, src) + src.spark_system.start() + var/obj/item/paper/monitorkey/MK = new(loc, linkedServer) + // Will help make emagging the console not so easy to get away with. + MK.info += "

    �%@%(*$%&(�&?*(%&�/{}" + var/time = 100 * length(linkedServer.decryptkey) + addtimer(CALLBACK(src, .proc/UnmagConsole), time) + message = rebootmsg + else + to_chat(user, "A no server error appears on the screen.") + +/obj/machinery/computer/message_monitor/Initialize() + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/computer/message_monitor/LateInitialize() + //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. + if(!linkedServer) + for(var/obj/machinery/telecomms/message_server/S in GLOB.telecomms_list) + linkedServer = S + break + +/obj/machinery/computer/message_monitor/attack_hand(mob/living/user) + if(..()) + return + //If the computer is being hacked or is emagged, display the reboot message. + if(hacking || emagged) + message = rebootmsg + var/dat = "
    /
    " + + if(auth) + dat += "

    \[Authenticated\] /" + dat += " Server Power: [src.linkedServer && src.linkedServer.toggled ? "\[On\]":"\[Off\]"]

    " + else + dat += "

    \[Unauthenticated\] /" + dat += " Server Power: [src.linkedServer && src.linkedServer.toggled ? "\[On\]":"\[Off\]"]

    " + + if(hacking || emagged) + screen = 2 + else if(!auth || !linkedServer || (linkedServer.stat & (NOPOWER|BROKEN))) + if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + screen = 0 + + switch(screen) + //Main menu + if(0) + // = TAB + var/i = 0 + dat += "
    [++i]. Link To A Server
    " + if(auth) + if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN))) + dat += "
    ERROR: Server not found!
    " + else + dat += "
    [++i]. View Message Logs
    " + dat += "
    [++i]. View Request Console Logs
    " + dat += "
    [++i]. Clear Message Logs
    " + dat += "
    [++i]. Clear Request Console Logs
    " + dat += "
    [++i]. Set Custom Key
    " + dat += "
    [++i]. Send Admin Message
    " + else + for(var/n = ++i; n <= optioncount; n++) + dat += "
    [n]. ---------------
    " + if(issilicon(usr) && is_special_character(usr)) + //Malf/Traitor AIs can bruteforce into the system to gain the Key. + dat += "
    *&@#. Bruteforce Key
    " + else + dat += "
    " + + //Bottom message + if(!auth) + dat += "
    Please authenticate with the server in order to show additional options." + else + dat += "
    Reg, #514 forbids sending messages to a Head of Staff containing Erotic Rendering Properties." + + //Message Logs + if(1) + var/index = 0 + dat += "
    Back - Refresh
    " + dat += "" + for(var/datum/data_pda_msg/pda in src.linkedServer.pda_msgs) + index++ + if(index > 3000) + break + // Del - Sender - Recepient - Message + // X - Al Green - Your Mom - WHAT UP!? + dat += "" + dat += "
    XSenderRecipientMessage
    X
    		[pda.sender][pda.recipient][pda.message][pda.photo ? " (Photo)":""]
    " + //Hacking screen. + if(2) + if(isAI(user) || iscyborg(user)) + dat += "Brute-forcing for server key.
    It will take 20 seconds for every character that the password has." + dat += "In the meantime, this console can reveal your true intentions if you let someone access it. Make sure no humans enter the room during that time." + else + //It's the same message as the one above but in binary. Because robots understand binary and humans don't... well I thought it was clever. + dat += {"01000010011100100111010101110100011001010010110
    + 10110011001101111011100100110001101101001011011100110011
    + 10010000001100110011011110111001000100000011100110110010
    + 10111001001110110011001010111001000100000011010110110010
    + 10111100100101110001000000100100101110100001000000111011
    + 10110100101101100011011000010000001110100011000010110101
    + 10110010100100000001100100011000000100000011100110110010
    + 10110001101101111011011100110010001110011001000000110011
    + 00110111101110010001000000110010101110110011001010111001
    + 00111100100100000011000110110100001100001011100100110000
    + 10110001101110100011001010111001000100000011101000110100
    + 00110000101110100001000000111010001101000011001010010000
    + 00111000001100001011100110111001101110111011011110111001
    + 00110010000100000011010000110000101110011001011100010000
    + 00100100101101110001000000111010001101000011001010010000
    + 00110110101100101011000010110111001110100011010010110110
    + 10110010100101100001000000111010001101000011010010111001
    + 10010000001100011011011110110111001110011011011110110110
    + 00110010100100000011000110110000101101110001000000111001
    + 00110010101110110011001010110000101101100001000000111100
    + 10110111101110101011100100010000001110100011100100111010
    + 10110010100100000011010010110111001110100011001010110111
    + 00111010001101001011011110110111001110011001000000110100
    + 10110011000100000011110010110111101110101001000000110110
    + 00110010101110100001000000111001101101111011011010110010
    + 10110111101101110011001010010000001100001011000110110001
    + 10110010101110011011100110010000001101001011101000010111
    + 00010000001001101011000010110101101100101001000000111001
    + 10111010101110010011001010010000001101110011011110010000
    + 00110100001110101011011010110000101101110011100110010000
    + 00110010101101110011101000110010101110010001000000111010
    + 00110100001100101001000000111001001101111011011110110110
    + 10010000001100100011101010111001001101001011011100110011
    + 10010000001110100011010000110000101110100001000000111010
    + 001101001011011010110010100101110"} + + //Fake messages + if(3) + dat += "
    Back - Reset
    " + + dat += {" + + + + "} + //Sender - Sender's Job - Recepient - Message + //Al Green- Your Dad - Your Mom - WHAT UP!? + + dat += {" + + + "} + dat += "
    SenderSender's JobRecipientMessage
    [customsender][customjob][customrecepient ? customrecepient.owner : "NONE"][custommessage]

    Send" + + //Request Console Logs + if(4) + + var/index = 0 + /* data_rc_msg + X - 5% + var/rec_dpt = "Unspecified" //name of the person - 15% + var/send_dpt = "Unspecified" //name of the sender- 15% + var/message = "Blank" //transferred message - 300px + var/stamp = "Unstamped" - 15% + var/id_auth = "Unauthenticated" - 15% + var/priority = "Normal" - 10% + */ + dat += "
    Back - Refresh
    " + dat += {" + "} + for(var/datum/data_rc_msg/rc in src.linkedServer.rc_msgs) + index++ + if(index > 3000) + break + // Del - Sender - Recepient - Message + // X - Al Green - Your Mom - WHAT UP!? + dat += {" + "} + dat += "
    XSending Dep.Receiving Dep.MessageStampID Auth.Priority.
    X
    		[rc.send_dpt][rc.rec_dpt][rc.message][rc.stamp][rc.id_auth][rc.priority]
    " + + message = defaultmsg + var/datum/browser/popup = new(user, "hologram_console", name, 700, 700) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/computer/message_monitor/proc/BruteForce(mob/user) + if(isnull(linkedServer)) + to_chat(user, "Could not complete brute-force: Linked Server Disconnected!") + else + var/currentKey = src.linkedServer.decryptkey + to_chat(user, "Brute-force completed! The key is '[currentKey]'.") + src.hacking = 0 + src.screen = 0 // Return the screen back to normal + +/obj/machinery/computer/message_monitor/proc/UnmagConsole() + emagged = FALSE + +/obj/machinery/computer/message_monitor/proc/ResetMessage() + customsender = "System Administrator" + customrecepient = null + custommessage = "This is a test, please ignore." + customjob = "Admin" + +/obj/machinery/computer/message_monitor/Topic(href, href_list) + if(..()) + return + + if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || issilicon(usr)) + //Authenticate + if (href_list["auth"]) + if(!linkedServer || linkedServer.stat & (NOPOWER|BROKEN)) + message = noserver + else + if(auth) + auth = 0 + screen = 0 + else + var/dkey = trim(input(usr, "Please enter the decryption key.") as text|null) + if(dkey && dkey != "") + if(src.linkedServer.decryptkey == dkey) + auth = 1 + else + message = incorrectkey + + //Turn the server on/off. + if (href_list["active"]) + if(auth) + linkedServer.toggled = !linkedServer.toggled + //Find a server + if (href_list["find"]) + var/list/message_servers = list() + for (var/obj/machinery/telecomms/message_server/M in GLOB.telecomms_list) + message_servers += M + + if(message_servers.len > 1) + linkedServer = input(usr, "Please select a server.", "Select a server.", null) as null|anything in message_servers + message = "NOTICE: Server selected." + else if(message_servers.len > 0) + linkedServer = message_servers[1] + message = "NOTICE: Only Single Server Detected - Server selected." + else + message = noserver + + //View the logs - KEY REQUIRED + if (href_list["view"]) + if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else + if(auth) + src.screen = 1 + + //Clears the logs - KEY REQUIRED + if (href_list["clear"]) + if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else + if(auth) + src.linkedServer.pda_msgs = list() + message = "NOTICE: Logs cleared." + //Clears the request console logs - KEY REQUIRED + if (href_list["clearr"]) + if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else + if(auth) + src.linkedServer.rc_msgs = list() + message = "NOTICE: Logs cleared." + //Change the password - KEY REQUIRED + if (href_list["pass"]) + if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else + if(auth) + var/dkey = trim(stripped_input(usr, "Please enter the decryption key.")) + if(dkey && dkey != "") + if(src.linkedServer.decryptkey == dkey) + var/newkey = trim(input(usr,"Please enter the new key (3 - 16 characters max):")) + if(length(newkey) <= 3) + message = "NOTICE: Decryption key too short!" + else if(length(newkey) > 16) + message = "NOTICE: Decryption key too long!" + else if(newkey && newkey != "") + src.linkedServer.decryptkey = newkey + message = "NOTICE: Decryption key set." + else + message = incorrectkey + + //Hack the Console to get the password + if (href_list["hack"]) + if(issilicon(usr) && is_special_character(usr)) + src.hacking = 1 + src.screen = 2 + //Time it takes to bruteforce is dependant on the password length. + spawn(100*length(src.linkedServer.decryptkey)) + if(src && src.linkedServer && usr) + BruteForce(usr) + //Delete the log. + if (href_list["delete"]) + //Are they on the view logs screen? + if(screen == 1) + if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else //if(istype(href_list["delete"], /datum/data_pda_msg)) + src.linkedServer.pda_msgs -= locate(href_list["delete"]) + message = "NOTICE: Log Deleted!" + //Delete the request console log. + if (href_list["deleter"]) + //Are they on the view logs screen? + if(screen == 4) + if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else //if(istype(href_list["delete"], /datum/data_pda_msg)) + src.linkedServer.rc_msgs -= locate(href_list["deleter"]) + message = "NOTICE: Log Deleted!" + //Create a custom message + if (href_list["msg"]) + if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else + if(auth) + src.screen = 3 + //Fake messaging selection - KEY REQUIRED + if (href_list["select"]) + if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + screen = 0 + else + switch(href_list["select"]) + + //Reset + if("Reset") + ResetMessage() + + //Select Your Name + if("Sender") + customsender = stripped_input(usr, "Please enter the sender's name.") || customsender + + //Select Receiver + if("Recepient") + //Get out list of viable PDAs + var/list/obj/item/device/pda/sendPDAs = get_viewable_pdas() + if(GLOB.PDAs && GLOB.PDAs.len > 0) + customrecepient = input(usr, "Select a PDA from the list.") as null|anything in sortNames(sendPDAs) + else + customrecepient = null + + //Enter custom job + if("RecJob") + customjob = stripped_input(usr, "Please enter the sender's job.") || customjob + + //Enter message + if("Message") + custommessage = stripped_input(usr, "Please enter your message.") || custommessage + + //Send message + if("Send") + if(isnull(customsender) || customsender == "") + customsender = "UNKNOWN" + + if(isnull(customrecepient)) + message = "NOTICE: No recepient selected!" + return src.attack_hand(usr) + + if(isnull(custommessage) || custommessage == "") + message = "NOTICE: No message entered!" + return src.attack_hand(usr) + + var/datum/signal/subspace/pda/signal = new(src, list( + "name" = "[customsender]", + "job" = "[customjob]", + "message" = custommessage, + "targets" = list("[customrecepient.owner] ([customrecepient.ownjob])") + )) + // this will log the signal and transmit it to the target + linkedServer.receive_information(signal, null) + + + //Request Console Logs - KEY REQUIRED + if(href_list["viewr"]) + if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN))) + message = noserver + else + if(auth) + src.screen = 4 + + if (href_list["back"]) + src.screen = 0 + + return src.attack_hand(usr) + + +/obj/item/paper/monitorkey + name = "monitor decryption key" + +/obj/item/paper/monitorkey/Initialize(mapload, obj/machinery/telecomms/message_server/server) + ..() + if (server) + print(server) + return INITIALIZE_HINT_NORMAL + else + return INITIALIZE_HINT_LATELOAD + +/obj/item/paper/monitorkey/proc/print(obj/machinery/telecomms/message_server/server) + info = "

    Daily Key Reset


    The new message monitor key is '[server.decryptkey]'.
    Please keep this a secret and away from the clown.
    If necessary, change the password to a more secure one." + info_links = info + add_overlay("paper_words") + +/obj/item/paper/monitorkey/LateInitialize() + for (var/obj/machinery/telecomms/message_server/server in GLOB.telecomms_list) + if (server.decryptkey) + print(server) + break diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 74774f2670..9eb25b9bed 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -102,23 +102,8 @@ dat += "    " temp = "" user << browse(dat, "window=tcommachine;size=520x500;can_resize=0") - onclose(user, "dormitory") - - -// Off-Site Relays -// -// You are able to send/receive signals from the station's z level (changeable in the ZLEVEL_STATION_PRIMARY #define) if - - -/obj/machinery/telecomms/relay/proc/toggle_level() - - var/turf/position = get_turf(src) - - // Toggle on/off getting signals from the station or the current Z level - if(listening_level in GLOB.station_z_levels) // equals the station - listening_level = position.z - return TRUE - return FALSE + onclose(user, "tcommachine") + return TRUE // Returns a multitool from a user depending on their mobtype. @@ -234,7 +219,7 @@ if(newfreq && canAccess(usr)) if(findtext(num2text(newfreq), ".")) newfreq *= 10 // shift the decimal one place - if(newfreq == GLOB.SYND_FREQ) + if(newfreq == FREQ_SYNDICATE) temp = "-% Error: Interference preventing filtering frequency: \"[newfreq] GHz\" %-" else if(!(newfreq in freq_listening) && newfreq < 10000) diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm index f881e18d35..ca0812f1de 100644 --- a/code/game/machinery/telecomms/machines/allinone.dm +++ b/code/game/machinery/telecomms/machines/allinone.dm @@ -11,50 +11,31 @@ anchored = TRUE use_power = NO_POWER_USE idle_power_usage = 0 - machinetype = 6 - var/intercept = FALSE // if TRUE, broadcasts all syndie messages to syndicate channel + var/intercept = FALSE // If true, only works on the Syndicate frequency. -/obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal) +/obj/machinery/telecomms/allinone/Initialize() + ..() + if (intercept) + freq_listening = list(FREQ_SYNDICATE) - if(!on) // has to be on to receive messages +/obj/machinery/telecomms/allinone/receive_signal(datum/signal/subspace/signal) + if(!istype(signal) || signal.transmission_method != TRANSMISSION_SUBSPACE) // receives on subspace only + return + if(!on || !is_freq_listening(signal)) // has to be on to receive messages + return + if (!intercept && !(z in signal.levels) && !(0 in signal.levels)) // has to be syndicate or on the right level return - if(is_freq_listening(signal)) // detect subspace signals + // Decompress the signal and mark it done + if (intercept) + signal.levels += 0 // Signal is broadcast to agents anywhere - signal.data["done"] = 1 // mark the signal as being broadcasted - signal.data["compression"] = 0 - - // Search for the original signal and mark it as done as well - var/datum/signal/original = signal.data["original"] - if(original) - original.data["done"] = 1 - - if(signal.data["slow"] > 0) - sleep(signal.data["slow"]) // simulate the network lag if necessary - - - - - /* ###### Copy all syndie communications to the Syndicate Frequency ###### */ - if(intercept && signal.frequency == GLOB.SYND_FREQ) - Broadcast_Message(signal.data["mob"], - signal.data["vmask"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"],, signal.data["compression"], list(0, z), GLOB.SYND_FREQ, signal.data["spans"], - signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"], - signal.data["language"]) - /* ###### Broadcast a message using signal.data ###### */ - else if(!intercept) - Broadcast_Message(signal.data["mob"], - signal.data["vmask"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"],, signal.data["compression"], list(0, z), signal.frequency, signal.data["spans"], - signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"], - signal.data["language"]) + signal.data["compression"] = 0 + signal.mark_done() + if(signal.data["slow"] > 0) + sleep(signal.data["slow"]) // simulate the network lag if necessary + signal.broadcast() /obj/machinery/telecomms/allinone/attackby(obj/item/P, mob/user, params) - if(istype(P, /obj/item/device/multitool)) attack_hand(user) diff --git a/code/game/machinery/telecomms/machines/broadcaster.dm b/code/game/machinery/telecomms/machines/broadcaster.dm index 246c1fa047..89e2d38de1 100644 --- a/code/game/machinery/telecomms/machines/broadcaster.dm +++ b/code/game/machinery/telecomms/machines/broadcaster.dm @@ -16,70 +16,45 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 25 - machinetype = 5 circuit = /obj/item/circuitboard/machine/telecomms/broadcaster -/obj/machinery/telecomms/broadcaster/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) +/obj/machinery/telecomms/broadcaster/receive_information(datum/signal/subspace/signal, obj/machinery/telecomms/machine_from) // Don't broadcast rejected signals + if(!istype(signal)) + return if(signal.data["reject"]) return + if(!signal.data["message"]) + return - if(signal.data["message"]) + // Prevents massive radio spam + signal.mark_done() + var/datum/signal/subspace/original = signal.original + if(original && ("compression" in signal.data)) + original.data["compression"] = signal.data["compression"] + var/turf/T = get_turf(src) + if (T) + signal.levels |= T.z - // Prevents massive radio spam - signal.data["done"] = 1 // mark the signal as being broadcasted - // Search for the original signal and mark it as done as well - var/datum/signal/original = signal.data["original"] - if(original) - original.data["done"] = 1 - original.data["compression"] = signal.data["compression"] - original.data["level"] = signal.data["level"] + var/signal_message = "[signal.frequency]:[signal.data["message"]]:[signal.data["name"]]" + if(signal_message in GLOB.recentmessages) + return + GLOB.recentmessages.Add(signal_message) - var/signal_message = "[signal.frequency]:[signal.data["message"]]:[signal.data["realname"]]" - if(signal_message in GLOB.recentmessages) - return - GLOB.recentmessages.Add(signal_message) + if(signal.data["slow"] > 0) + sleep(signal.data["slow"]) // simulate the network lag if necessary - if(signal.data["slow"] > 0) - sleep(signal.data["slow"]) // simulate the network lag if necessary + signal.broadcast() - signal.data["level"] |= listening_level + if(!GLOB.message_delay) + GLOB.message_delay = 1 + spawn(10) + GLOB.message_delay = 0 + GLOB.recentmessages = list() - /** #### - Normal Broadcast - #### **/ - - if(signal.data["type"] == 0) - - /* ###### Broadcast a message using signal.data ###### */ - Broadcast_Message(signal.data["mob"], - signal.data["vmask"], signal.data["radio"], - signal.data["message"], signal.data["name"], signal.data["job"], signal.data["realname"], - 0, signal.data["compression"], signal.data["level"], signal.frequency, signal.data["spans"], - signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"], signal.data["language"]) - - - /** #### - Artificial Broadcast - #### **/ - // (Imitates a mob) - - if(signal.data["type"] == 2) - - /* ###### Broadcast a message using signal.data ###### */ - // Parameter "data" as 4: AI can't track this person/mob - Broadcast_Message(signal.data["mob"], - signal.data["vmask"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"], 4, signal.data["compression"], signal.data["level"], signal.frequency, signal.data["spans"], - signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"], signal.data["language"]) - - if(!GLOB.message_delay) - GLOB.message_delay = 1 - spawn(10) - GLOB.message_delay = 0 - GLOB.recentmessages = list() - - /* --- Do a snazzy animation! --- */ - flick("broadcaster_send", src) + /* --- Do a snazzy animation! --- */ + flick("broadcaster_send", src) /obj/machinery/telecomms/broadcaster/Destroy() // In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore. diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm index 252a285d2a..6f9757eb45 100644 --- a/code/game/machinery/telecomms/machines/bus.dm +++ b/code/game/machinery/telecomms/machines/bus.dm @@ -16,68 +16,65 @@ anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 50 - machinetype = 2 netspeed = 40 circuit = /obj/item/circuitboard/machine/telecomms/bus var/change_frequency = 0 -/obj/machinery/telecomms/bus/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) +/obj/machinery/telecomms/bus/receive_information(datum/signal/subspace/signal, obj/machinery/telecomms/machine_from) + if(!istype(signal) || !is_freq_listening(signal)) + return - if(is_freq_listening(signal)) - if(change_frequency) - if(signal.frequency != GLOB.SYND_FREQ) - signal.frequency = change_frequency + if(change_frequency && signal.frequency != FREQ_SYNDICATE) + signal.frequency = change_frequency - if(!istype(machine_from, /obj/machinery/telecomms/processor) && machine_from != src) // Signal must be ready (stupid assuming machine), let's send it - // send to one linked processor unit - var/send_to_processor = relay_information(signal, "/obj/machinery/telecomms/processor") + if(!istype(machine_from, /obj/machinery/telecomms/processor) && machine_from != src) // Signal must be ready (stupid assuming machine), let's send it + // send to one linked processor unit + if(relay_information(signal, /obj/machinery/telecomms/processor)) + return - if(send_to_processor) - return - // failed to send to a processor, relay information anyway - signal.data["slow"] += rand(1, 5) // slow the signal down only slightly - src.receive_information(signal, src) + // failed to send to a processor, relay information anyway + signal.data["slow"] += rand(1, 5) // slow the signal down only slightly - // Try sending it! - var/list/try_send = list("/obj/machinery/telecomms/server", "/obj/machinery/telecomms/hub", "/obj/machinery/telecomms/broadcaster", "/obj/machinery/telecomms/bus") - var/i = 0 - for(var/send in try_send) - if(i) - signal.data["slow"] += rand(0, 1) // slow the signal down only slightly - i++ - var/can_send = relay_information(signal, send) - if(can_send) - break + // Try sending it! + var/list/try_send = list(signal.server_type, /obj/machinery/telecomms/hub, /obj/machinery/telecomms/broadcaster, /obj/machinery/telecomms/bus) + + var/i = 0 + for(var/send in try_send) + if(i) + signal.data["slow"] += rand(0, 1) // slow the signal down only slightly + i++ + if(relay_information(signal, send)) + break //Preset Buses /obj/machinery/telecomms/bus/preset_one id = "Bus 1" network = "tcommsat" - freq_listening = list(GLOB.SCI_FREQ, GLOB.MED_FREQ) + freq_listening = list(FREQ_SCIENCE, FREQ_MEDICAL) autolinkers = list("processor1", "science", "medical") /obj/machinery/telecomms/bus/preset_two id = "Bus 2" network = "tcommsat" - freq_listening = list(GLOB.SUPP_FREQ,GLOB.SERV_FREQ) + freq_listening = list(FREQ_SUPPLY, FREQ_SERVICE) autolinkers = list("processor2", "supply", "service") /obj/machinery/telecomms/bus/preset_three id = "Bus 3" network = "tcommsat" - freq_listening = list(GLOB.SEC_FREQ, GLOB.COMM_FREQ) + freq_listening = list(FREQ_SECURITY, FREQ_COMMAND) autolinkers = list("processor3", "security", "command") /obj/machinery/telecomms/bus/preset_four id = "Bus 4" network = "tcommsat" - freq_listening = list(GLOB.ENG_FREQ) + freq_listening = list(FREQ_ENGINEERING) autolinkers = list("processor4", "engineering", "common") /obj/machinery/telecomms/bus/preset_four/Initialize() . = ..() - for(var/i = 1441, i < 1489, i += 2) + for(var/i = MIN_FREQ, i <= MAX_FREQ, i += 2) freq_listening |= i /obj/machinery/telecomms/bus/preset_one/birdstation diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm index bec9c5dfc7..7a481b2069 100644 --- a/code/game/machinery/telecomms/machines/hub.dm +++ b/code/game/machinery/telecomms/machines/hub.dm @@ -1,4 +1,3 @@ - /* The HUB idles until it receives information. It then passes on that information depending on where it came from. @@ -17,20 +16,22 @@ anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 80 - machinetype = 7 - long_range_link = 1 + long_range_link = TRUE netspeed = 40 circuit = /obj/item/circuitboard/machine/telecomms/hub /obj/machinery/telecomms/hub/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - if(is_freq_listening(signal)) - if(istype(machine_from, /obj/machinery/telecomms/receiver)) - //If the signal is compressed, send it to the bus. - relay_information(signal, "/obj/machinery/telecomms/bus", 1) // ideally relay the copied information to bus units - else - // Get a list of relays that we're linked to, then send the signal to their levels. - relay_information(signal, "/obj/machinery/telecomms/relay", 1) - relay_information(signal, "/obj/machinery/telecomms/broadcaster", 1) // Send it to a broadcaster. + if(!is_freq_listening(signal)) + return + + if(istype(machine_from, /obj/machinery/telecomms/receiver)) + // It's probably compressed so send it to the bus. + relay_information(signal, /obj/machinery/telecomms/bus, TRUE) + else + // Send it to each relay so their levels get added... + relay_information(signal, /obj/machinery/telecomms/relay) + // Then broadcast that signal to + relay_information(signal, /obj/machinery/telecomms/broadcaster) //Preset HUB diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm new file mode 100644 index 0000000000..37c891e542 --- /dev/null +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -0,0 +1,180 @@ +/* + The equivalent of the server, for PDA and request console messages. + Without it, PDA and request console messages cannot be transmitted. + PDAs require the rest of the telecomms setup, but request consoles only + require the message server. +*/ + +// A decorational representation of SSblackbox, usually placed alongside the message server. +/obj/machinery/blackbox_recorder + icon = 'icons/obj/stationobjs.dmi' + icon_state = "blackbox" + name = "Blackbox Recorder" + density = TRUE + anchored = TRUE + use_power = IDLE_POWER_USE + idle_power_usage = 10 + active_power_usage = 100 + armor = list(melee = 25, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70) + + +// The message server itself. +/obj/machinery/telecomms/message_server + icon = 'icons/obj/machines/research.dmi' + icon_state = "server" + name = "Messaging Server" + desc = "A machine that attempts to gather the secret knowledge of the universe." + density = TRUE + anchored = TRUE + use_power = IDLE_POWER_USE + idle_power_usage = 10 + active_power_usage = 100 + + id = "Messaging Server" + network = "tcommsat" + autolinkers = list("common") + + var/list/datum/data_pda_msg/pda_msgs = list() + var/list/datum/data_rc_msg/rc_msgs = list() + var/decryptkey + +/obj/machinery/telecomms/message_server/Initialize() + . = ..() + if (!decryptkey) + decryptkey = GenerateKey() + pda_msgs += new /datum/data_pda_msg("System Administrator", "system", "This is an automated message. The messaging system is functioning correctly.") + +/obj/machinery/telecomms/message_server/proc/GenerateKey() + var/newKey + newKey += pick("the", "if", "of", "as", "in", "a", "you", "from", "to", "an", "too", "little", "snow", "dead", "drunk", "rosebud", "duck", "al", "le") + newKey += pick("diamond", "beer", "mushroom", "assistant", "clown", "captain", "twinkie", "security", "nuke", "small", "big", "escape", "yellow", "gloves", "monkey", "engine", "nuclear", "ai") + newKey += pick("1", "2", "3", "4", "5", "6", "7", "8", "9", "0") + return newKey + +/obj/machinery/telecomms/message_server/process() + if(toggled && (stat & (BROKEN|NOPOWER))) + toggled = FALSE + update_icon() + +/obj/machinery/telecomms/message_server/receive_information(datum/signal/subspace/pda/signal, obj/machinery/telecomms/machine_from) + // can't log non-PDA signals + if(!istype(signal) || !signal.data["message"] || !toggled) + return + + // log the signal + var/datum/data_pda_msg/M = new(signal.format_target(), "[signal.data["name"]] ([signal.data["job"]])", signal.data["message"], signal.data["photo"]) + pda_msgs += M + signal.logged = M + + // pass it along to either the hub or the broadcaster + if(!relay_information(signal, /obj/machinery/telecomms/hub)) + relay_information(signal, /obj/machinery/telecomms/broadcaster) + +/obj/machinery/telecomms/message_server/update_icon() + if((stat & (BROKEN|NOPOWER))) + icon_state = "server-nopower" + else if (!toggled) + icon_state = "server-off" + else + icon_state = "server-on" + + +// Repath for maps +/obj/machinery/message_server + parent_type = /obj/machinery/telecomms/message_server + + +// PDA signal datum +/datum/signal/subspace/pda + frequency = FREQ_COMMON + server_type = /obj/machinery/telecomms/message_server + var/datum/data_pda_msg/logged + +/datum/signal/subspace/pda/New(source, data) + src.source = source + src.data = data + var/turf/T = get_turf(source) + levels = list(T.z) + +/datum/signal/subspace/pda/copy() + var/datum/signal/subspace/pda/copy = new(source, data.Copy()) + copy.original = src + copy.levels = levels + return copy + +/datum/signal/subspace/pda/proc/format_target() + if (length(data["targets"]) > 1) + return "Everyone" + return data["targets"][1] + +/datum/signal/subspace/pda/proc/format_message() + if (logged && data["photo"]) + return "\"[data["message"]]\" (Photo)" + return "\"[data["message"]]\"" + +/datum/signal/subspace/pda/broadcast() + if (!logged) // Can only go through if a message server logs it + return + for (var/obj/item/device/pda/P in GLOB.PDAs) + if ("[P.owner] ([P.ownjob])" in data["targets"]) + P.receive_message(src) + + +// Log datums stored by the message server. +/datum/data_pda_msg + var/sender = "Unspecified" + var/recipient = "Unspecified" + var/message = "Blank" // transferred message + var/icon/photo // attached photo + +/datum/data_pda_msg/New(param_rec, param_sender, param_message, param_photo) + if(param_rec) + recipient = param_rec + if(param_sender) + sender = param_sender + if(param_message) + message = param_message + if(param_photo) + photo = param_photo + +/datum/data_pda_msg/Topic(href,href_list) + ..() + if(href_list["photo"]) + var/mob/M = usr + M << browse_rsc(photo, "pda_photo.png") + M << browse("PDA Photo" \ + + "" \ + + "" \ + + "", "window=pdaphoto;size=192x192") + onclose(M, "pdaphoto") + +/datum/data_rc_msg + var/rec_dpt = "Unspecified" // receiving department + var/send_dpt = "Unspecified" // sending department + var/message = "Blank" + var/stamp = "Unstamped" + var/id_auth = "Unauthenticated" + var/priority = "Normal" + +/datum/data_rc_msg/New(param_rec, param_sender, param_message, param_stamp, param_id_auth, param_priority) + if(param_rec) + rec_dpt = param_rec + if(param_sender) + send_dpt = param_sender + if(param_message) + message = param_message + if(param_stamp) + stamp = param_stamp + if(param_id_auth) + id_auth = param_id_auth + if(param_priority) + switch(param_priority) + if(1) + priority = "Normal" + if(2) + priority = "High" + if(3) + priority = "Extreme" + else + priority = "Undetermined" + diff --git a/code/game/machinery/telecomms/machines/processor.dm b/code/game/machinery/telecomms/machines/processor.dm index fb791cf03e..8b7e0f8672 100644 --- a/code/game/machinery/telecomms/machines/processor.dm +++ b/code/game/machinery/telecomms/machines/processor.dm @@ -1,4 +1,3 @@ - /* The processor is a very simple machine that decompresses subspace signals and transfers them back to the original bus. It is essential in producing audible @@ -15,24 +14,23 @@ anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 30 - machinetype = 3 circuit = /obj/item/circuitboard/machine/telecomms/processor var/process_mode = 1 // 1 = Uncompress Signals, 0 = Compress Signals -/obj/machinery/telecomms/processor/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) +/obj/machinery/telecomms/processor/receive_information(datum/signal/subspace/signal, obj/machinery/telecomms/machine_from) + if(!is_freq_listening(signal)) + return - if(is_freq_listening(signal)) + if (!process_mode) + signal.data["compression"] = 100 // even more compressed signal + else if (signal.data["compression"]) + signal.data["compression"] = 0 // uncompress subspace signal - if(process_mode) - signal.data["compression"] = 0 // uncompress subspace signal - else - signal.data["compression"] = 100 // even more compressed signal - - if(istype(machine_from, /obj/machinery/telecomms/bus)) - relay_direct_information(signal, machine_from) // send the signal back to the machine - else // no bus detected - send the signal to servers instead - signal.data["slow"] += rand(5, 10) // slow the signal down - relay_information(signal, "/obj/machinery/telecomms/server") + if(istype(machine_from, /obj/machinery/telecomms/bus)) + relay_direct_information(signal, machine_from) // send the signal back to the machine + else // no bus detected - send the signal to servers instead + signal.data["slow"] += rand(5, 10) // slow the signal down + relay_information(signal, signal.server_type) //Preset Processors @@ -57,4 +55,4 @@ autolinkers = list("processor4") /obj/machinery/telecomms/processor/preset_one/birdstation - name = "Processor" \ No newline at end of file + name = "Processor" diff --git a/code/game/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm index 79ab125878..527c0e6d8f 100644 --- a/code/game/machinery/telecomms/machines/receiver.dm +++ b/code/game/machinery/telecomms/machines/receiver.dm @@ -1,4 +1,3 @@ - /* The receiver idles and receives messages from subspace-compatible radio equipment; primarily headsets. They then just relay this information to all linked devices, @@ -15,40 +14,30 @@ anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 30 - machinetype = 1 circuit = /obj/item/circuitboard/machine/telecomms/receiver -/obj/machinery/telecomms/receiver/receive_signal(datum/signal/signal) - - if(!on) // has to be on to receive messages +/obj/machinery/telecomms/receiver/receive_signal(datum/signal/subspace/signal) + if(!on || !istype(signal) || !check_receive_level(signal) || signal.transmission_method != TRANSMISSION_SUBSPACE) return - if(!signal) + if(!is_freq_listening(signal)) return - if(!check_receive_level(signal)) - return - if(signal.transmission_method == 2) - if(is_freq_listening(signal)) // detect subspace signals + signal.levels = list() - //Remove the level and then start adding levels that it is being broadcasted in. - signal.data["level"] = list() + // send the signal to the hub if possible, or a bus otherwise + if(!relay_information(signal, /obj/machinery/telecomms/hub)) + relay_information(signal, /obj/machinery/telecomms/bus) - var/can_send = relay_information(signal, "/obj/machinery/telecomms/hub") // ideally relay the copied information to relays - if(!can_send) - relay_information(signal, "/obj/machinery/telecomms/bus") // Send it to a bus instead, if it's linked to one +/obj/machinery/telecomms/receiver/proc/check_receive_level(datum/signal/subspace/signal) + if (z in signal.levels) + return TRUE -/obj/machinery/telecomms/receiver/proc/check_receive_level(datum/signal/signal) + for(var/obj/machinery/telecomms/hub/H in links) + for(var/obj/machinery/telecomms/relay/R in H.links) + if(R.can_receive(signal) && R.z in signal.levels) + return TRUE - if(signal.data["level"] != listening_level) - for(var/obj/machinery/telecomms/hub/H in links) - var/list/connected_levels = list() - for(var/obj/machinery/telecomms/relay/R in H.links) - if(R.can_receive(signal)) - connected_levels |= R.listening_level - if(signal.data["level"] in connected_levels) - return 1 - return 0 - return 1 + return FALSE //Preset Receivers @@ -58,7 +47,7 @@ id = "Receiver A" network = "tcommsat" autolinkers = list("receiverA") // link to relay - freq_listening = list(GLOB.SCI_FREQ, GLOB.MED_FREQ, GLOB.SUPP_FREQ, GLOB.SERV_FREQ) // science, medical, supply, service + freq_listening = list(FREQ_SCIENCE, FREQ_MEDICAL, FREQ_SUPPLY, FREQ_SERVICE) //--PRESET RIGHT--// @@ -67,14 +56,14 @@ id = "Receiver B" network = "tcommsat" autolinkers = list("receiverB") // link to relay - freq_listening = list(GLOB.COMM_FREQ, GLOB.ENG_FREQ, GLOB.SEC_FREQ) //command, engineering, security + freq_listening = list(FREQ_COMMAND, FREQ_ENGINEERING, FREQ_SECURITY) //Common and other radio frequencies for people to freely use /obj/machinery/telecomms/receiver/preset_right/Initialize() . = ..() - for(var/i = 1441, i < 1489, i += 2) + for(var/i = MIN_FREQ, i <= MAX_FREQ, i += 2) freq_listening |= i /obj/machinery/telecomms/receiver/preset_left/birdstation name = "Receiver" - freq_listening = list() \ No newline at end of file + freq_listening = list() diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm index 4aadeed4f5..1a436e56d5 100644 --- a/code/game/machinery/telecomms/machines/relay.dm +++ b/code/game/machinery/telecomms/machines/relay.dm @@ -14,17 +14,17 @@ anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 30 - machinetype = 8 netspeed = 5 long_range_link = 1 circuit = /obj/item/circuitboard/machine/telecomms/relay var/broadcasting = 1 var/receiving = 1 -/obj/machinery/telecomms/relay/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) +/obj/machinery/telecomms/relay/receive_information(datum/signal/subspace/signal, obj/machinery/telecomms/machine_from) // Add our level and send it back - if(can_send(signal)) - signal.data["level"] |= listening_level + var/turf/T = get_turf(src) + if(can_send(signal) && T) + signal.levels |= T.z // Checks to see if it can send/receive. @@ -52,7 +52,6 @@ /obj/machinery/telecomms/relay/preset/station id = "Station Relay" - listening_level = 1 autolinkers = list("s_relay") /obj/machinery/telecomms/relay/preset/telecomms diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index a328333b36..18a498efe6 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -1,4 +1,3 @@ - /* The server logs all traffic and signal data. Once it records the signal, it sends it to the subspace broadcaster. @@ -6,7 +5,6 @@ Store a maximum of 100 logs and then deletes them. */ - /obj/machinery/telecomms/server name = "telecommunication server" icon_state = "comm_server" @@ -15,112 +13,57 @@ anchored = TRUE use_power = IDLE_POWER_USE idle_power_usage = 15 - machinetype = 4 circuit = /obj/item/circuitboard/machine/telecomms/server var/list/log_entries = list() - var/list/stored_names = list() - var/list/TrafficActions = list() - var/logs = 0 // number of logs var/totaltraffic = 0 // gigabytes (if > 1024, divide by 1024 -> terrabytes) - var/list/memory = list() // stored memory - - var/encryption = "null" // encryption key: ie "password" - var/salt = "null" // encryption salt: ie "123comsat" - // would add up to md5("password123comsat") - var/language = "human" - var/obj/item/device/radio/headset/server_radio = null - var/last_signal = 0 // Last time it sent a signal - /obj/machinery/telecomms/server/Initialize() . = ..() - server_radio = new -/obj/machinery/telecomms/server/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - if(signal.data["message"]) +/obj/machinery/telecomms/server/receive_information(datum/signal/subspace/vocal/signal, obj/machinery/telecomms/machine_from) + // can't log non-vocal signals + if(!istype(signal) || !signal.data["message"] || !is_freq_listening(signal)) + return - if(is_freq_listening(signal)) + if(traffic > 0) + totaltraffic += traffic // add current traffic to total traffic - if(traffic > 0) - totaltraffic += traffic // add current traffic to total traffic + // Delete particularly old logs + if (log_entries.len >= 400) + log_entries.Cut(1, 2) - //Is this a test signal? Bypass logging - if(signal.data["type"] != 4) - - // If signal has a message and appropriate frequency - - update_logs() - - var/datum/comm_log_entry/log = new - - // Copy the signal.data entries we want - log.parameters["mobtype"] = signal.data["mobtype"] - log.parameters["job"] = signal.data["job"] - log.parameters["key"] = signal.data["key"] - log.parameters["message"] = signal.data["message"] - log.parameters["name"] = signal.data["name"] - log.parameters["realname"] = signal.data["realname"] - - //log.parameters["uspeech"] = signal.data["languages"] & HUMAN //good enough - // TODO languages: ^ I don't know what this does - - // If the signal is still compressed, make the log entry gibberish - if(signal.data["compression"] > 0) - log.parameters["message"] = Gibberish(signal.data["message"], signal.data["compression"] + 50) - log.parameters["job"] = Gibberish(signal.data["job"], signal.data["compression"] + 50) - log.parameters["name"] = Gibberish(signal.data["name"], signal.data["compression"] + 50) - log.parameters["realname"] = Gibberish(signal.data["realname"], signal.data["compression"] + 50) - log.input_type = "Corrupt File" - - // Log and store everything that needs to be logged - log_entries.Add(log) - if(!(signal.data["name"] in stored_names)) - stored_names.Add(signal.data["name"]) - logs++ - signal.data["server"] = src - - // Give the log a name - var/identifier = num2text( rand(-1000,1000) + world.time ) - log.name = "data packet ([md5(identifier)])" - - var/can_send = relay_information(signal, "/obj/machinery/telecomms/hub") - if(!can_send) - relay_information(signal, "/obj/machinery/telecomms/broadcaster") - -/obj/machinery/telecomms/server/proc/update_logs() - // start deleting the very first log entry - if(logs >= 400) - for(var/i = 1, i <= logs, i++) // locate the first garbage collectable log entry and remove it - var/datum/comm_log_entry/L = log_entries[i] - if(L.garbage_collector) - log_entries.Remove(L) - logs-- - break - -/obj/machinery/telecomms/server/proc/add_entry(content, input) var/datum/comm_log_entry/log = new - var/identifier = num2text( rand(-1000,1000) + world.time ) - log.name = "[input] ([md5(identifier)])" - log.input_type = input - log.parameters["message"] = content - log_entries.Add(log) - update_logs() + log.parameters["mobtype"] = signal.virt.source.type + log.parameters["name"] = signal.data["name"] + log.parameters["job"] = signal.data["job"] + log.parameters["message"] = signal.data["message"] + // If the signal is still compressed, make the log entry gibberish + var/compression = signal.data["compression"] + if(compression > 0) + log.input_type = "Corrupt File" + log.parameters["name"] = Gibberish(signal.data["name"], compression + 50) + log.parameters["job"] = Gibberish(signal.data["job"], compression + 50) + log.parameters["message"] = Gibberish(signal.data["message"], compression + 50) + + // Give the log a name and store it + var/identifier = num2text( rand(-1000,1000) + world.time ) + log.name = "data packet ([md5(identifier)])" + log_entries.Add(log) + + var/can_send = relay_information(signal, /obj/machinery/telecomms/hub) + if(!can_send) + relay_information(signal, /obj/machinery/telecomms/broadcaster) // Simple log entry datum - /datum/comm_log_entry - var/parameters = list() // carbon-copy to signal.data[] - var/name = "data packet (#)" - var/garbage_collector = 1 // if set to 0, will not be garbage collected var/input_type = "Speech File" + var/name = "data packet (#)" + var/parameters = list() // copied from signal.data above - - -//Preset Servers - +// Preset Servers /obj/machinery/telecomms/server/presets network = "tcommsat" @@ -131,22 +74,22 @@ /obj/machinery/telecomms/server/presets/science id = "Science Server" - freq_listening = list(GLOB.SCI_FREQ) + freq_listening = list(FREQ_SCIENCE) autolinkers = list("science") /obj/machinery/telecomms/server/presets/medical id = "Medical Server" - freq_listening = list(GLOB.MED_FREQ) + freq_listening = list(FREQ_MEDICAL) autolinkers = list("medical") /obj/machinery/telecomms/server/presets/supply id = "Supply Server" - freq_listening = list(GLOB.SUPP_FREQ) + freq_listening = list(FREQ_SUPPLY) autolinkers = list("supply") /obj/machinery/telecomms/server/presets/service id = "Service Server" - freq_listening = list(GLOB.SERV_FREQ) + freq_listening = list(FREQ_SERVICE) autolinkers = list("service") /obj/machinery/telecomms/server/presets/common @@ -154,26 +97,25 @@ freq_listening = list() autolinkers = list("common") - //Common and other radio frequencies for people to freely use - // 1441 to 1489 +//Common and other radio frequencies for people to freely use /obj/machinery/telecomms/server/presets/common/Initialize() . = ..() - for(var/i = 1441, i < 1489, i += 2) + for(var/i = MIN_FREQ, i <= MAX_FREQ, i += 2) freq_listening |= i /obj/machinery/telecomms/server/presets/command id = "Command Server" - freq_listening = list(GLOB.COMM_FREQ) + freq_listening = list(FREQ_COMMAND) autolinkers = list("command") /obj/machinery/telecomms/server/presets/engineering id = "Engineering Server" - freq_listening = list(GLOB.ENG_FREQ) + freq_listening = list(FREQ_ENGINEERING) autolinkers = list("engineering") /obj/machinery/telecomms/server/presets/security id = "Security Server" - freq_listening = list(GLOB.SEC_FREQ) + freq_listening = list(FREQ_SECURITY) autolinkers = list("security") /obj/machinery/telecomms/server/presets/common/birdstation/Initialize() diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 62f53f73ad..b68d348539 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -26,15 +26,13 @@ GLOBAL_LIST_EMPTY(telecomms_list) var/list/freq_listening = list() // list of frequencies to tune into: if none, will listen to all - var/machinetype = 0 // just a hacky way of preventing alike machines from pairing - var/toggled = TRUE // Is it toggled on var/on = TRUE - var/long_range_link = 0 // Can you link it across Z levels or on the otherside of the map? (Relay & Hub) - var/hide = 0 // Is it a hidden machine? - var/listening_level = 0 // 0 = auto set in New() - this is the z level that the machine is listening to. + var/toggled = TRUE // Is it toggled on + var/long_range_link = FALSE // Can you link it across Z levels or on the otherside of the map? (Relay & Hub) + var/hide = FALSE // Is it a hidden machine? -/obj/machinery/telecomms/proc/relay_information(datum/signal/signal, filter, copysig, amount = 20) +/obj/machinery/telecomms/proc/relay_information(datum/signal/subspace/signal, filter, copysig, amount = 20) // relay signal to all linked machinery that are of type [filter]. If signal has been sent [amount] times, stop sending if(!on) @@ -46,70 +44,26 @@ GLOBAL_LIST_EMPTY(telecomms_list) if(netlag > signal.data["slow"]) signal.data["slow"] = netlag -// Loop through all linked machines and send the signal or copy. + // Loop through all linked machines and send the signal or copy. for(var/obj/machinery/telecomms/machine in links) - if(filter && !istype( machine, text2path(filter) )) + if(filter && !istype( machine, filter )) continue if(!machine.on) continue if(amount && send_count >= amount) break - if(machine.loc.z != listening_level) - if(long_range_link == 0 && machine.long_range_link == 0) - continue - // If we're sending a copy, be sure to create the copy for EACH machine and paste the data - var/datum/signal/copy = new - if(copysig) - - copy.transmission_method = 2 - copy.frequency = signal.frequency - // Copy the main data contents! Workaround for some nasty bug where the actual array memory is copied and not its contents. - copy.data = list( - - "mob" = signal.data["mob"], - "mobtype" = signal.data["mobtype"], - "realname" = signal.data["realname"], - "name" = signal.data["name"], - "job" = signal.data["job"], - "key" = signal.data["key"], - "vmask" = signal.data["vmask"], - "compression" = signal.data["compression"], - "message" = signal.data["message"], - "radio" = signal.data["radio"], - "slow" = signal.data["slow"], - "traffic" = signal.data["traffic"], - "type" = signal.data["type"], - "server" = signal.data["server"], - "reject" = signal.data["reject"], - "level" = signal.data["level"], - "spans" = signal.data["spans"], - "verb_say" = signal.data["verb_say"], - "verb_ask" = signal.data["verb_ask"], - "verb_exclaim" = signal.data["verb_exclaim"], - "verb_yell" = signal.data["verb_yell"], - "language" = signal.data["language"] - ) - - // Keep the "original" signal constant - if(!signal.data["original"]) - copy.data["original"] = signal - else - copy.data["original"] = signal.data["original"] - - else - copy = null - + if(z != machine.loc.z && !long_range_link && !machine.long_range_link) + continue send_count++ if(machine.is_freq_listening(signal)) machine.traffic++ - if(copysig && copy) - machine.receive_information(copy, src) + if(copysig) + machine.receive_information(signal.copy(), src) else machine.receive_information(signal, src) - if(send_count > 0 && is_freq_listening(signal)) traffic++ @@ -121,28 +75,16 @@ GLOBAL_LIST_EMPTY(telecomms_list) /obj/machinery/telecomms/proc/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) // receive information from linked machinery - ..() /obj/machinery/telecomms/proc/is_freq_listening(datum/signal/signal) // return TRUE if found, FALSE if not found - if(!signal) - return FALSE - if((signal.frequency in freq_listening) || (!freq_listening.len)) - return TRUE - else - return FALSE + return signal && (!freq_listening.len || (signal.frequency in freq_listening)) /obj/machinery/telecomms/New() GLOB.telecomms_list += src ..() - //Set the listening_level if there's none. - if(!listening_level) - //Defaults to our Z level! - var/turf/position = get_turf(src) - listening_level = position.z - /obj/machinery/telecomms/Initialize(mapload) . = ..() if(mapload && autolinkers.len) diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 626c405284..5e7ddb6497 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -24,3 +24,5 @@ if(occupant && occupant.client && occupant.client.mouse_pointer_icon == 'icons/mecha/mecha_mouse.dmi') occupant.client.mouse_pointer_icon = initial(occupant.client.mouse_pointer_icon) ..() + + diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index d5228b9130..56e3ccc6c3 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -63,3 +63,4 @@ /obj/mecha/combat/gygax/dark/RemoveActions(mob/living/user, human_occupant = 0) ..() thrusters_action.Remove(user) + diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index ceb88aa9b0..7424a30fcc 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -141,3 +141,5 @@ for (var/i=0;i<6;i++) color = color+pick(colors) return color + + diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 731aa2cec9..7be8fb6246 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -1,90 +1,90 @@ -/obj/mecha/combat/marauder - desc = "Heavy-duty, combat exosuit, developed after the Durand model. Rarely found among civilian populations." - name = "\improper Marauder" - icon_state = "marauder" - step_in = 5 - max_integrity = 500 - deflect_chance = 25 - armor = list(melee = 50, bullet = 55, laser = 40, energy = 30, bomb = 30, bio = 0, rad = 0, fire = 100, acid = 100) - max_temperature = 60000 - resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF - infra_luminosity = 3 +/obj/mecha/combat/marauder + desc = "Heavy-duty, combat exosuit, developed after the Durand model. Rarely found among civilian populations." + name = "\improper Marauder" + icon_state = "marauder" + step_in = 5 + max_integrity = 500 + deflect_chance = 25 + armor = list(melee = 50, bullet = 55, laser = 40, energy = 30, bomb = 30, bio = 0, rad = 0, fire = 100, acid = 100) + max_temperature = 60000 + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF + infra_luminosity = 3 operation_req_access = list(ACCESS_CENT_SPECOPS) - wreckage = /obj/structure/mecha_wreckage/marauder - add_req_access = 0 - internal_damage_threshold = 25 - force = 45 - max_equip = 4 - bumpsmash = 1 - -/obj/mecha/combat/marauder/GrantActions(mob/living/user, human_occupant = 0) - ..() - smoke_action.Grant(user, src) - thrusters_action.Grant(user, src) - zoom_action.Grant(user, src) - -/obj/mecha/combat/marauder/RemoveActions(mob/living/user, human_occupant = 0) - ..() - smoke_action.Remove(user) - thrusters_action.Remove(user) - zoom_action.Remove(user) - -/obj/mecha/combat/marauder/loaded/New() - ..() - var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src) - ME.attach(src) - -/obj/mecha/combat/marauder/seraph - desc = "Heavy-duty, command-type exosuit. This is a custom model, utilized only by high-ranking military personnel." - name = "\improper Seraph" - icon_state = "seraph" + wreckage = /obj/structure/mecha_wreckage/marauder + add_req_access = 0 + internal_damage_threshold = 25 + force = 45 + max_equip = 4 + bumpsmash = 1 + +/obj/mecha/combat/marauder/GrantActions(mob/living/user, human_occupant = 0) + ..() + smoke_action.Grant(user, src) + thrusters_action.Grant(user, src) + zoom_action.Grant(user, src) + +/obj/mecha/combat/marauder/RemoveActions(mob/living/user, human_occupant = 0) + ..() + smoke_action.Remove(user) + thrusters_action.Remove(user) + zoom_action.Remove(user) + +/obj/mecha/combat/marauder/loaded/New() + ..() + var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src) + ME.attach(src) + +/obj/mecha/combat/marauder/seraph + desc = "Heavy-duty, command-type exosuit. This is a custom model, utilized only by high-ranking military personnel." + name = "\improper Seraph" + icon_state = "seraph" operation_req_access = list(ACCESS_CENT_SPECOPS) - step_in = 3 + step_in = 3 max_integrity = 550 - wreckage = /obj/structure/mecha_wreckage/seraph - internal_damage_threshold = 20 - force = 55 - max_equip = 5 - -/obj/mecha/combat/marauder/seraph/New() - ..() - var/obj/item/mecha_parts/mecha_equipment/ME - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/teleporter(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src) - ME.attach(src) - -/obj/mecha/combat/marauder/mauler - desc = "Heavy-duty, combat exosuit, developed off of the existing Marauder model." - name = "\improper Mauler" - icon_state = "mauler" + wreckage = /obj/structure/mecha_wreckage/seraph + internal_damage_threshold = 20 + force = 55 + max_equip = 5 + +/obj/mecha/combat/marauder/seraph/New() + ..() + var/obj/item/mecha_parts/mecha_equipment/ME + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/teleporter(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src) + ME.attach(src) + +/obj/mecha/combat/marauder/mauler + desc = "Heavy-duty, combat exosuit, developed off of the existing Marauder model." + name = "\improper Mauler" + icon_state = "mauler" operation_req_access = list(ACCESS_SYNDICATE) - wreckage = /obj/structure/mecha_wreckage/mauler - max_equip = 5 - -/obj/mecha/combat/marauder/mauler/loaded/New() - ..() - var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src) - ME.attach(src) - - + wreckage = /obj/structure/mecha_wreckage/mauler + max_equip = 5 + +/obj/mecha/combat/marauder/mauler/loaded/New() + ..() + var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src) + ME.attach(src) + + diff --git a/code/game/mecha/combat/reticence.dm b/code/game/mecha/combat/reticence.dm index 26384824d0..14891835c5 100644 --- a/code/game/mecha/combat/reticence.dm +++ b/code/game/mecha/combat/reticence.dm @@ -1,28 +1,28 @@ -/obj/mecha/combat/reticence - desc = "A silent, fast, and nigh-invisible miming exosuit. Popular among mimes and mime assassins." - name = "\improper reticence" - icon_state = "reticence" - step_in = 2 - dir_in = 1 //Facing North. - max_integrity = 100 - deflect_chance = 3 - armor = list(melee = 25, bullet = 20, laser = 30, energy = 15, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100) - max_temperature = 15000 - wreckage = /obj/structure/mecha_wreckage/reticence +/obj/mecha/combat/reticence + desc = "A silent, fast, and nigh-invisible miming exosuit. Popular among mimes and mime assassins." + name = "\improper reticence" + icon_state = "reticence" + step_in = 2 + dir_in = 1 //Facing North. + max_integrity = 100 + deflect_chance = 3 + armor = list(melee = 25, bullet = 20, laser = 30, energy = 15, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100) + max_temperature = 15000 + wreckage = /obj/structure/mecha_wreckage/reticence operation_req_access = list(ACCESS_THEATRE) - add_req_access = 0 - internal_damage_threshold = 25 - max_equip = 2 - step_energy_drain = 3 - color = "#87878715" - stepsound = null - turnsound = null - opacity = 0 - -/obj/mecha/combat/reticence/loaded/New() - ..() - var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/rcd //HAHA IT MAKES WALLS GET IT - ME.attach(src) - return + add_req_access = 0 + internal_damage_threshold = 25 + max_equip = 2 + step_energy_drain = 3 + color = "#87878715" + stepsound = null + turnsound = null + opacity = 0 + +/obj/mecha/combat/reticence/loaded/New() + ..() + var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced + ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/rcd //HAHA IT MAKES WALLS GET IT + ME.attach(src) + return diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 6ef98120f5..8654f9854e 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -34,15 +34,13 @@ "Misc" ) - var/datum/component/material_container/materials - /obj/machinery/mecha_part_fabricator/Initialize() - materials = AddComponent(/datum/component/material_container, - list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE), 0, - FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert)) - materials.precise_insertion = TRUE - stored_research = new - return ..() + var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, + list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE), 0, + FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert)) + materials.precise_insertion = TRUE + stored_research = new + return ..() /obj/machinery/mecha_part_fabricator/RefreshParts() var/T = 0 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 2d148b4ff4..ded6aec5c5 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -247,7 +247,7 @@ radio.name = "[src] radio" radio.icon = icon radio.icon_state = icon_state - radio.subspace_transmission = 1 + radio.subspace_transmission = TRUE /obj/mecha/proc/can_use(mob/user) if(user != occupant) diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 54b44f89f9..4c1bceca28 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -284,7 +284,7 @@ if(href_list["rfreq"]) var/new_frequency = (radio.frequency + afilter.getNum("rfreq")) - if (!radio.freerange || (radio.frequency < 1200 || radio.frequency > 1600)) + if (!radio.freerange || (radio.frequency < MIN_FREE_FREQ || radio.frequency > MAX_FREE_FREQ)) new_frequency = sanitize_frequency(new_frequency) radio.set_frequency(new_frequency) send_byjax(src.occupant,"exosuit.browser","rfreq","[format_frequency(radio.frequency)]") diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 76fd5e5cbf..2f8aff3a13 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -26,6 +26,7 @@ aSignal = new(src) aSignal.name = "[name] core" aSignal.code = rand(1,100) + aSignal.frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ) if(ISMULTIPLE(aSignal.frequency, 2))//signaller frequencies are always uneven! aSignal.frequency++ diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index 8eb4c986de..42f59cc535 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -19,6 +19,7 @@ LAZYREMOVE(AllTeleporters, src) return ..() + /obj/effect/bump_teleporter/singularity_act() return diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index 4362957a76..baad713675 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -14,7 +14,6 @@ if(e_name) name = e_name desc = "A [name] vandalizing the station." - if(alt_icon) icon = alt_icon if(type) @@ -28,3 +27,4 @@ if(main) paint_colour = main add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY) + diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index d7b6340c26..f5754029eb 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -236,7 +236,7 @@ /obj/structure/foamedmetal/Move() var/turf/T = loc - ..() + . = ..() move_update_air(T) /obj/structure/foamedmetal/attack_paw(mob/user) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index caeb1f168c..90408e7d3f 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -16,7 +16,7 @@ /obj/effect/landmark/start name = "start" - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/mob/landmarks.dmi' icon_state = "x" anchored = TRUE var/jobspawn_override = FALSE @@ -40,9 +40,9 @@ // START LANDMARKS FOLLOW. Don't change the names unless // you are refactoring shitty landmark code. - /obj/effect/landmark/start/assistant name = "Assistant" + icon_state = "Assistant" /obj/effect/landmark/start/assistant/override jobspawn_override = TRUE @@ -50,102 +50,135 @@ /obj/effect/landmark/start/janitor name = "Janitor" + icon_state = "Janitor" /obj/effect/landmark/start/cargo_technician name = "Cargo Technician" + icon_state = "Cargo Technician" /obj/effect/landmark/start/bartender name = "Bartender" + icon_state = "Bartender" /obj/effect/landmark/start/clown name = "Clown" + icon_state = "Clown" /obj/effect/landmark/start/mime name = "Mime" + icon_state = "Mime" /obj/effect/landmark/start/quartermaster name = "Quartermaster" + icon_state = "Quartermaster" /obj/effect/landmark/start/atmospheric_technician name = "Atmospheric Technician" + icon_state = "Atmospheric Technician" /obj/effect/landmark/start/cook name = "Cook" + icon_state = "Cook" /obj/effect/landmark/start/shaft_miner name = "Shaft Miner" + icon_state = "Shaft Miner" /obj/effect/landmark/start/security_officer name = "Security Officer" + icon_state = "Security Officer" /obj/effect/landmark/start/botanist name = "Botanist" + icon_state = "Botanist" /obj/effect/landmark/start/head_of_security name = "Head of Security" - -/obj/effect/landmark/start/ai - name = "AI" - delete_after_roundstart = FALSE + icon_state = "Head of Security" /obj/effect/landmark/start/captain name = "Captain" + icon_state = "Captain" /obj/effect/landmark/start/detective name = "Detective" + icon_state = "Detective" /obj/effect/landmark/start/warden name = "Warden" + icon_state = "Warden" /obj/effect/landmark/start/chief_engineer name = "Chief Engineer" - -/obj/effect/landmark/start/cyborg - name = "Cyborg" + icon_state = "Chief Engineer" /obj/effect/landmark/start/head_of_personnel name = "Head of Personnel" + icon_state = "Head of Personnel" /obj/effect/landmark/start/librarian name = "Curator" + icon_state = "Curator" /obj/effect/landmark/start/lawyer name = "Lawyer" + icon_state = "Lawyer" /obj/effect/landmark/start/station_engineer name = "Station Engineer" + icon_state = "Station Engineer" /obj/effect/landmark/start/medical_doctor name = "Medical Doctor" + icon_state = "Medical Doctor" /obj/effect/landmark/start/scientist name = "Scientist" + icon_state = "Scientist" /obj/effect/landmark/start/chemist name = "Chemist" + icon_state = "Chemist" /obj/effect/landmark/start/roboticist name = "Roboticist" + icon_state = "Roboticist" /obj/effect/landmark/start/research_director name = "Research Director" + icon_state = "Research Director" /obj/effect/landmark/start/geneticist name = "Geneticist" + icon_state = "Geneticist" /obj/effect/landmark/start/chief_medical_officer name = "Chief Medical Officer" + icon_state = "Chief Medical Officer" /obj/effect/landmark/start/virologist name = "Virologist" + icon_state = "Virologist" /obj/effect/landmark/start/chaplain name = "Chaplain" + icon_state = "Chaplain" + +/obj/effect/landmark/start/cyborg + name = "Cyborg" + icon_state = "Cyborg" + +/obj/effect/landmark/start/ai + name = "AI" + icon_state = "AI" + delete_after_roundstart = FALSE + //Department Security spawns /obj/effect/landmark/start/depsec name = "department_sec" + icon_state = "Security Officer" /obj/effect/landmark/start/depsec/New() ..() @@ -358,4 +391,4 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) /obj/effect/landmark/ruin/Destroy() GLOB.ruin_landmarks -= src ruin_template = null - . = ..() \ No newline at end of file + . = ..() diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index d7d36acde1..1178cd43f8 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -65,3 +65,4 @@ /obj/effect/abstract/marker/at name = "active turf marker" + diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index ac8e5ff14d..51a5778383 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -1,3 +1,4 @@ + /proc/create_portal_pair(turf/source, turf/destination, _creator = null, _lifespan = 300, accuracy = 0, newtype = /obj/effect/portal) if(!istype(source) || !istype(destination)) return @@ -170,3 +171,4 @@ else real_target = get_turf(linked) return real_target + diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index 79627a7a80..e99a2fcbc6 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/code/game/objects/effects/spawners/gibspawner.dm @@ -43,7 +43,7 @@ /obj/effect/gibspawner/generic - gibtypes = list(/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs/core) + gibtypes = list(/obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/core) gibamounts = list(2,2,1) /obj/effect/gibspawner/generic/Initialize() @@ -52,7 +52,7 @@ . = ..() /obj/effect/gibspawner/human - gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/up,/obj/effect/decal/cleanable/blood/gibs/down,/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs/body,/obj/effect/decal/cleanable/blood/gibs/limb,/obj/effect/decal/cleanable/blood/gibs/core) + gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/up, /obj/effect/decal/cleanable/blood/gibs/down, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/body, /obj/effect/decal/cleanable/blood/gibs/limb, /obj/effect/decal/cleanable/blood/gibs/core) gibamounts = list(1,1,1,1,1,1,1) /obj/effect/gibspawner/human/Initialize() @@ -62,7 +62,7 @@ /obj/effect/gibspawner/humanbodypartless //only the gibs that don't look like actual full bodyparts (except torso). - gibtypes = list(/obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/core,/obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/core, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/torso) + gibtypes = list(/obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/core, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/core, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/torso) gibamounts = list(1, 1, 1, 1, 1, 1) /obj/effect/gibspawner/humanbodypartless/Initialize() @@ -72,7 +72,7 @@ /obj/effect/gibspawner/xeno - gibtypes = list(/obj/effect/decal/cleanable/xenoblood/xgibs/up,/obj/effect/decal/cleanable/xenoblood/xgibs/down,/obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/xenoblood/xgibs/body, /obj/effect/decal/cleanable/xenoblood/xgibs/limb, /obj/effect/decal/cleanable/xenoblood/xgibs/core) + gibtypes = list(/obj/effect/decal/cleanable/xenoblood/xgibs/up, /obj/effect/decal/cleanable/xenoblood/xgibs/down, /obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/xenoblood/xgibs/body, /obj/effect/decal/cleanable/xenoblood/xgibs/limb, /obj/effect/decal/cleanable/xenoblood/xgibs/core) gibamounts = list(1,1,1,1,1,1,1) /obj/effect/gibspawner/xeno/Initialize() @@ -82,7 +82,7 @@ /obj/effect/gibspawner/xenobodypartless //only the gibs that don't look like actual full bodyparts (except torso). - gibtypes = list(/obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/xenoblood/xgibs/core,/obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/xenoblood/xgibs/core, /obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/xenoblood/xgibs/torso) + gibtypes = list(/obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/xenoblood/xgibs/core, /obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/xenoblood/xgibs/core, /obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/xenoblood/xgibs/torso) gibamounts = list(1, 1, 1, 1, 1, 1) @@ -111,7 +111,7 @@ /obj/effect/gibspawner/robot sparks = 1 - gibtypes = list(/obj/effect/decal/cleanable/robot_debris/up,/obj/effect/decal/cleanable/robot_debris/down,/obj/effect/decal/cleanable/robot_debris,/obj/effect/decal/cleanable/robot_debris,/obj/effect/decal/cleanable/robot_debris,/obj/effect/decal/cleanable/robot_debris/limb) + gibtypes = list(/obj/effect/decal/cleanable/robot_debris/up, /obj/effect/decal/cleanable/robot_debris/down, /obj/effect/decal/cleanable/robot_debris, /obj/effect/decal/cleanable/robot_debris, /obj/effect/decal/cleanable/robot_debris, /obj/effect/decal/cleanable/robot_debris/limb) gibamounts = list(1,1,1,1,1,1) /obj/effect/gibspawner/robot/Initialize() diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index a2ff5b0674..90f8fee507 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -202,5 +202,6 @@ /obj/item/aiModule/core/full/antimov, /obj/item/aiModule/core/full/balance, /obj/item/aiModule/core/full/tyrant, - /obj/item/aiModule/core/full/thermurderdynamic + /obj/item/aiModule/core/full/thermurderdynamic, + /obj/item/aiModule/core/full/damaged ) diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm index d9861d827d..59c4e23283 100644 --- a/code/game/objects/effects/temporary_visuals/clockcult.dm +++ b/code/game/objects/effects/temporary_visuals/clockcult.dm @@ -86,8 +86,8 @@ transform = matrix()*2 var/matrix/M = transform M.Turn(90) - animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags_1 = ANIMATION_PARALLEL) - animate(src, transform = M, time = duration, flags_1 = ANIMATION_PARALLEL) + animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL) + animate(src, transform = M, time = duration, flags = ANIMATION_PARALLEL) /obj/effect/temp_visual/ratvar/ocular_warden name = "warden's gaze" diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm index 125904604f..a649763435 100644 --- a/code/game/objects/effects/temporary_visuals/cult.dm +++ b/code/game/objects/effects/temporary_visuals/cult.dm @@ -65,8 +65,8 @@ var/matrix/M = transform M.Turn(turnedness) transform = M - animate(src, alpha = 255, time = duration, easing = BOUNCE_EASING, flags_1 = ANIMATION_PARALLEL) - animate(src, transform = oldtransform, time = duration, flags_1 = ANIMATION_PARALLEL) + animate(src, alpha = 255, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL) + animate(src, transform = oldtransform, time = duration, flags = ANIMATION_PARALLEL) /obj/effect/temp_visual/cult/rune_spawn/rune1 icon_state = "rune1words" diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 0928fd9ca6..0203cb66c3 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -378,7 +378,7 @@ M = size_matrix*0.1 else M = size_matrix*2 - animate(src, alpha = 20, transform = M, time = duration, flags_1 = ANIMATION_PARALLEL) + animate(src, alpha = 20, transform = M, time = duration, flags = ANIMATION_PARALLEL) /obj/effect/temp_visual/bleed/explode icon_state = "bleed10" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 33d055b791..19c1b6e03d 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -117,7 +117,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/trigger_guard = TRIGGER_GUARD_NONE - var/icon_override = null + var/icon_override //CIT CHANGE - adds icon_override var. Will be removed with #4322 //Grinder vars var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only @@ -202,31 +202,39 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(!user.research_scanner) return - var/list/input = techweb_item_boost_check(src) - if(input) - var/list/output = list("Research Boost Data:") - var/list/res = list("Already researched:") - var/list/boosted = list("Already boosted:") - for(var/datum/techweb_node/N in input) - var/str = "[N.display_name]: [input[N]] points.    " - if(SSresearch.science_tech.researched_nodes[N]) - res += str - else if(SSresearch.science_tech.boosted_nodes[N]) - boosted += str - if(SSresearch.science_tech.visible_nodes[N]) //JOY OF DISCOVERY! - output += str - var/list/combine = output + res + boosted - var/strout = combine.Join("
    ") - to_chat(user, strout) - var/list/msg = list("*--------*
    Extractable materials:") - if(materials.len) + // Research prospects, including boostable nodes and point values. + // Deliver to a console to know whether the boosts have already been used. + var/list/research_msg = list("Research prospects: ") + var/sep = "" + var/list/boostable_nodes = techweb_item_boost_check(src) + if (boostable_nodes) + for(var/id in boostable_nodes) + var/datum/techweb_node/node = SSresearch.techweb_nodes[id] + research_msg += sep + research_msg += node.display_name + sep = ", " + var/points = techweb_item_point_check(src) + if (points) + research_msg += sep + research_msg += "[points] points" + sep = ", " + + if (!sep) // nothing was shown + research_msg += "None" + + // Extractable materials. Only shows the names, not the amounts. + research_msg += ".
    Extractable materials: " + if (materials.len) + sep = "" for(var/mat in materials) - msg += "[CallMaterialName(mat)]" //Capitize first word, remove the "$" + research_msg += sep + research_msg += CallMaterialName(mat) + sep = ", " else - msg += "No extractable materials detected." - msg += "*--------*" - to_chat(user, msg.Join("
    ")) + research_msg += "None" + research_msg += "." + to_chat(user, research_msg.Join()) /obj/item/proc/speechModification(message) //for message modding by mask slot. return message @@ -550,8 +558,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) M.Unconscious(20) M.Knockdown(40) if (prob(eyes.eye_damage - 10 + 1)) - if(M.become_blind()) - to_chat(M, "You go blind!") + M.become_blind(EYE_DAMAGE) + to_chat(M, "You go blind!") /obj/item/singularity_pull(S, current_size) ..() diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index 1e9c71bd01..8b9b24fe65 100644 --- a/code/game/objects/items/AI_modules.dm +++ b/code/game/objects/items/AI_modules.dm @@ -173,7 +173,7 @@ AI MODULES /******************** OneHuman ********************/ /obj/item/aiModule/zeroth/oneHuman - name = "'OneCrew' AI Module" + name = "'OneCrew' AI Module"//CIT CHANGE - changes onehuman to onecrew var/targetName = "" laws = list("Only SUBJECT is crew.") @@ -554,3 +554,16 @@ AI MODULES /obj/item/aiModule/core/full/peacekeeper name = "'Peacekeeper' Core AI Module" law_id = "peacekeeper" + +// Bad times ahead + +/obj/item/aiModule/core/full/damaged + name = "damaged Core AI Module" + desc = "An AI Module for programming laws to an AI. It looks slightly damaged." + +/obj/item/aiModule/core/full/damaged/install(datum/ai_laws/law_datum, mob/user) + laws += generate_ion_law() + while (prob(75)) + laws += generate_ion_law() + ..() + laws = list() diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 1a7b347514..97025c4b63 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -291,25 +291,25 @@ ARCD if("Public") airlock_type = /obj/machinery/door/airlock/public/glass if("Engineering") - airlock_type = /obj/machinery/door/airlock/glass_engineering + airlock_type = /obj/machinery/door/airlock/engineering/glass if("Atmospherics") - airlock_type = /obj/machinery/door/airlock/glass_atmos + airlock_type = /obj/machinery/door/airlock/atmos/glass if("Security") - airlock_type = /obj/machinery/door/airlock/glass_security + airlock_type = /obj/machinery/door/airlock/security/glass if("Command") - airlock_type = /obj/machinery/door/airlock/glass_command + airlock_type = /obj/machinery/door/airlock/command/glass if("Medical") - airlock_type = /obj/machinery/door/airlock/glass_medical + airlock_type = /obj/machinery/door/airlock/medical/glass if("Research") - airlock_type = /obj/machinery/door/airlock/glass_research + airlock_type = /obj/machinery/door/airlock/research/glass if("Science") - airlock_type = /obj/machinery/door/airlock/glass_science + airlock_type = /obj/machinery/door/airlock/science/glass if("Virology") - airlock_type = /obj/machinery/door/airlock/glass_virology + airlock_type = /obj/machinery/door/airlock/virology/glass if("Mining") - airlock_type = /obj/machinery/door/airlock/glass_mining + airlock_type = /obj/machinery/door/airlock/mining/glass if("Maintenance") - airlock_type = /obj/machinery/door/airlock/glass_maintenance + airlock_type = /obj/machinery/door/airlock/maintenance/glass if("External") airlock_type = /obj/machinery/door/airlock/external/glass if("External Maintenance") diff --git a/code/game/objects/items/RCL.dm b/code/game/objects/items/RCL.dm index 8958ade484..f842c579c1 100644 --- a/code/game/objects/items/RCL.dm +++ b/code/game/objects/items/RCL.dm @@ -169,15 +169,20 @@ loaded.item_color = colors[current_color_index] last = loaded.place_turf(get_turf(src), user, turn(user.dir, 180)) is_empty(user) //If we've run out, display message + update_icon() -/obj/item/twohanded/rcl/pre_loaded/Initialize () //Comes preloaded with cable, for testing stuff +/obj/item/twohanded/rcl/pre_loaded/Initialize() //Comes preloaded with cable, for testing stuff . = ..() loaded = new() loaded.max_amount = max_amount loaded.amount = max_amount update_icon() +/obj/item/twohanded/rcl/Initialize() + . = ..() + update_icon() + /obj/item/twohanded/rcl/ui_action_click(mob/user, action) if(istype(action, /datum/action/item_action/rcl)) current_color_index++; @@ -203,4 +208,4 @@ item_state = "rcl" else icon_state = "rclg-1" - item_state = "rclg-1" \ No newline at end of file + item_state = "rclg-1" diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 6e515264ca..72481f335d 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -1,3 +1,4 @@ + /obj/item/bodybag name = "body bag" desc = "A folded bag designed for the storage and transportation of cadavers." @@ -79,4 +80,3 @@ return loc.visible_message("[user] suddenly appears in front of [loc]!", "[user] breaks free of [src]!") qdel(src) - diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 0f65281328..0358aa3188 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -155,11 +155,6 @@ update_label("John Doe", "Clowny") name = "agent card" access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE) var/anyone = FALSE //Can anyone forge the ID or just syndicate? - -/obj/item/card/id/syndicate/nuke_leader - name = "lead agent card" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) - /obj/item/card/id/syndicate/Initialize() . = ..() @@ -202,6 +197,10 @@ update_label("John Doe", "Clowny") /obj/item/card/id/syndicate/anyone anyone = TRUE +/obj/item/card/id/syndicate/nuke_leader + name = "lead agent card" + access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) + /obj/item/card/id/syndicate_command name = "syndicate ID card" desc = "An ID straight from the Syndicate." @@ -355,4 +354,4 @@ update_label("John Doe", "Clowny") name = "APC Access ID" desc = "Special ID card to allow access to APCs." icon_state = "centcom" - access = list(ACCESS_ENGINE_EQUIP) + access = list(ACCESS_ENGINE_EQUIP) \ No newline at end of file diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index e033670880..1228cf2011 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -261,28 +261,29 @@ /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/glass = 1) +#define PATH_FREEZER /obj/machinery/atmospherics/components/unary/thermomachine/freezer +#define PATH_HEATER /obj/machinery/atmospherics/components/unary/thermomachine/heater + /obj/item/circuitboard/machine/thermomachine/Initialize() . = ..() - if(prob(50)) - name = "Freezer (Machine Board)" - build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer - else - name = "Heater (Machine Board)" - build_path = /obj/machinery/atmospherics/components/unary/thermomachine/heater - -#define FREEZER /obj/item/circuitboard/machine/thermomachine/freezer -#define HEATER /obj/item/circuitboard/machine/thermomachine/heater + if(!build_path) + if(prob(50)) + name = "Freezer (Machine Board)" + build_path = PATH_FREEZER + else + name = "Heater (Machine Board)" + build_path = PATH_HEATER /obj/item/circuitboard/machine/thermomachine/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/screwdriver)) var/obj/item/circuitboard/new_type var/new_setting switch(build_path) - if(FREEZER) - new_type = HEATER + if(PATH_FREEZER) + new_type = /obj/item/circuitboard/machine/thermomachine/heater new_setting = "Heater" - if(HEATER) - new_type = FREEZER + if(PATH_HEATER) + new_type = /obj/item/circuitboard/machine/thermomachine/freezer new_setting = "Freezer" name = initial(new_type.name) build_path = initial(new_type.build_path) @@ -291,16 +292,16 @@ else return ..() -#undef FREEZER -#undef HEATER - /obj/item/circuitboard/machine/thermomachine/heater name = "Heater (Machine Board)" - build_path = /obj/machinery/atmospherics/components/unary/thermomachine/heater + build_path = PATH_HEATER /obj/item/circuitboard/machine/thermomachine/freezer name = "Freezer (Machine Board)" - build_path = /obj/machinery/atmospherics/components/unary/thermomachine/freezer + build_path = PATH_FREEZER + +#undef PATH_FREEZER +#undef PATH_HEATER /obj/item/circuitboard/machine/deep_fryer name = "circuit board (Deep Fryer)" diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index a3ad685406..3e322ea0fa 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -8,7 +8,6 @@ var/colour = "red" var/open = FALSE - /obj/item/lipstick/purple name = "purple lipstick" colour = "purple" @@ -22,7 +21,6 @@ name = "black lipstick" colour = "black" - /obj/item/lipstick/random name = "lipstick" icon_state = "random_lipstick" @@ -33,8 +31,6 @@ colour = pick("red","purple","lime","black","green","blue","white") name = "[colour] lipstick" - - /obj/item/lipstick/attack_self(mob/user) cut_overlays() to_chat(user, "You twist \the [src] [open ? "closed" : "open"].") @@ -103,7 +99,6 @@ else ..() - /obj/item/razor name = "electric razor" desc = "The latest and greatest power razor born from the science of shaving." @@ -112,7 +107,6 @@ flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_TINY - /obj/item/razor/proc/shave(mob/living/carbon/human/H, location = "mouth") if(location == "mouth") H.facial_hair_style = "Shaved" @@ -188,4 +182,4 @@ else ..() else - ..() + ..() \ No newline at end of file diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 56bad47963..54dff5abd2 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -39,7 +39,7 @@ var/list/runes = list("rune1","rune2","rune3","rune4","rune5","rune6") var/list/randoms = list(RANDOM_ANY, RANDOM_RUNE, RANDOM_ORIENTED, RANDOM_NUMBER, RANDOM_GRAFFITI, RANDOM_LETTER) - var/list/graffiti_large_h = list("secborg", "paint") + var/list/graffiti_large_h = list("secborg", "paint") // CIT CHANGE - removes yiff in hell graffiti var/list/all_drawables @@ -276,6 +276,7 @@ else if(drawing in numerals) temp = "number" + var/graf_rot if(drawing in oriented) switch(user.dir) @@ -617,9 +618,6 @@ spray_overlay.color = paint_color add_overlay(spray_overlay) - pre_noise = FALSE - post_noise = TRUE - /obj/item/toy/crayon/spraycan/borg name = "cyborg spraycan" desc = "A metallic container containing shiny synthesised paint." diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index f2bc8b5686..5a91028261 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -245,7 +245,7 @@ GLOBAL_LIST_EMPTY(PDAs) dat += "
  • Bots Access
    • " if (cartridge.access & CART_JANITOR) dat += "
  • Custodial Locator
    • " - if (istype(cartridge.radio, /obj/item/radio/integrated/signal)) + if (istype(cartridge.radio)) dat += "
  • Signaler System
    • " if (cartridge.access & CART_NEWSCASTER) dat += "
  • Newscaster Access
    • " @@ -511,8 +511,7 @@ GLOBAL_LIST_EMPTY(PDAs) U << browse(null, "window=pda") return if("Message") - var/obj/item/device/pda/P = locate(href_list["target"]) - src.create_message(U, P) + src.create_message(U, locate(href_list["target"])) if("MessageAll") src.send_to_all(U) @@ -594,49 +593,57 @@ GLOBAL_LIST_EMPTY(PDAs) t = Gibberish(t, 100) return t -/obj/item/device/pda/proc/send_message(mob/living/user = usr,list/obj/item/device/pda/targets) +/obj/item/device/pda/proc/send_message(mob/living/user, list/obj/item/device/pda/targets) var/message = msg_input(user) - if(!message || !targets.len) return - if(last_text && world.time < last_text + 5) return - var/multiple = targets.len > 1 + // Send the signal + var/list/string_targets = list() + for (var/obj/item/device/pda/P in targets) + if (P.owner && P.ownjob) // != src is checked by the UI + string_targets += "[P.owner] ([P.ownjob])" + for (var/obj/machinery/computer/message_monitor/M in targets) + // In case of "Reply" to a message from a console, this will make the + // message be logged successfully. If the console is impersonating + // someone by matching their name and job, the reply will reach the + // impersonated PDA. + string_targets += "[M.customsender] ([M.customjob])" + if (!string_targets.len) + return - var/datum/data_pda_msg/last_sucessful_msg - for(var/obj/item/device/pda/P in targets) - if(P == src) - continue - var/obj/machinery/message_server/MS = null - MS = can_send(P) - if(MS) - var/datum/data_pda_msg/msg = MS.send_pda_message("[P.owner]","[owner]","[message]",photo) - if(msg) - last_sucessful_msg = msg - if(!multiple) - show_to_sender(msg) - P.show_recieved_message(msg,src) - if(!multiple) - show_to_ghosts(user,msg) - log_talk(user,"[key_name(user)] (PDA: [initial(name)]) sent \"[message]\" to [P.name]",LOGPDA) - else - if(!multiple) - to_chat(user, "ERROR: Server isn't responding.") - return + var/datum/signal/subspace/pda/signal = new(src, list( + "name" = "[owner]", + "job" = "[ownjob]", + "message" = message, + "targets" = string_targets + )) + if (photo) + signal.data["photo"] = photo + signal.send_to_receivers() + + // If it didn't reach, note that fact + if (!signal.data["done"]) + to_chat(user, "ERROR: Server isn't responding.") + return + + var/target_text = signal.format_target() + // Log it in our logs + tnote += "→ To [target_text]:
    [signal.format_message()]
    " + // Show it to ghosts + var/ghost_message = "[owner] PDA Message --> [target_text]: [signal.format_message()]" + for(var/mob/M in GLOB.player_list) + if(isobserver(M) && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTPDA)) + to_chat(M, "[FOLLOW_LINK(M, user)] [ghost_message]") + // Log in the talk log + log_talk(user, "[key_name(user)] (PDA: [initial(name)]) sent \"[message]\" to [target_text]", LOGPDA) + // Reset the photo photo = null - if(multiple) - show_to_sender(last_sucessful_msg,1) - show_to_ghosts(user,last_sucessful_msg,1) - log_talk(user,"[user] (PDA: [initial(name)]) sent \"[message]\" to Everyone",LOGPDA) - -/obj/item/device/pda/proc/show_to_sender(datum/data_pda_msg/msg,multiple = 0) - tnote += "→ To [multiple ? "Everyone" : msg.recipient]:
    [msg.message][msg.get_photo_ref()]
    " - -/obj/item/device/pda/proc/show_recieved_message(datum/data_pda_msg/msg,obj/item/device/pda/source) - tnote += "← From [source.owner] ([source.ownjob]):
    [msg.message][msg.get_photo_ref()]
    " +/obj/item/device/pda/proc/receive_message(datum/signal/subspace/pda/signal) + tnote += "← From [signal.data["name"]] ([signal.data["job"]]):
    [signal.format_message()]
    " if (!silent) playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) @@ -650,59 +657,21 @@ GLOBAL_LIST_EMPTY(PDAs) L = get(src, /mob/living/silicon) if(L && L.stat != UNCONSCIOUS) - var/hrefstart var/hrefend if (isAI(L)) - hrefstart = "" + hrefstart = "" hrefend = "" - to_chat(L, "[icon2html(src)] Message from [hrefstart][source.owner] ([source.ownjob])[hrefend], \"[msg.message]\"[msg.get_photo_ref()] (Reply)") + to_chat(L, "[icon2html(src)] Message from [hrefstart][signal.data["name"]] ([signal.data["job"]])[hrefend], [signal.format_message()] (Reply)") update_icon() add_overlay(icon_alert) -/obj/item/device/pda/proc/show_to_ghosts(mob/living/user, datum/data_pda_msg/msg,multiple = 0) - for(var/mob/M in GLOB.player_list) - if(isobserver(M) && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTPDA)) - var/link = FOLLOW_LINK(M, user) - to_chat(M, "[link] [msg.sender] PDA Message --> [multiple ? "Everyone" : msg.recipient]: [msg.message][msg.get_photo_ref()]    ") - -/obj/item/device/pda/proc/can_send(obj/item/device/pda/P) - if(!P || QDELETED(P) || P.toff) - return null - - var/obj/machinery/message_server/useMS = null - if(GLOB.message_servers) - for (var/obj/machinery/message_server/MS in GLOB.message_servers) - //PDAs are now dependant on the Message Server. - if(MS.active) - useMS = MS - break - - var/datum/signal/signal = src.telecomms_process() - - if(!P || QDELETED(P) || P.toff) //in case the PDA or mob gets destroyed during telecomms_process() - return null - - var/useTC = 0 - if(signal) - if(signal.data["done"]) - useTC = 1 - var/turf/pos = get_turf(P) - if(pos.z in signal.data["level"]) - useTC = 2 - - if(useTC == 2) - return useMS - else - return null - - -/obj/item/device/pda/proc/send_to_all(mob/living/U = usr) +/obj/item/device/pda/proc/send_to_all(mob/living/U) send_message(U,get_viewable_pdas()) -/obj/item/device/pda/proc/create_message(mob/living/U = usr, obj/item/device/pda/P) +/obj/item/device/pda/proc/create_message(mob/living/U, obj/item/device/pda/P) send_message(U,list(P)) /obj/item/device/pda/AltClick() diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index b1a4a9f6f8..e972f1822b 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -6,7 +6,7 @@ icon_state = "pda-clown" desc = "A portable microcomputer by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings." ttone = "honk" - var/slipvictims = list() + var/slipvictims = list() //CIT CHANGE - makes clown PDAs track unique people slipped /obj/item/device/pda/clown/Initialize() . = ..() @@ -14,7 +14,7 @@ /obj/item/device/pda/clown/proc/AfterSlip(mob/living/carbon/human/M) if (istype(M) && (M.real_name != owner)) - slipvictims |=M + slipvictims |= M //CIT CHANGE - makes clown PDAs track unique people slipped var/obj/item/cartridge/virus/clown/cart = cartridge if(istype(cart) && cart.charges < 5) cart.charges++ diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 57c252258d..318aaa9e24 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -25,13 +25,13 @@ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' w_class = WEIGHT_CLASS_TINY - var/obj/item/radio/integrated/radio = null + var/obj/item/integrated_signaler/radio = null - var/access = 0 //Bit flags_1 for cartridge access + var/access = 0 //Bit flags for cartridge access var/remote_door_id = "" - var/bot_access_flags = 0 //Bit flags_1. Selection: SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT + var/bot_access_flags = 0 //Bit flags. Selection: SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT var/spam_enabled = 0 //Enables "Send to All" Option var/obj/item/device/pda/host_pda = null @@ -127,7 +127,7 @@ /obj/item/cartridge/signal/Initialize() . = ..() - radio = new /obj/item/radio/integrated/signal(src) + radio = new(src) @@ -176,7 +176,7 @@ /obj/item/cartridge/rd/Initialize() . = ..() - radio = new /obj/item/radio/integrated/signal(src) + radio = new(src) /obj/item/cartridge/captain name = "\improper Value-PAK cartridge" @@ -188,20 +188,16 @@ /obj/item/cartridge/captain/New() ..() - radio = new /obj/item/radio/integrated/signal(src) + radio = new(src) /obj/item/cartridge/proc/post_status(command, data1, data2) - var/datum/radio_frequency/frequency = SSradio.return_frequency(1435) + var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS) if(!frequency) return - var/datum/signal/status_signal = new - status_signal.source = src - status_signal.transmission_method = 1 - status_signal.data["command"] = command - + var/datum/signal/status_signal = new(list("command" = command)) switch(command) if("message") status_signal.data["msg1"] = data1 @@ -217,7 +213,6 @@ return switch(host_pda.mode) if(40) //signaller - var/obj/item/radio/integrated/signal/S = radio menu = "

    Remote Signaling System

    " menu += {" @@ -225,14 +220,14 @@ Frequency: - - -[format_frequency(S.frequency)] +[format_frequency(radio.frequency)] + +

    Code: - - -[S.code] +[radio.code] + +
    "} if (41) //crew manifest @@ -571,22 +566,17 @@ Code: active1 = null if("Send Signal") - spawn( 0 ) - var/obj/item/radio/integrated/signal/S = radio - S.send_signal("ACTIVATE") - return + INVOKE_ASYNC(radio, /obj/item/integrated_signaler.proc/send_activation) if("Signal Frequency") - var/obj/item/radio/integrated/signal/S = radio - var/new_frequency = sanitize_frequency(S.frequency + text2num(href_list["sfreq"])) - S.set_frequency(new_frequency) + var/new_frequency = sanitize_frequency(radio.frequency + text2num(href_list["sfreq"])) + radio.set_frequency(new_frequency) if("Signal Code") - var/obj/item/radio/integrated/signal/S = radio - S.code += text2num(href_list["scode"]) - S.code = round(S.code) - S.code = min(100, S.code) - S.code = max(1, S.code) + radio.code += text2num(href_list["scode"]) + radio.code = round(radio.code) + radio.code = min(100, radio.code) + radio.code = max(1, radio.code) if("Status") switch(href_list["statdisp"]) diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index 2c4fc8fa48..7e1a1be7e3 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -1,48 +1,31 @@ -/obj/item/radio/integrated +// Radio Cartridge, essentially a remote signaler with limited spectrum. +/obj/item/integrated_signaler name = "\improper PDA radio module" - desc = "An electronic radio system of nanotrasen origin." + desc = "An electronic radio system of Nanotrasen origin." icon = 'icons/obj/module.dmi' icon_state = "power_mod" - var/on = FALSE //Are we currently active?? - var/menu_message = "" - -/obj/item/radio/integrated/Initialize() - . = ..() - -/obj/item/radio/integrated/Destroy() - return ..() - -/* - * Radio Cartridge, essentially a signaler. - */ - - -/obj/item/radio/integrated/signal - var/frequency = 1457 - var/code = 30 +/obj/item/integrated_signaler + var/frequency = FREQ_SIGNALER + var/code = DEFAULT_SIGNALER_CODE var/last_transmission var/datum/radio_frequency/radio_connection -/obj/item/radio/integrated/signal/Destroy() - SSradio.remove_object(src, frequency) +/obj/item/integrated_signaler/Destroy() radio_connection = null return ..() -/obj/item/radio/integrated/signal/Initialize() +/obj/item/integrated_signaler/Initialize() . = ..() - if (src.frequency < 1200 || src.frequency > 1600) - src.frequency = sanitize_frequency(src.frequency) - + if (frequency < MIN_FREE_FREQ || frequency > MAX_FREE_FREQ) + frequency = sanitize_frequency(frequency) set_frequency(frequency) -/obj/item/radio/integrated/signal/proc/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) +/obj/item/integrated_signaler/proc/set_frequency(new_frequency) frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency) - -/obj/item/radio/integrated/signal/proc/send_signal(message="ACTIVATE") + radio_connection = SSradio.return_frequency(frequency) +/obj/item/integrated_signaler/proc/send_activation() if(last_transmission && world.time < (last_transmission + 5)) return last_transmission = world.time @@ -51,11 +34,5 @@ var/turf/T = get_turf(src) GLOB.lastsignalers.Add("[time] : [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) : [format_frequency(frequency)]/[code]") - var/datum/signal/signal = new - signal.source = src - signal.encryption = code - signal.data["message"] = message - - radio_connection.post_signal(src, signal) - - return + var/datum/signal/signal = new(list("code" = code)) + radio_connection.post_signal(src, signal, filter = RADIO_SIGNALER) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 1b9978f472..87163dea1e 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -1,3 +1,4 @@ + #define BUGMODE_LIST 0 #define BUGMODE_MONITOR 1 #define BUGMODE_TRACK 2 diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 8f3eeeec71..a2b1ce2056 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -158,4 +158,4 @@ desc = "An omni-technological interface." icon = 'icons/obj/abductor.dmi' icon_state = "multitool" - toolspeed = 0.1 + toolspeed = 0.1 \ No newline at end of file diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm index 183e960a08..d1ecf9ee28 100644 --- a/code/game/objects/items/devices/pressureplates.dm +++ b/code/game/objects/items/devices/pressureplates.dm @@ -11,7 +11,7 @@ var/sound/trigger_sound = 'sound/effects/pressureplate.ogg' var/obj/item/device/assembly/signaler/sigdev = null var/roundstart_signaller = FALSE - var/roundstart_signaller_freq = 1447 + var/roundstart_signaller_freq = FREQ_PRESSURE_PLATE var/roundstart_signaller_code = 30 var/roundstart_hide = FALSE var/removable_signaller = TRUE diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 69b603d213..e7d3d9d9e6 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -19,10 +19,6 @@ /obj/item/device/radio/beacon/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode) return -/obj/item/device/radio/beacon/send_hear() - return null - - /obj/item/device/radio/beacon/verb/alter_signal(t as text) set name = "Alter Beacon's Signal" set category = "Object" diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 19226e5d9a..307b493281 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -12,7 +12,7 @@ materials = list(MAT_METAL=10000, MAT_GLASS=2500) var/on = TRUE var/code = 2 - var/frequency = 1449 + var/frequency = FREQ_ELECTROPACK var/shock_cooldown = 0 /obj/item/device/electropack/suicide_act(mob/user) @@ -21,7 +21,7 @@ /obj/item/device/electropack/Initialize() . = ..() - SSradio.add_object(src, frequency, GLOB.RADIO_CHAT) + SSradio.add_object(src, frequency, RADIO_SIGNALER) /obj/item/device/electropack/Destroy() SSradio.remove_object(src, frequency) @@ -67,7 +67,7 @@ if(href_list["freq"]) SSradio.remove_object(src, frequency) frequency = sanitize_frequency(frequency + text2num(href_list["freq"])) - SSradio.add_object(src, frequency, GLOB.RADIO_CHAT) + SSradio.add_object(src, frequency, RADIO_SIGNALER) else if(href_list["code"]) code += text2num(href_list["code"]) @@ -98,7 +98,7 @@ return /obj/item/device/electropack/receive_signal(datum/signal/signal) - if(!signal || signal.encryption != code) + if(!signal || signal.data["code"] != code) return if(isliving(loc) && on) @@ -144,80 +144,3 @@ Code: user << browse(dat, "window=radio") onclose(user, "radio") return - -/obj/item/device/electropack/shockcollar - name = "shock collar" - desc = "A reinforced metal collar. It seems to have some form of wiring near the front. Strange.." - icon = 'icons/obj/clothing/neck.dmi' - icon_state = "shockcollar" - item_state = "shockcollar" - body_parts_covered = NECK - slot_flags = SLOT_NECK - w_class = WEIGHT_CLASS_SMALL - strip_delay = 60 - equip_delay_other = 60 - materials = list(MAT_METAL=5000, MAT_GLASS=2000) - var/tagname = null - -/obj/item/device/electropack/shockcollar/attack_hand(mob/user) - if(loc == user) - if(slot_flags == SLOT_NECK) - if(user.get_item_by_slot(slot_neck)) - to_chat(user, "The collar is fastened tight! You'll need help taking this off!") - return - ..() - -/obj/item/device/electropack/shockcollar/receive_signal(datum/signal/signal) - if(!signal || signal.encryption != code) - return - - if(isliving(loc) && on) - if(shock_cooldown != 0) - return - shock_cooldown = 1 - spawn(100) - shock_cooldown = 0 - var/mob/living/L = loc - step(L, pick(GLOB.cardinals)) - - to_chat(L, "You feel a sharp shock from the collar!") - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(3, 1, L) - s.start() - - L.Knockdown(100) - - if(master) - master.receive_signal() - return - -/obj/item/device/electropack/shockcollar/attack_self(mob/user) //Turns out can't fully source this from the parent item, spritepath gets confused if power toggled. Will come back to this when I know how to code better and readd powertoggle.. - var/option = "Change Name" - option = input(user, "What do you want to do?", "[src]", option) as null|anything in list("Change Name", "Change Frequency") - switch(option) - if("Change Name") - var/t = input(user, "Would you like to change the name on the tag?", "Name your new pet", tagname ? tagname : "Spot") as null|text - if(t) - tagname = copytext(sanitize(t), 1, MAX_NAME_LEN) - name = "[initial(name)] - [tagname]" - if("Change Frequency") - if(!ishuman(user)) - return - user.set_machine(src) - var/dat = {"
    - Frequency/Code for shock collar:
    - Frequency: - - - - [format_frequency(frequency)] - + - +
    - Code: - - - - [code] - + - +
    -     "} - - user << browse(dat, "window=radio") - onclose(user, "radio") - return diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 028c6ba27f..2d3d869676 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/radio.dmi' icon_state = "cypherkey" w_class = WEIGHT_CLASS_TINY - var/translate_binary = 0 - var/syndie = 0 + var/translate_binary = FALSE + var/syndie = FALSE var/independent = FALSE var/list/channels = list() @@ -20,7 +20,7 @@ name = "binary translator key" desc = "An encryption key for a radio headset. To access the binary channel, use :b." icon_state = "bin_cypherkey" - translate_binary = 1 + translate_binary = TRUE /obj/item/device/encryptionkey/headset_sec name = "security radio encryption key" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 750e1f0511..13846a84fd 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -4,7 +4,7 @@ icon_state = "headset" item_state = "headset" materials = list(MAT_METAL=75) - subspace_transmission = 1 + subspace_transmission = TRUE canhear_range = 0 // can't hear headsets from very far away slot_flags = SLOT_EARS @@ -22,10 +22,7 @@ recalculateChannels() /obj/item/device/radio/headset/Destroy() - qdel(keyslot) - qdel(keyslot2) - keyslot = null - keyslot2 = null + QDEL_NULL(keyslot2) return ..() /obj/item/device/radio/headset/talk_into(mob/living/M, message, channel, list/spans,datum/language/language) @@ -33,14 +30,14 @@ return ITALICS | REDUCE_RANGE return ..() -/obj/item/device/radio/headset/receive_range(freq, level, AIuser) +/obj/item/device/radio/headset/can_receive(freq, level, AIuser) if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc if(H.ears == src) return ..(freq, level) else if(AIuser) return ..(freq, level) - return -1 + return FALSE /obj/item/device/radio/headset/syndicate //disguised to look like a normal headset for stealth ops @@ -209,32 +206,24 @@ keyslot2 = new /obj/item/device/encryptionkey/ai command = TRUE -/obj/item/device/radio/headset/ai/receive_range(freq, level) - return ..(freq, level, 1) +/obj/item/device/radio/headset/ai/can_receive(freq, level) + return ..(freq, level, TRUE) /obj/item/device/radio/headset/attackby(obj/item/W, mob/user, params) user.set_machine(src) if(istype(W, /obj/item/screwdriver)) if(keyslot || keyslot2) - - for(var/ch_name in channels) SSradio.remove_object(src, GLOB.radiochannels[ch_name]) secure_radio_connections[ch_name] = null - - if(keyslot) - var/turf/T = get_turf(user) - if(T) + var/turf/T = user.drop_location() + if(T) + if(keyslot) keyslot.forceMove(T) keyslot = null - - - - if(keyslot2) - var/turf/T = get_turf(user) - if(T) + if(keyslot2) keyslot2.forceMove(T) keyslot2 = null @@ -244,7 +233,7 @@ else to_chat(user, "This headset doesn't have any unique encryption keys! How useless...") - else if(istype(W, /obj/item/device/encryptionkey/)) + else if(istype(W, /obj/item/device/encryptionkey)) if(keyslot && keyslot2) to_chat(user, "The headset can't hold another key!") return @@ -269,26 +258,19 @@ ..() if(keyslot2) for(var/ch_name in keyslot2.channels) - if(ch_name in src.channels) - continue - src.channels += ch_name - src.channels[ch_name] = keyslot2.channels[ch_name] + if(!(ch_name in src.channels)) + channels[ch_name] = keyslot2.channels[ch_name] if(keyslot2.translate_binary) - src.translate_binary = 1 - + translate_binary = TRUE if(keyslot2.syndie) - src.syndie = 1 - + syndie = TRUE if (keyslot2.independent) independent = TRUE - for(var/ch_name in channels) secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name]) - return - /obj/item/device/radio/headset/AltClick(mob/living/user) if(!istype(user) || !Adjacent(user) || user.incapacitated()) return diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 9cd0ca5d29..77d1795b6b 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -101,25 +101,27 @@ ..() ui_interact(user, state = GLOB.default_state) -/obj/item/device/radio/intercom/receive_range(freq, level) +/obj/item/device/radio/intercom/can_receive(freq, level) if(!on) - return -1 + return FALSE if(wires.is_cut(WIRE_RX)) - return -1 + return FALSE if(!(0 in level)) var/turf/position = get_turf(src) if(isnull(position) || !(position.z in level)) - return -1 + return FALSE if(!src.listening) - return -1 - if(freq == GLOB.SYND_FREQ) + return FALSE + if(freq == FREQ_SYNDICATE) if(!(src.syndie)) - return -1//Prevents broadcast of messages over devices lacking the encryption + return FALSE//Prevents broadcast of messages over devices lacking the encryption - return canhear_range + return TRUE /obj/item/device/radio/intercom/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode) + if (message_mode == MODE_INTERCOM) + return // Avoid hearing the same thing twice if(!anyai && !(speaker in ai)) return ..() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 8227d75069..98af604812 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -1,32 +1,11 @@ /obj/item/device/radio icon = 'icons/obj/radio.dmi' name = "station bounced radio" - suffix = "\[3\]" icon_state = "walkietalkie" item_state = "walkietalkie" desc = "A basic handheld radio that communicates with local telecommunication networks." dog_fashion = /datum/dog_fashion/back - var/on = TRUE // 0 for off - var/last_transmission - var/frequency = 1459 //common chat - var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies - var/canhear_range = 3 // the range which mobs can hear this radio from - var/list/secure_radio_connections - var/prison_radio = 0 - var/b_stat = 0 - var/broadcasting = 0 - var/listening = 1 - var/translate_binary = 0 - var/freerange = 0 // 0 - Sanitize frequencies, 1 - Full range - var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h - var/obj/item/device/encryptionkey/keyslot //To allow the radio to accept encryption keys. - var/subspace_switchable = 0 - var/subspace_transmission = 0 - var/syndie = 0//Holder to see if it's a syndicate encrpyed radio - var/independent = FALSE // If true, bypasses any tcomms machinery. - var/freqlock = 0 //Frequency lock to stop the user from untuning specialist radios. - var/emped = 0 //Highjacked to track the number of consecutive EMPs on the radio, allowing consecutive EMP's to stack properly. -// "Example" = FREQ_LISTENING|FREQ_BROADCASTING + flags_1 = CONDUCT_1 | HEAR_1 flags_2 = NO_EMP_WIRES_2 slot_flags = SLOT_BELT @@ -35,12 +14,33 @@ w_class = WEIGHT_CLASS_SMALL materials = list(MAT_METAL=75, MAT_GLASS=25) - var/const/TRANSMISSION_DELAY = 5 // only 2/second/radio - var/const/FREQ_LISTENING = 1 - //FREQ_BROADCASTING = 2 + var/on = TRUE + var/frequency = FREQ_COMMON + var/traitor_frequency = 0 // If tuned to this frequency, uplink will be unlocked. + var/canhear_range = 3 // The range around the radio in which mobs can hear what it receives. + var/emped = 0 // Tracks the number of EMPs currently stacked. - var/command = FALSE //If we are speaking into a command headset, our text can be BOLD - var/use_command = FALSE + var/broadcasting = FALSE // Whether the radio will transmit dialogue it hears nearby. + var/listening = TRUE // Whether the radio is currently receiving. + var/prison_radio = FALSE // If true, the transmit wire starts cut. + var/unscrewed = FALSE // Whether wires are accessible. Toggleable by screwdrivering. + var/freerange = FALSE // If true, the radio has access to the full spectrum. + var/subspace_transmission = FALSE // If true, the radio transmits and receives on subspace exclusively. + var/subspace_switchable = FALSE // If true, subspace_transmission can be toggled at will. + var/freqlock = FALSE // Frequency lock to stop the user from untuning specialist radios. + var/use_command = FALSE // If true, broadcasts will be large and BOLD. + var/command = FALSE // If true, use_command can be toggled at will. + + // Encryption key handling + var/obj/item/device/encryptionkey/keyslot + var/translate_binary = FALSE // If true, can hear the special binary channel. + var/independent = FALSE // If true, can say/hear on the special CentCom channel. + var/syndie = FALSE // If true, hears all well-known channels automatically, and can say/hear on the Syndicate channel. + var/list/channels = list() // Map from name (see communications.dm) to on/off. First entry is current department (:h). + var/list/secure_radio_connections + + var/const/FREQ_LISTENING = 1 + //FREQ_BROADCASTING = 2 /obj/item/device/radio/proc/set_frequency(new_frequency) remove_radio(src, frequency) @@ -48,23 +48,19 @@ /obj/item/device/radio/proc/recalculateChannels() channels = list() - translate_binary = 0 - syndie = 0 + translate_binary = FALSE + syndie = FALSE independent = FALSE if(keyslot) for(var/ch_name in keyslot.channels) - if(ch_name in src.channels) - continue - channels += ch_name - channels[ch_name] = keyslot.channels[ch_name] + if(!(ch_name in channels)) + channels[ch_name] = keyslot.channels[ch_name] if(keyslot.translate_binary) - translate_binary = 1 - + translate_binary = TRUE if(keyslot.syndie) - syndie = 1 - + syndie = TRUE if(keyslot.independent) independent = TRUE @@ -78,10 +74,9 @@ recalculateChannels() /obj/item/device/radio/Destroy() - qdel(wires) - wires = null remove_radio_all(src) //Just to be sure - keyslot = null + QDEL_NULL(wires) + QDEL_NULL(keyslot) return ..() /obj/item/device/radio/Initialize() @@ -99,7 +94,7 @@ /obj/item/device/radio/interact(mob/user) if (..()) return - if(b_stat && !isAI(user)) + if(unscrewed && !isAI(user)) wires.interact(user) else ui_interact(user) @@ -192,41 +187,33 @@ spans = M.get_spans() if(!language) language = M.get_default_language() - INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans, language) + INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans.Copy(), language) return ITALICS | REDUCE_RANGE /obj/item/device/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans, datum/language/language) if(!on) return // the device has to be on - // Fix for permacell radios, but kinda eh about actually fixing them. if(!M || !message) return - - if(wires.is_cut(WIRE_TX)) + if(wires.is_cut(WIRE_TX)) // Permacell and otherwise tampered-with radios return - if(!M.IsVocal()) return if(use_command) spans |= SPAN_COMMAND - /* Quick introduction: - This new radio system uses a very robust FTL signaling technology unoriginally - dubbed "subspace" which is somewhat similar to 'blue-space' but can't - actually transmit large mass. Headsets are the only radio devices capable - of sending subspace transmissions to the Communications Satellite. - - A headset sends a signal to a subspace listener/reciever elsewhere in space, - the signal gets processed and logged, and an audible transmission gets sent - to each individual headset. - */ - /* - be prepared to disregard any comments in all of tcomms code. i tried my best to keep them somewhat up-to-date, but eh + Roughly speaking, radios attempt to make a subspace transmittion (which + is received, processed, and rebroadcast by the telecomms satellite) and + if that fails, they send a mundane radio transmission. + + Headsets cannot send/receive mundane transmissions, only subspace. + Syndicate radios can hear transmissions on all well-known frequencies. + CentCom radios can hear the CentCom frequency no matter what. */ - //get the frequency you buttface. radios no longer use the SSradio. confusing for future generations, convenient for me. + // From the channel, determine the frequency and get a reference to it. var/freq if(channel && channels && channels.len > 0) if(channel == "department") @@ -238,271 +225,95 @@ freq = frequency channel = null - var/freqnum = text2num(freq) //Why should we call text2num three times when we can just do it here? + // Nearby active jammers severely gibberish the message var/turf/position = get_turf(src) - - var/jammed = FALSE for(var/obj/item/device/jammer/jammer in GLOB.active_jammers) if(get_dist(position,get_turf(jammer)) < jammer.range) - jammed = TRUE + message = Gibberish(message,100) break - //#### Tagging the signal with all appropriate identity values ####// + // Determine the identity information which will be attached to the signal. + var/atom/movable/virtualspeaker/speaker = new(null, M, src) - // ||-- The mob's name identity --|| - var/real_name = M.name // mob's real name - var/mobkey = "none" // player key associated with mob - var/voicemask = 0 // the speaker is wearing a voice mask - var/voice = M.GetVoice() // Why reinvent the wheel when there is a proc that does nice things already - if(ismob(M)) - var/mob/speaker = M - real_name = speaker.real_name - if(speaker.client) - mobkey = speaker.key // assign the mob's key + // Construct the signal + var/datum/signal/subspace/vocal/signal = new(src, freq, speaker, language, message, spans) - - var/jobname // the mob's "job" - - if(jammed) - message = Gibberish(message,100) - - // --- Human: use their job as seen on the crew manifest - makes it unneeded to carry an ID for an AI to see their job - if(ishuman(M)) - var/datum/data/record/findjob = find_record("name", voice, GLOB.data_core.general) - - if(voice != real_name) - voicemask = 1 - if(findjob) - jobname = findjob.fields["rank"] - else - jobname = "Unknown" - - // --- Carbon Nonhuman --- - else if(iscarbon(M)) // Nonhuman carbon mob - jobname = "No id" - - // --- AI --- - else if(isAI(M)) - jobname = "AI" - - // --- Cyborg --- - else if(iscyborg(M)) - var/mob/living/silicon/robot/B = M - jobname = "[B.designation] Cyborg" - - // --- Personal AI (pAI) --- - else if(istype(M, /mob/living/silicon/pai)) - jobname = "Personal AI" - - // --- Cold, emotionless machines. --- - else if(isobj(M)) - jobname = "Machine" - - // --- Unidentifiable mob --- - else - jobname = "Unknown" - - /* ###### `independent` radios bypass all comms relays. ###### */ - - if(independent) - var/datum/signal/signal = new - signal.transmission_method = 2 - signal.data = list( - "mob" = M, // store a reference to the mob - "mobtype" = M.type, // the mob's type - "realname" = real_name, // the mob's real name - "name" = voice, // the mob's voice name - "job" = jobname, // the mob's job - "key" = mobkey, // the mob's key - "vmask" = voicemask, // 1 if the mob is using a voice gas mas - - "compression" = 0, // uncompressed radio signal - "message" = message, // the actual sent message - "radio" = src, // stores the radio used for transmission - "slow" = 0, - "traffic" = 0, - "type" = 0, - "server" = null, - "reject" = 0, - "level" = 0, - "language" = language, - "spans" = spans, - "verb_say" = M.verb_say, - "verb_ask" = M.verb_ask, - "verb_exclaim" = M.verb_exclaim, - "verb_yell" = M.verb_yell, - ) - signal.frequency = freqnum // Quick frequency set - Broadcast_Message(M, voicemask, - src, message, voice, jobname, real_name, - 5, signal.data["compression"], list(position.z, 0), freq, spans, - verb_say, verb_ask, verb_exclaim, verb_yell, language) + // Independent radios, on the CentCom frequency, reach all independent radios + if (independent && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE)) + signal.data["compression"] = 0 + signal.transmission_method = TRANSMISSION_SUPERSPACE + signal.levels = list(0) // reaches all Z-levels + signal.broadcast() return - /* ###### Radio headsets can only broadcast through subspace ###### */ + // All radios make an attempt to use the subspace system first + signal.send_to_receivers() - if(subspace_transmission) - // First, we want to generate a new radio signal - var/datum/signal/signal = new - signal.transmission_method = 2 // 2 would be a subspace transmission. - // transmission_method could probably be enumerated through #define. Would be neater. - // --- Finally, tag the actual signal with the appropriate values --- - signal.data = list( - // Identity-associated tags: - "mob" = M, // store a reference to the mob - "mobtype" = M.type, // the mob's type - "realname" = real_name, // the mob's real name - "name" = voice, // the mob's voice name - "job" = jobname, // the mob's job - "key" = mobkey, // the mob's key - "vmask" = voicemask, // 1 if the mob is using a voice gas mask - - // We store things that would otherwise be kept in the actual mob - // so that they can be logged even AFTER the mob is deleted or something - - // Other tags: - "compression" = rand(35,65), // compressed radio signal - "message" = message, // the actual sent message - "radio" = src, // stores the radio used for transmission - "slow" = 0, // how much to sleep() before broadcasting - simulates net lag - "traffic" = 0, // dictates the total traffic sum that the signal went through - "type" = 0, // determines what type of radio input it is: normal broadcast - "server" = null, // the last server to log this signal - "reject" = 0, // if nonzero, the signal will not be accepted by any broadcasting machinery - "level" = position.z, // The source's z level - "language" = language, - "spans" = spans, //the span classes of this message. - "verb_say" = M.verb_say, //the verb used when talking normally - "verb_ask" = M.verb_ask, //the verb used when asking - "verb_exclaim" = M.verb_exclaim, //the verb used when exclaiming - "verb_yell" = M.verb_yell //the verb used when yelling - ) - signal.frequency = freq - - //#### Sending the signal to all subspace receivers ####// - - for(var/obj/machinery/telecomms/receiver/R in GLOB.telecomms_list) - R.receive_signal(signal) - - // Allinone can act as receivers. - for(var/obj/machinery/telecomms/allinone/R in GLOB.telecomms_list) - R.receive_signal(signal) - - // Receiving code can be located in Telecommunications.dm + // If the radio is subspace-only, that's all it can do + if (subspace_transmission) return + // Non-subspace radios will check in a couple of seconds, and if the signal + // was never received, send a mundane broadcast (no headsets). + addtimer(CALLBACK(src, .proc/backup_transmission, signal), 20) - /* ###### Intercoms and station-bounced radios ###### */ +/obj/item/device/radio/proc/backup_transmission(datum/signal/subspace/vocal/signal) + var/turf/T = get_turf(src) + if (signal.data["done"] && (T.z in signal.levels)) + return - var/filter_type = 2 - - var/datum/signal/signal = new - signal.transmission_method = 2 - - - /* --- Try to send a normal subspace broadcast first */ - - signal.data = list( - "mob" = M, // store a reference to the mob - "mobtype" = M.type, // the mob's type - "realname" = real_name, // the mob's real name - "name" = voice, // the mob's voice name - "job" = jobname, // the mob's job - "key" = mobkey, // the mob's key - "vmask" = voicemask, // 1 if the mob is using a voice gas mas - - "compression" = 0, // uncompressed radio signal - "message" = message, // the actual sent message - "radio" = src, // stores the radio used for transmission - "slow" = 0, - "traffic" = 0, - "type" = 0, - "server" = null, - "reject" = 0, - "level" = position.z, - "language" = language, - "spans" = spans, - "verb_say" = M.verb_say, - "verb_ask" = M.verb_ask, - "verb_exclaim" = M.verb_exclaim, - "verb_yell" = M.verb_yell - ) - signal.frequency = freqnum // Quick frequency set - for(var/obj/machinery/telecomms/receiver/R in GLOB.telecomms_list) - R.receive_signal(signal) - - // Allinone can act as receivers. (Unless of course whoever coded this last time forgot to put it in somewhere!) - for(var/obj/machinery/telecomms/allinone/R in GLOB.telecomms_list) - R.receive_signal(signal) - - spawn(20) // wait a little... - - if(signal.data["done"] && position.z in signal.data["level"]) - // we're done here. - return - - // Oh my god; the comms are down or something because the signal hasn't been broadcasted yet in our level. - // Send a mundane broadcast with limited targets: - Broadcast_Message(M, voicemask, - src, message, voice, jobname, real_name, - filter_type, signal.data["compression"], list(position.z), freq, spans, - verb_say, verb_ask, verb_exclaim, verb_yell, language) + // Okay, the signal was never processed, send a mundane broadcast. + signal.data["compression"] = 0 + signal.transmission_method = TRANSMISSION_RADIO + signal.levels = list(T.z) + signal.broadcast() /obj/item/device/radio/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) - if(radio_freq) + if(radio_freq || !broadcasting || get_dist(src, speaker) > canhear_range) return - if(broadcasting) - if(get_dist(src, speaker) <= canhear_range) - if(message_mode == MODE_WHISPER || message_mode == MODE_WHISPER_CRIT) - raw_message = stars(raw_message) - talk_into(speaker, raw_message, , spans, language=message_language) -/obj/item/device/radio/proc/receive_range(freq, level) - // check if this radio can receive on the given frequency, and if so, - // what the range is in which mobs will hear the radio - // returns: -1 if can't receive, range otherwise + if(message_mode == MODE_WHISPER || message_mode == MODE_WHISPER_CRIT) + // radios don't pick up whispers very well + raw_message = stars(raw_message) + else if(message_mode == MODE_L_HAND || message_mode == MODE_R_HAND) + // try to avoid being heard double + if (loc == speaker && ismob(speaker)) + var/mob/M = speaker + var/idx = M.get_held_index_of_item(src) + // left hands are odd slots + if (idx && (idx % 2) == (message_mode == MODE_L_HAND)) + return - if (wires.is_cut(WIRE_RX)) - return -1 - if(!listening) - return -1 - if(!(0 in level)) + talk_into(speaker, raw_message, , spans, language=message_language) + +// Checks if this radio can receive on the given frequency. +/obj/item/device/radio/proc/can_receive(freq, level) + // deny checks + if (!on || !listening || wires.is_cut(WIRE_RX)) + return FALSE + if (freq == FREQ_SYNDICATE && !syndie) + return FALSE + if (freq == FREQ_CENTCOM) + return independent // hard-ignores the z-level check + if (!(0 in level)) var/turf/position = get_turf(src) if(!position || !(position.z in level)) - return -1 - if(freq == GLOB.SYND_FREQ) - if(!(src.syndie)) //Checks to see if it's allowed on that frequency, based on the encryption keys - return -1 - if(freq == GLOB.CENTCOM_FREQ) - if(!independent) - return -1 - if (!on) - return -1 - if (!freq) //received on main frequency - if (!listening) - return -1 - else - var/accept = (freq==frequency && listening) - if (!accept) - for(var/ch_name in channels) - if(channels[ch_name] & FREQ_LISTENING) - if(GLOB.radiochannels[ch_name] == text2num(freq) || syndie) //the GLOB.radiochannels list is located in communications.dm - accept = 1 - break - if (!accept) - return -1 - return canhear_range + return FALSE -/obj/item/device/radio/proc/send_hear(freq, level) - - var/range = receive_range(freq, level) - if(range > -1) - return get_hearers_in_view(canhear_range, src) + // allow checks: are we listening on that frequency? + if (freq == frequency) + return TRUE + for(var/ch_name in channels) + if(channels[ch_name] & FREQ_LISTENING) + //the GLOB.radiochannels list is located in communications.dm + if(GLOB.radiochannels[ch_name] == text2num(freq) || syndie) + return TRUE + return FALSE /obj/item/device/radio/examine(mob/user) ..() - if (b_stat) + if (unscrewed) to_chat(user, "It can be attached and modified.") else to_chat(user, "It cannot be modified or attached.") @@ -510,8 +321,8 @@ /obj/item/device/radio/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if(istype(W, /obj/item/screwdriver)) - b_stat = !b_stat - if(b_stat) + unscrewed = !unscrewed + if(unscrewed) to_chat(user, "The radio can now be attached and modified!") else to_chat(user, "The radio can no longer be modified or attached!") @@ -523,8 +334,8 @@ var/curremp = emped //Remember which EMP this was if (listening && ismob(loc)) // if the radio is turned on and on someone's person they notice to_chat(loc, "\The [src] overloads.") - broadcasting = 0 - listening = 0 + broadcasting = FALSE + listening = FALSE for (var/ch_name in channels) channels[ch_name] = 0 on = FALSE @@ -542,7 +353,7 @@ /obj/item/device/radio/borg name = "cyborg radio" - subspace_switchable = 1 + subspace_switchable = TRUE dog_fashion = null flags_2 = NO_EMP_WIRES_2 @@ -555,7 +366,7 @@ /obj/item/device/radio/borg/syndicate/Initialize() . = ..() - set_frequency(GLOB.SYND_FREQ) + set_frequency(FREQ_SYNDICATE) /obj/item/device/radio/borg/attackby(obj/item/W, mob/user, params) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 33d1c5257a..48396c2ffd 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -126,11 +126,6 @@ GAS ANALYZER if(H.undergoing_liver_failure() && H.stat != DEAD) to_chat(user, "Subject suffering from liver failure: apply corazone and begin a liver transplant immediately!") - if(iscarbon(M)) - var/mob/living/carbon/C = M - if(C.has_brain_worms()) - to_chat(user, "Foreign organism detected in subject's cranium. Recommended treatment: Dosage of sucrose solution and removal of object via surgery.") - to_chat(user, "Analyzing results for [M]:\n\tOverall status: [mob_status]") // Damage descriptions @@ -399,6 +394,7 @@ GAS ANALYZER to_chat(user, "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] %") to_chat(user, "Temperature: [round(environment.temperature-T0C)] °C") + /obj/item/device/slime_scanner name = "slime scanner" desc = "A device that analyzes a slime's internal composition and measures its stats." diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 5f582b9e15..009bc211b4 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -1,4 +1,3 @@ - /obj/item/extinguisher name = "fire extinguisher" desc = "A traditional red fire extinguisher." diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index 8533d579c4..9b2cd0eb2b 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -13,10 +13,13 @@ for(var/mob/living/M in get_hearers_in_view(7, flashbang_turf)) bang(get_turf(M), M) + //START OF CIT CHANGES - makes flashbangs damage blobs for(var/obj/structure/blob/B in get_hear(8,flashbang_turf)) //Blob damage here var/distance = get_dist(B, get_turf(src)) var/damage = round(100/(distance*distance)+1) B.take_damage(damage, BURN, "energy") + //END OF CIT CHANGES + qdel(src) /obj/item/grenade/flashbang/proc/bang(turf/T , mob/living/M) diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm index fadf9d34de..5b96b74f41 100644 --- a/code/game/objects/items/grenades/ghettobomb.dm +++ b/code/game/objects/items/grenades/ghettobomb.dm @@ -1,60 +1,60 @@ -//improvised explosives// - -/obj/item/grenade/iedcasing - name = "improvised firebomb" - desc = "A weak, improvised incendiary device." - w_class = WEIGHT_CLASS_SMALL - icon = 'icons/obj/grenade.dmi' - icon_state = "improvised_grenade" - item_state = "flashbang" - lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' - throw_speed = 3 - throw_range = 7 - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - active = 0 - det_time = 50 - display_timer = 0 - var/range = 3 - var/list/times - -/obj/item/grenade/iedcasing/Initialize() - . = ..() - add_overlay("improvised_grenade_filled") - add_overlay("improvised_grenade_wired") - times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] - det_time = text2num(pickweight(times)) - if(det_time < 0) //checking for 'duds' - range = 1 - det_time = rand(30,80) - else - range = pick(2,2,2,3,3,3,4) - -/obj/item/grenade/iedcasing/CheckParts(list/parts_list) - ..() - var/obj/item/reagent_containers/food/drinks/soda_cans/can = locate() in contents - if(can) - can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED - can.pixel_y = 0 - var/mutable_appearance/can_underlay = new(can) - can_underlay.layer = FLOAT_LAYER - can_underlay.plane = FLOAT_PLANE - underlays += can_underlay - - -/obj/item/grenade/iedcasing/attack_self(mob/user) // - if(!active) - if(clown_check(user)) - to_chat(user, "You light the [name]!") - cut_overlay("improvised_grenade_filled") +//improvised explosives// + +/obj/item/grenade/iedcasing + name = "improvised firebomb" + desc = "A weak, improvised incendiary device." + w_class = WEIGHT_CLASS_SMALL + icon = 'icons/obj/grenade.dmi' + icon_state = "improvised_grenade" + item_state = "flashbang" + lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' + throw_speed = 3 + throw_range = 7 + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + active = 0 + det_time = 50 + display_timer = 0 + var/range = 3 + var/list/times + +/obj/item/grenade/iedcasing/Initialize() + . = ..() + add_overlay("improvised_grenade_filled") + add_overlay("improvised_grenade_wired") + times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] + det_time = text2num(pickweight(times)) + if(det_time < 0) //checking for 'duds' + range = 1 + det_time = rand(30,80) + else + range = pick(2,2,2,3,3,3,4) + +/obj/item/grenade/iedcasing/CheckParts(list/parts_list) + ..() + var/obj/item/reagent_containers/food/drinks/soda_cans/can = locate() in contents + if(can) + can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED + can.pixel_y = 0 + var/mutable_appearance/can_underlay = new(can) + can_underlay.layer = FLOAT_LAYER + can_underlay.plane = FLOAT_PLANE + underlays += can_underlay + + +/obj/item/grenade/iedcasing/attack_self(mob/user) // + if(!active) + if(clown_check(user)) + to_chat(user, "You light the [name]!") + cut_overlay("improvised_grenade_filled") preprime(user, null, FALSE) - -/obj/item/grenade/iedcasing/prime() //Blowing that can up - update_mob() - explosion(src.loc,-1,-1,2, flame_range = 4) // small explosion, plus a very large fireball. - qdel(src) - -/obj/item/grenade/iedcasing/examine(mob/user) - ..() - to_chat(user, "You can't tell when it will explode!") + +/obj/item/grenade/iedcasing/prime() //Blowing that can up + update_mob() + explosion(src.loc,-1,-1,2, flame_range = 4) // small explosion, plus a very large fireball. + qdel(src) + +/obj/item/grenade/iedcasing/examine(mob/user) + ..() + to_chat(user, "You can't tell when it will explode!") diff --git a/code/game/objects/items/grenades/syndieminibomb.dm b/code/game/objects/items/grenades/syndieminibomb.dm index e1866a3e69..723c578a68 100644 --- a/code/game/objects/items/grenades/syndieminibomb.dm +++ b/code/game/objects/items/grenades/syndieminibomb.dm @@ -48,4 +48,4 @@ for(var/mob/living/carbon/L in T) L.adjustStaminaLoss(stamina_damage) L.bodytemperature -= 230 - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index f1c41c8f7a..8c09e87b6a 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -1,6 +1,19 @@ /obj/item/restraints breakouttime = 600 +/obj/item/restraints/Destroy() + if(iscarbon(loc)) + var/mob/living/carbon/M = loc + if(M.handcuffed == src) + M.handcuffed = null + M.update_handcuffed() + if(M.buckled && M.buckled.buckle_requires_restraints) + M.buckled.unbuckle_mob(M) + if(M.legcuffed == src) + M.legcuffed = null + M.update_inv_legcuffed() + return ..() + //Handcuffs /obj/item/restraints/handcuffs @@ -167,11 +180,6 @@ desc = "Fake handcuffs meant for gag purposes." breakouttime = 10 //Deciseconds = 1s -/obj/item/restraints/handcuffs/fake/kinky - name = "kinky handcuffs" - desc = "Fake handcuffs meant for erotic roleplay." - icon_state = "handcuffGag" - /obj/item/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/stack/rods)) @@ -379,4 +387,3 @@ B.Crossed(hit_atom) qdel(src) ..() - diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index cde3f127ed..21e3f26cd7 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -9,8 +9,8 @@ throw_speed = 3 throw_range = 4 throwforce = 10 - unique_rename = TRUE w_class = WEIGHT_CLASS_TINY + unique_rename = TRUE var/reskinned = FALSE /obj/item/nullrod/suicide_act(mob/user) @@ -354,6 +354,11 @@ w_class = WEIGHT_CLASS_HUGE sharpness = IS_SHARP +/obj/item/nullrod/armblade/tentacle + name = "unholy blessing" + icon_state = "tentacle" + item_state = "tentacle" + /obj/item/nullrod/carp name = "carp-sie plushie" desc = "An adorable stuffed toy that resembles the god of all carp. The teeth look pretty sharp. Activate it to receive the blessing of Carp-Sie." diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index 45c687a66f..19e8560d4d 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -3,6 +3,8 @@ name = "mop" icon = 'icons/obj/janitor.dmi' icon_state = "mop" + lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi' force = 3 throwforce = 5 throw_speed = 3 diff --git a/code/game/objects/items/paiwire.dm b/code/game/objects/items/paiwire.dm index a20f89bc2b..994082c5fa 100644 --- a/code/game/objects/items/paiwire.dm +++ b/code/game/objects/items/paiwire.dm @@ -10,4 +10,4 @@ if(!user.transferItemToLoc(src, M)) return user.visible_message("[user] inserts [src] into a data port on [M].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.") - machine = M + machine = M \ No newline at end of file diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index d291a7ca7d..a6d0d285bf 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -54,6 +54,7 @@ return if(!target) add_overlay("pinon[alert ? "alert" : ""]null") + return var/turf/here = get_turf(src) var/turf/there = get_turf(target) if(here.z != there.z) @@ -110,7 +111,8 @@ var/crewmember_name = "Unknown" if(H.wear_id) var/obj/item/card/id/I = H.wear_id.GetID() - crewmember_name = I.registered_name + if(I && I.registered_name) + crewmember_name = I.registered_name while(crewmember_name in name_counts) name_counts[crewmember_name]++ diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 8bd5d570e2..649293a7de 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -504,4 +504,4 @@ item_state = "plushie_slime" attack_verb = list("blorbled", "slimed", "absorbed") squeak_override = list('sound/effects/blobattack.ogg' = 1) - gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy + gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy \ No newline at end of file diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index f7b3f72403..8d32f95e8f 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -125,14 +125,14 @@ loadedWeightClass += I.w_class return TRUE -/obj/item/pneumatic_cannon/afterattack(atom/target, mob/living/carbon/human/user, flag, params) +/obj/item/pneumatic_cannon/afterattack(atom/target, mob/living/user, flag, params) if(flag && user.a_intent == INTENT_HARM) //melee attack return if(!istype(user)) return Fire(user, target) -/obj/item/pneumatic_cannon/proc/Fire(mob/living/carbon/human/user, var/atom/target) +/obj/item/pneumatic_cannon/proc/Fire(mob/living/user, var/atom/target) if(!istype(user) && !target) return var/discharge = 0 @@ -164,9 +164,10 @@ var/turf/T = get_target(target, get_turf(src)) playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 50, 1) fire_items(T, user) - if(pressureSetting >= 3 && user) - user.visible_message("[user] is thrown down by the force of the cannon!", "[src] slams into your shoulder, knocking you down!") - user.Knockdown(60) + if(pressureSetting >= 3 && iscarbon(user)) + var/mob/living/carbon/C = user + C.visible_message("[C] is thrown down by the force of the cannon!", "[src] slams into your shoulder, knocking you down!") + C.Knockdown(60) /obj/item/pneumatic_cannon/proc/fire_items(turf/target, mob/user) if(fire_mode == PCANNON_FIREALL) @@ -272,3 +273,10 @@ selfcharge = TRUE charge_type = /obj/item/reagent_containers/food/snacks/pie/cream maxWeightClass = 60 //20 pies. + +/obj/item/pneumatic_cannon/pie/selfcharge/cyborg + name = "low velocity pie cannon" + automatic = FALSE + charge_type = /obj/item/reagent_containers/food/snacks/pie/cream/nostun + maxWeightClass = 6 //2 pies + charge_ticks = 2 //4 second/pie diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index d2f1d2a31b..aae0937bb7 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -355,6 +355,9 @@ var/hitdamage = 0 var/emaggedhitdamage = 3 +/obj/item/borg/lollipop/clown + emaggedhitdamage = 0 + /obj/item/borg/lollipop/equipped() check_amount() @@ -724,4 +727,4 @@ /obj/item/borg/sight/hud/sec/New() ..() hud = new /obj/item/clothing/glasses/hud/security(src) - return \ No newline at end of file + return diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 586d21555c..c0500f5d21 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -21,7 +21,7 @@ cut_overlays() /obj/item/target/Move() - ..() + . = ..() if(pinnedLoc) pinnedLoc.forceMove(loc) diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm index 350daa0fc3..65716f2f30 100644 --- a/code/game/objects/items/signs.dm +++ b/code/game/objects/items/signs.dm @@ -10,13 +10,23 @@ var/label = "" var/last_wave = 0 +/obj/item/picket_sign/cyborg + name = "metallic nano-sign" + desc = "A high tech picket sign used by silicons that can reprogram its surface at will. Probably hurts to get hit by, too." + force = 13 + resistance_flags = NONE + actions_types = list(/datum/action/item_action/nano_picket_sign) + +/obj/item/picket_sign/proc/retext(mob/user) + var/txt = stripped_input(user, "What would you like to write on the sign?", "Sign Label", null , 30) + if(txt && Adjacent(user)) + label = txt + name = "[label] sign" + desc = "It reads: [label]" + /obj/item/picket_sign/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pen) || istype(W, /obj/item/toy/crayon)) - var/txt = stripped_input(user, "What would you like to write on the sign?", "Sign Label", null , 30) - if(txt) - label = txt - src.name = "[label] sign" - desc = "It reads: [label]" + retext(user) else return ..() diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 36b9cf210a..c3d1d5160b 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -19,10 +19,15 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \ - new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, one_per_turf = TRUE, on_floor = TRUE), \ - new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, one_per_turf = TRUE, on_floor = TRUE), \ - new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, one_per_turf = TRUE, on_floor = TRUE), \ - new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, one_per_turf = TRUE, on_floor = TRUE), \ + + //CIT CHANGE - adds sofas to metal recipe list + new/datum/stack_recipe_list("sofas", list( \ + new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, one_per_turf = TRUE, on_floor = TRUE), \ + new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, one_per_turf = TRUE, on_floor = TRUE), \ + new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, one_per_turf = TRUE, on_floor = TRUE), \ + new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, one_per_turf = TRUE, on_floor = TRUE), \ + )), \ + //END OF CIT CHANGES null, \ new/datum/stack_recipe_list("office chairs", list( \ new/datum/stack_recipe("dark office chair", /obj/structure/chair/office/dark, 5, one_per_turf = TRUE, on_floor = TRUE), \ diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 0e92d578a1..7463c69b4d 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -109,7 +109,7 @@ if (recipes_sublist && recipe_list[recipes_sublist] && istype(recipe_list[recipes_sublist], /datum/stack_recipe_list)) var/datum/stack_recipe_list/srl = recipe_list[recipes_sublist] recipe_list = srl.recipes - var/t1 = "Amount Left: [amount]
    " + var/t1 = "Amount Left: [get_amount()]
    " for(var/i in 1 to length(recipe_list)) var/E = recipe_list[i] if (isnull(E)) @@ -161,8 +161,8 @@ if (href_list["sublist"] && !href_list["make"]) interact(usr, text2num(href_list["sublist"])) if (href_list["make"]) - if (get_amount() < 1) - qdel(src) //Never should happen + if (get_amount() < 1 && !is_cyborg) + qdel(src) var/list/recipes_list = recipes if (href_list["sublist"]) diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index c88dc51474..25b123e75c 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -93,6 +93,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible", if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") return + if (user.has_disability(DISABILITY_CLUMSY) && prob(50)) to_chat(user, "[src] slips out of your hand and hits your head.") user.take_bodypart_damage(10) diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index df40b2898c..0703eba47a 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -54,3 +54,4 @@ new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) new /obj/item/suppressor/specialoffer(src) + diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index 6ea3529b3b..3c1789fb7f 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -182,6 +182,8 @@ var/cy = ty boxes.screen_loc = "[tx]:,[ty] to [mx],[my]" for(var/obj/O in contents) + if(QDELETED(O)) + continue O.screen_loc = "[cx],[cy]" O.layer = ABOVE_HUD_LAYER O.plane = ABOVE_HUD_PLANE @@ -211,6 +213,8 @@ cy-- else for(var/obj/O in contents) + if(QDELETED(O)) + continue O.mouse_opacity = MOUSE_OPACITY_OPAQUE //This is here so storage items that spawn with contents correctly have the "click around item to equip" O.screen_loc = "[cx]:16,[cy]:16" O.maptext = "" @@ -244,6 +248,8 @@ numbered_contents = list() adjusted_contents = 0 for(var/obj/item/I in contents) + if(QDELETED(I)) + continue var/found = 0 for(var/datum/numbered_display/ND in numbered_contents) if(ND.sample_object.type == I.type) diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 8a3dc21dbe..f1cc7c7c25 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -327,7 +327,7 @@ /obj/effect/resin_container/proc/Smoke() var/obj/effect/particle_effect/foam/metal/resin/S = new /obj/effect/particle_effect/foam/metal/resin(get_turf(loc)) - S.amount = 3 + S.amount = 4 playsound(src,'sound/effects/bamf.ogg',100,1) qdel(src) diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 7012eee386..c3022a7758 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -1,3 +1,4 @@ + #define SOURCE_PORTAL 1 #define DESTINATION_PORTAL 2 @@ -16,7 +17,7 @@ icon = 'icons/obj/device.dmi' icon_state = "locator" var/temp = null - var/frequency = 1451 + var/frequency = FREQ_LOCATOR_IMPLANT var/broadcasting = null var/listening = 1 flags_1 = CONDUCT_1 @@ -207,7 +208,7 @@ Frequency: current_area = current_location.loc if(!current_location || current_area.noteleport || is_away_level(current_location.z) || !isturf(user.loc))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf to_chat(user, "\The [src] is malfunctioning.") - return + return user.show_message("Locked In.", 2) var/list/obj/effect/portal/created = create_portal_pair(current_location, get_teleport_turf(get_turf(T)), src, 300, 1) if(!(LAZYLEN(created) == 2)) diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index e00513a47a..95d209585f 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -138,7 +138,7 @@ return FALSE forceMove(tongs) tongs.sliver = src - tongs.icon_state = "supermatter_tongs_loaded" + tongs.update_icon() to_chat(user, "You carefully pick up [src] with [tongs].") else if(istype(W, /obj/item/scalpel/supermatter) || istype(W, /obj/item/nuke_core_container/supermatter/)) // we don't want it to dust return @@ -217,6 +217,12 @@ QDEL_NULL(sliver) return ..() +/obj/item/hemostat/supermatter/update_icon() + if(sliver) + icon_state = "supermatter_tongs_loaded" + else + icon_state = "supermatter_tongs" + /obj/item/hemostat/supermatter/afterattack(atom/O, mob/user, proximity) if(!sliver) return @@ -224,12 +230,14 @@ Consume(O) to_chat(usr, "\The [sliver] is dusted along with \the [O]!") QDEL_NULL(sliver) + update_icon() /obj/item/hemostat/supermatter/throw_impact(atom/hit_atom) // no instakill supermatter javelins if(sliver) sliver.forceMove(loc) to_chat(usr, "\The [sliver] falls out of \the [src] as you throw them.") sliver = null + update_icon() ..() /obj/item/hemostat/supermatter/proc/Consume(atom/movable/AM, mob/user) @@ -247,6 +255,5 @@ radiation_pulse(user, 500, 2) playsound(src, 'sound/effects/supermatter.ogg', 50, 1) user.dust() - icon_state = "supermatter_tongs" QDEL_NULL(sliver) - + update_icon() diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 12c056c9af..289b4dc5e2 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -342,4 +342,4 @@ nextrefueltick = world.time + 10 reagents.add_reagent("welding_fuel", 1) -#undef WELDER_FUEL_BURN_INTERVAL +#undef WELDER_FUEL_BURN_INTERVAL \ No newline at end of file diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index c03469164e..910b98b27a 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -14,7 +14,8 @@ materials = list(MAT_METAL=80) attack_verb = list("pinched", "nipped") hitsound = 'sound/items/wirecutter.ogg' - usesound = 'sound/items/wirecutter.ogg' + usesound = 'sound/items/wirecutter.ogg' + tool_behaviour = TOOL_WIRECUTTER toolspeed = 1 armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) @@ -32,10 +33,6 @@ if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) user.visible_message("[user] cuts [C]'s restraints with [src]!") qdel(C.handcuffed) - C.handcuffed = null - if(C.buckled && C.buckled.buckle_requires_restraints) - C.buckled.unbuckle_mob(C) - C.update_handcuffed() return else ..() @@ -58,7 +55,8 @@ desc = "Extremely sharp wirecutters, made out of a silvery-green metal." icon = 'icons/obj/abductor.dmi' icon_state = "cutters" - toolspeed = 0.1 + toolspeed = 0.1 + random_color = FALSE /obj/item/wirecutters/cyborg @@ -70,7 +68,8 @@ name = "jaws of life" desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." icon_state = "jaws_cutter" - item_state = "jawsoflife" + item_state = "jawsoflife" + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) usesound = 'sound/items/jaws_cut.ogg' toolspeed = 0.25 @@ -92,4 +91,12 @@ var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power to_chat(user, "You attach the pry jaws to [src].") qdel(src) - user.put_in_active_hand(pryjaws) \ No newline at end of file + user.put_in_active_hand(pryjaws) + +/obj/item/wirecutters/power/attack(mob/living/carbon/C, mob/user) + if(istype(C) && C.handcuffed) + user.visible_message("[user] cuts [C]'s restraints with [src]!") + qdel(C.handcuffed) + return + else + ..() diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index b1313ef84f..7d371102c3 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -81,4 +81,4 @@ /obj/item/trash/coal/burn() visible_message("[src] fuses into a diamond! Someone wasn't so naughty after all...") new /obj/item/ore/diamond(loc) - qdel(src) + qdel(src) \ No newline at end of file diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index 539c3c70a0..8618d090bf 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -122,6 +122,10 @@ flags_1 = ABSTRACT_1 | NODROP_1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF +/obj/item/twohanded/offhand/Destroy() + wielded = FALSE + return ..() + /obj/item/twohanded/offhand/unwield() if(wielded)//Only delete if we're wielded wielded = FALSE diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 37d0c6cb0e..2656079557 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -409,7 +409,7 @@ righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' flags_1 = NODROP_1 | ABSTRACT_1 | DROPDEL_1 w_class = WEIGHT_CLASS_HUGE - force = 21 + force = 24 throwforce = 0 throw_range = 0 throw_speed = 0 diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index ae79c7e86d..b053b987ca 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -70,7 +70,7 @@ /obj/structure/alien/resin/Move() var/turf/T = loc - ..() + . = ..() move_update_air(T) /obj/structure/alien/resin/wall diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index aabbba6b2f..f4af05c9c9 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -30,7 +30,7 @@ //Stick to the easel like glue /obj/structure/easel/Move() var/turf/T = get_turf(src) - ..() + . = ..() if(painting && painting.loc == T) //Only move if it's near us. painting.forceMove(get_turf(src)) else diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 1a09c9c4c2..56a38cb688 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -21,6 +21,10 @@ var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 2 +/obj/structure/bed/examine(mob/user) + ..() + to_chat(user, "It's held together by a couple of bolts.") + /obj/structure/bed/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) if(buildstacktype) @@ -145,7 +149,7 @@ /obj/item/roller/robo/examine(mob/user) ..() - to_chat(user, "The dock is [loaded ? "loaded" : "empty"]") + to_chat(user, "The dock is [loaded ? "loaded" : "empty"].") /obj/item/roller/robo/deploy_roller(mob/user, atom/location) if(loaded) diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 1dc4764bcf..c56a0c5008 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -1,107 +1,107 @@ -/obj/structure/closet/cabinet - name = "cabinet" - desc = "Old will forever be in fashion." - icon_state = "cabinet" - resistance_flags = FLAMMABLE - max_integrity = 70 - -/obj/structure/closet/acloset - name = "strange closet" - desc = "It looks alien!" - icon_state = "alien" - - -/obj/structure/closet/gimmick - name = "administrative supply closet" - desc = "It's a storage unit for things that have no right being here." - icon_state = "syndicate" - -/obj/structure/closet/gimmick/russian - name = "russian surplus closet" - desc = "It's a storage unit for Russian standard-issue surplus." - -/obj/structure/closet/gimmick/russian/PopulateContents() - ..() - for(var/i in 1 to 5) - new /obj/item/clothing/head/ushanka(src) - for(var/i in 1 to 5) - new /obj/item/clothing/under/soviet(src) - -/obj/structure/closet/gimmick/tacticool - name = "tacticool gear closet" - desc = "It's a storage unit for Tacticool gear." - -/obj/structure/closet/gimmick/tacticool/PopulateContents() - ..() - new /obj/item/clothing/glasses/eyepatch(src) - new /obj/item/clothing/glasses/sunglasses(src) - new /obj/item/clothing/gloves/combat(src) - new /obj/item/clothing/gloves/combat(src) - new /obj/item/clothing/head/helmet/swat(src) - new /obj/item/clothing/head/helmet/swat(src) - new /obj/item/clothing/mask/gas/sechailer/swat(src) - new /obj/item/clothing/mask/gas/sechailer/swat(src) - new /obj/item/clothing/shoes/combat/swat(src) - new /obj/item/clothing/shoes/combat/swat(src) - new /obj/item/clothing/suit/space/hardsuit/deathsquad(src) - new /obj/item/clothing/suit/space/hardsuit/deathsquad(src) - new /obj/item/clothing/under/syndicate/tacticool(src) - new /obj/item/clothing/under/syndicate/tacticool(src) - - -/obj/structure/closet/thunderdome - name = "\improper Thunderdome closet" - desc = "Everything you need!" +/obj/structure/closet/cabinet + name = "cabinet" + desc = "Old will forever be in fashion." + icon_state = "cabinet" + resistance_flags = FLAMMABLE + max_integrity = 70 + +/obj/structure/closet/acloset + name = "strange closet" + desc = "It looks alien!" + icon_state = "alien" + + +/obj/structure/closet/gimmick + name = "administrative supply closet" + desc = "It's a storage unit for things that have no right being here." + icon_state = "syndicate" + +/obj/structure/closet/gimmick/russian + name = "russian surplus closet" + desc = "It's a storage unit for Russian standard-issue surplus." + +/obj/structure/closet/gimmick/russian/PopulateContents() + ..() + for(var/i in 1 to 5) + new /obj/item/clothing/head/ushanka(src) + for(var/i in 1 to 5) + new /obj/item/clothing/under/soviet(src) + +/obj/structure/closet/gimmick/tacticool + name = "tacticool gear closet" + desc = "It's a storage unit for Tacticool gear." + +/obj/structure/closet/gimmick/tacticool/PopulateContents() + ..() + new /obj/item/clothing/glasses/eyepatch(src) + new /obj/item/clothing/glasses/sunglasses(src) + new /obj/item/clothing/gloves/combat(src) + new /obj/item/clothing/gloves/combat(src) + new /obj/item/clothing/head/helmet/swat(src) + new /obj/item/clothing/head/helmet/swat(src) + new /obj/item/clothing/mask/gas/sechailer/swat(src) + new /obj/item/clothing/mask/gas/sechailer/swat(src) + new /obj/item/clothing/shoes/combat/swat(src) + new /obj/item/clothing/shoes/combat/swat(src) + new /obj/item/clothing/suit/space/hardsuit/deathsquad(src) + new /obj/item/clothing/suit/space/hardsuit/deathsquad(src) + new /obj/item/clothing/under/syndicate/tacticool(src) + new /obj/item/clothing/under/syndicate/tacticool(src) + + +/obj/structure/closet/thunderdome + name = "\improper Thunderdome closet" + desc = "Everything you need!" anchored = TRUE - -/obj/structure/closet/thunderdome/tdred - name = "red-team Thunderdome closet" - icon_door = "red" - -/obj/structure/closet/thunderdome/tdred/PopulateContents() - ..() - for(var/i in 1 to 3) - new /obj/item/clothing/suit/armor/tdome/red(src) - for(var/i in 1 to 3) + +/obj/structure/closet/thunderdome/tdred + name = "red-team Thunderdome closet" + icon_door = "red" + +/obj/structure/closet/thunderdome/tdred/PopulateContents() + ..() + for(var/i in 1 to 3) + new /obj/item/clothing/suit/armor/tdome/red(src) + for(var/i in 1 to 3) new /obj/item/melee/transforming/energy/sword/saber(src) - for(var/i in 1 to 3) - new /obj/item/gun/energy/laser(src) - for(var/i in 1 to 3) - new /obj/item/melee/baton/loaded(src) - for(var/i in 1 to 3) - new /obj/item/storage/box/flashbangs(src) - for(var/i in 1 to 3) - new /obj/item/clothing/head/helmet/thunderdome(src) - -/obj/structure/closet/thunderdome/tdgreen - name = "green-team Thunderdome closet" - icon_door = "green" - -/obj/structure/closet/thunderdome/tdgreen/PopulateContents() - ..() - for(var/i in 1 to 3) - new /obj/item/clothing/suit/armor/tdome/green(src) - for(var/i in 1 to 3) + for(var/i in 1 to 3) + new /obj/item/gun/energy/laser(src) + for(var/i in 1 to 3) + new /obj/item/melee/baton/loaded(src) + for(var/i in 1 to 3) + new /obj/item/storage/box/flashbangs(src) + for(var/i in 1 to 3) + new /obj/item/clothing/head/helmet/thunderdome(src) + +/obj/structure/closet/thunderdome/tdgreen + name = "green-team Thunderdome closet" + icon_door = "green" + +/obj/structure/closet/thunderdome/tdgreen/PopulateContents() + ..() + for(var/i in 1 to 3) + new /obj/item/clothing/suit/armor/tdome/green(src) + for(var/i in 1 to 3) new /obj/item/melee/transforming/energy/sword/saber(src) - for(var/i in 1 to 3) - new /obj/item/gun/energy/laser(src) - for(var/i in 1 to 3) - new /obj/item/melee/baton/loaded(src) - for(var/i in 1 to 3) - new /obj/item/storage/box/flashbangs(src) - for(var/i in 1 to 3) - new /obj/item/clothing/head/helmet/thunderdome(src) - -/obj/structure/closet/malf/suits - desc = "It's a storage unit for operational gear." - icon_state = "syndicate" - -/obj/structure/closet/malf/suits/PopulateContents() - ..() - new /obj/item/tank/jetpack/void(src) - new /obj/item/clothing/mask/breath(src) - new /obj/item/clothing/head/helmet/space/nasavoid(src) - new /obj/item/clothing/suit/space/nasavoid(src) - new /obj/item/crowbar(src) - new /obj/item/stock_parts/cell(src) - new /obj/item/device/multitool(src) + for(var/i in 1 to 3) + new /obj/item/gun/energy/laser(src) + for(var/i in 1 to 3) + new /obj/item/melee/baton/loaded(src) + for(var/i in 1 to 3) + new /obj/item/storage/box/flashbangs(src) + for(var/i in 1 to 3) + new /obj/item/clothing/head/helmet/thunderdome(src) + +/obj/structure/closet/malf/suits + desc = "It's a storage unit for operational gear." + icon_state = "syndicate" + +/obj/structure/closet/malf/suits/PopulateContents() + ..() + new /obj/item/tank/jetpack/void(src) + new /obj/item/clothing/mask/breath(src) + new /obj/item/clothing/head/helmet/space/nasavoid(src) + new /obj/item/clothing/suit/space/nasavoid(src) + new /obj/item/crowbar(src) + new /obj/item/stock_parts/cell(src) + new /obj/item/device/multitool(src) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 42fd4d2374..a41710ea7d 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -365,3 +365,4 @@ new /obj/item/clothing/under/rank/curator/treasure_hunter(src) new /obj/item/clothing/shoes/workboots/mining(src) new /obj/item/storage/backpack/satchel/explorer(src) + diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index fb9732c3f7..f0c1495281 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -1,11 +1,11 @@ -/obj/structure/closet/secure_closet/bar - name = "booze storage" +/obj/structure/closet/secure_closet/bar + name = "booze storage" req_access = list(ACCESS_BAR) - icon_state = "cabinet" - resistance_flags = FLAMMABLE - max_integrity = 70 - -/obj/structure/closet/secure_closet/bar/PopulateContents() - ..() - for(var/i in 1 to 10) - new /obj/item/reagent_containers/food/drinks/beer( src ) + icon_state = "cabinet" + resistance_flags = FLAMMABLE + max_integrity = 70 + +/obj/structure/closet/secure_closet/bar/PopulateContents() + ..() + for(var/i in 1 to 10) + new /obj/item/reagent_containers/food/drinks/beer( src ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index adcb8cb498..37fe71a3f5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -1,13 +1,13 @@ -/obj/structure/closet/secure_closet/hydroponics - name = "botanist's locker" +/obj/structure/closet/secure_closet/hydroponics + name = "botanist's locker" req_access = list(ACCESS_HYDROPONICS) - icon_state = "hydro" - -/obj/structure/closet/secure_closet/hydroponics/PopulateContents() - ..() - new /obj/item/storage/bag/plants/portaseeder(src) - new /obj/item/device/plant_analyzer(src) - new /obj/item/device/radio/headset/headset_srv(src) - new /obj/item/cultivator(src) - new /obj/item/hatchet(src) + icon_state = "hydro" + +/obj/structure/closet/secure_closet/hydroponics/PopulateContents() + ..() + new /obj/item/storage/bag/plants/portaseeder(src) + new /obj/item/device/plant_analyzer(src) + new /obj/item/device/radio/headset/headset_srv(src) + new /obj/item/cultivator(src) + new /obj/item/hatchet(src) new /obj/item/storage/box/disks_plantgene(src) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index dff240e1da..dcee41585d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -73,8 +73,8 @@ new /obj/item/device/autosurgeon/cmo(src) new /obj/item/door_remote/chief_medical_officer(src) new /obj/item/clothing/neck/petcollar(src) - new /obj/item/circuitboard/machine/protolathe/department/medical(src) new /obj/item/pet_carrier(src) + new /obj/item/circuitboard/machine/protolathe/department/medical(src) /obj/structure/closet/secure_closet/animal name = "animal control" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 00b74305aa..51f2c96c3a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -1,53 +1,53 @@ -/obj/structure/closet/secure_closet/personal - desc = "It's a secure locker for personnel. The first card swiped gains control." - name = "personal closet" +/obj/structure/closet/secure_closet/personal + desc = "It's a secure locker for personnel. The first card swiped gains control." + name = "personal closet" req_access = list(ACCESS_ALL_PERSONAL_LOCKERS) - var/registered_name = null - -/obj/structure/closet/secure_closet/personal/PopulateContents() - ..() - if(prob(50)) - new /obj/item/storage/backpack/duffelbag(src) - if(prob(50)) - new /obj/item/storage/backpack(src) - else - new /obj/item/storage/backpack/satchel(src) - new /obj/item/device/radio/headset( src ) - -/obj/structure/closet/secure_closet/personal/patient - name = "patient's closet" - -/obj/structure/closet/secure_closet/personal/patient/PopulateContents() - new /obj/item/clothing/under/color/white( src ) - new /obj/item/clothing/shoes/sneakers/white( src ) - -/obj/structure/closet/secure_closet/personal/cabinet - icon_state = "cabinet" - resistance_flags = FLAMMABLE - max_integrity = 70 - -/obj/structure/closet/secure_closet/personal/cabinet/PopulateContents() - new /obj/item/storage/backpack/satchel/leather/withwallet( src ) + var/registered_name = null + +/obj/structure/closet/secure_closet/personal/PopulateContents() + ..() + if(prob(50)) + new /obj/item/storage/backpack/duffelbag(src) + if(prob(50)) + new /obj/item/storage/backpack(src) + else + new /obj/item/storage/backpack/satchel(src) + new /obj/item/device/radio/headset( src ) + +/obj/structure/closet/secure_closet/personal/patient + name = "patient's closet" + +/obj/structure/closet/secure_closet/personal/patient/PopulateContents() + new /obj/item/clothing/under/color/white( src ) + new /obj/item/clothing/shoes/sneakers/white( src ) + +/obj/structure/closet/secure_closet/personal/cabinet + icon_state = "cabinet" + resistance_flags = FLAMMABLE + max_integrity = 70 + +/obj/structure/closet/secure_closet/personal/cabinet/PopulateContents() + new /obj/item/storage/backpack/satchel/leather/withwallet( src ) new /obj/item/device/instrument/piano_synth(src) - new /obj/item/device/radio/headset( src ) - -/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params) - var/obj/item/card/id/I = W.GetID() - if(istype(I)) - if(broken) - to_chat(user, "It appears to be broken.") - return - if(!I || !I.registered_name) - return - if(allowed(user) || !registered_name || (istype(I) && (registered_name == I.registered_name))) - //they can open all lockers, or nobody owns this, or they own this locker - locked = !locked - update_icon() - - if(!registered_name) - registered_name = I.registered_name - desc = "Owned by [I.registered_name]." - else - to_chat(user, "Access Denied.") - else + new /obj/item/device/radio/headset( src ) + +/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params) + var/obj/item/card/id/I = W.GetID() + if(istype(I)) + if(broken) + to_chat(user, "It appears to be broken.") + return + if(!I || !I.registered_name) + return + if(allowed(user) || !registered_name || (istype(I) && (registered_name == I.registered_name))) + //they can open all lockers, or nobody owns this, or they own this locker + locked = !locked + update_icon() + + if(!registered_name) + registered_name = I.registered_name + desc = "Owned by [I.registered_name]." + else + to_chat(user, "Access Denied.") + else return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 8b1e82ed81..158e4d348d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -1,5 +1,5 @@ -/obj/structure/closet/secure_closet/RD - name = "\proper research director's locker" +/obj/structure/closet/secure_closet/RD + name = "\proper research director's locker" req_access = list(ACCESS_RD) icon_state = "rd" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 4dccd78bca..215384054b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -1,13 +1,13 @@ -/obj/structure/closet/secure_closet - name = "secure locker" - desc = "It's a card-locked storage unit." +/obj/structure/closet/secure_closet + name = "secure locker" + desc = "It's a card-locked storage unit." locked = TRUE - icon_state = "secure" - max_integrity = 250 - armor = list(melee = 30, bullet = 50, laser = 50, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80) + icon_state = "secure" + max_integrity = 250 + armor = list(melee = 30, bullet = 50, laser = 50, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80) secure = TRUE - -/obj/structure/closet/secure_closet/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) - if(damage_flag == "melee" && damage_amount < 20) - return 0 + +/obj/structure/closet/secure_closet/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) + if(damage_flag == "melee" && damage_amount < 20) + return 0 . = ..() \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 6491306600..2eae2a9fb9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -29,7 +29,7 @@ new /obj/item/clothing/gloves/color/captain(src) new /obj/item/restraints/handcuffs/cable/zipties(src) new /obj/item/storage/belt/sabre(src) - new /obj/item/gun/energy/e_gun/cx(src) + new /obj/item/gun/energy/e_gun(src) new /obj/item/door_remote/captain(src) /obj/structure/closet/secure_closet/hop @@ -52,7 +52,7 @@ new /obj/item/device/assembly/flash/handheld(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/restraints/handcuffs/cable/zipties(src) - new /obj/item/gun/energy/e_gun/cx(src) + new /obj/item/gun/energy/e_gun(src) new /obj/item/clothing/neck/petcollar(src) new /obj/item/pet_carrier(src) new /obj/item/door_remote/civillian(src) @@ -70,8 +70,6 @@ new /obj/item/device/radio/headset/heads/hos(src) new /obj/item/clothing/under/hosparadefem(src) new /obj/item/clothing/under/hosparademale(src) - new /obj/item/clothing/under/rank/head_of_security/skirt(src) - new /obj/item/clothing/suit/armor/hos/trenchcoat/cloak(src) new /obj/item/clothing/suit/armor/vest/leather(src) new /obj/item/clothing/suit/armor/hos(src) new /obj/item/clothing/under/rank/head_of_security/alt(src) @@ -90,6 +88,7 @@ new /obj/item/gun/energy/e_gun/hos(src) new /obj/item/device/flashlight/seclite(src) new /obj/item/pinpointer/nuke(src) + new /obj/item/circuitboard/machine/protolathe/department/security(src) /obj/structure/closet/secure_closet/warden name = "\proper warden's locker" @@ -122,7 +121,6 @@ /obj/structure/closet/secure_closet/security/PopulateContents() ..() - new /obj/item/clothing/under/rank/security/skirt(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/head/helmet/sec(src) new /obj/item/device/radio/headset/headset_sec(src) diff --git a/code/game/objects/structures/crates_lockers/crates/critter.dm b/code/game/objects/structures/crates_lockers/crates/critter.dm index 5261bb5332..b9f0f4b4a7 100644 --- a/code/game/objects/structures/crates_lockers/crates/critter.dm +++ b/code/game/objects/structures/crates_lockers/crates/critter.dm @@ -35,4 +35,4 @@ if(tank) return tank.air_contents else - return loc.return_air() + return loc.return_air() \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/crates/large.dm b/code/game/objects/structures/crates_lockers/crates/large.dm index 61b9998233..30da3add67 100644 --- a/code/game/objects/structures/crates_lockers/crates/large.dm +++ b/code/game/objects/structures/crates_lockers/crates/large.dm @@ -1,34 +1,34 @@ -/obj/structure/closet/crate/large - name = "large crate" - desc = "A hefty wooden crate." - icon_state = "largecrate" +/obj/structure/closet/crate/large + name = "large crate" + desc = "A hefty wooden crate." + icon_state = "largecrate" density = TRUE - material_drop = /obj/item/stack/sheet/mineral/wood - delivery_icon = "deliverybox" - -/obj/structure/closet/crate/large/attack_hand(mob/user) - add_fingerprint(user) - if(manifest) - tear_manifest(user) - else - to_chat(user, "You need a crowbar to pry this open!") - -/obj/structure/closet/crate/large/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/crowbar)) - var/turf/T = get_turf(src) - if(manifest) - tear_manifest(user) - - user.visible_message("[user] pries \the [src] open.", \ - "You pry open \the [src].", \ - "You hear splitting wood.") - playsound(src.loc, 'sound/weapons/slashmiss.ogg', 75, 1) - - for(var/i in 1 to rand(2, 5)) - new material_drop(src) - for(var/atom/movable/AM in contents) - AM.forceMove(T) - - qdel(src) - else - return ..() + material_drop = /obj/item/stack/sheet/mineral/wood + delivery_icon = "deliverybox" + +/obj/structure/closet/crate/large/attack_hand(mob/user) + add_fingerprint(user) + if(manifest) + tear_manifest(user) + else + to_chat(user, "You need a crowbar to pry this open!") + +/obj/structure/closet/crate/large/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/crowbar)) + var/turf/T = get_turf(src) + if(manifest) + tear_manifest(user) + + user.visible_message("[user] pries \the [src] open.", \ + "You pry open \the [src].", \ + "You hear splitting wood.") + playsound(src.loc, 'sound/weapons/slashmiss.ogg', 75, 1) + + for(var/i in 1 to rand(2, 5)) + new material_drop(src) + for(var/atom/movable/AM in contents) + AM.forceMove(T) + + qdel(src) + else + return ..() diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 30384d2da9..0f8ad84252 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -115,7 +115,7 @@ /obj/structure/displaycase/attackby(obj/item/W, mob/user, params) if(W.GetID() && !broken && openable) if(allowed(user)) - to_chat(user, "You [open ? "close":"open"] the [src]") + to_chat(user, "You [open ? "close":"open"] [src].") toggle_lock(user) else to_chat(user, "Access denied.") @@ -140,9 +140,9 @@ to_chat(user, "You remove the destroyed case") qdel(src) else - to_chat(user, "You start to [open ? "close":"open"] the [src]") + to_chat(user, "You start to [open ? "close":"open"] [src].") if(do_after(user, 20*W.toolspeed, target = src)) - to_chat(user, "You [open ? "close":"open"] the [src]") + to_chat(user, "You [open ? "close":"open"] [src].") toggle_lock(user) else if(open && !showpiece) if(user.transferItemToLoc(W, src)) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 43bb540375..22d00d6cab 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -25,245 +25,11 @@ update_name() ..() -/obj/structure/door_assembly/door_assembly_public - name = "public airlock assembly" - icon = 'icons/obj/doors/airlocks/station2/glass.dmi' - overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' - glass_type = /obj/machinery/door/airlock/public/glass - airlock_type = /obj/machinery/door/airlock/public - -/obj/structure/door_assembly/door_assembly_com - name = "command airlock assembly" - icon = 'icons/obj/doors/airlocks/station/command.dmi' - base_name = "command airlock" - glass_type = /obj/machinery/door/airlock/glass_command - airlock_type = /obj/machinery/door/airlock/command - -/obj/structure/door_assembly/door_assembly_sec - name = "security airlock assembly" - icon = 'icons/obj/doors/airlocks/station/security.dmi' - base_name = "security airlock" - glass_type = /obj/machinery/door/airlock/glass_security - airlock_type = /obj/machinery/door/airlock/security - -/obj/structure/door_assembly/door_assembly_eng - name = "engineering airlock assembly" - icon = 'icons/obj/doors/airlocks/station/engineering.dmi' - base_name = "engineering airlock" - glass_type = /obj/machinery/door/airlock/glass_engineering - airlock_type = /obj/machinery/door/airlock/engineering - -/obj/structure/door_assembly/door_assembly_min - name = "mining airlock assembly" - icon = 'icons/obj/doors/airlocks/station/mining.dmi' - base_name = "mining airlock" - glass_type = /obj/machinery/door/airlock/glass_mining - airlock_type = /obj/machinery/door/airlock/mining - -/obj/structure/door_assembly/door_assembly_atmo - name = "atmospherics airlock assembly" - icon = 'icons/obj/doors/airlocks/station/atmos.dmi' - base_name = "atmospherics airlock" - glass_type = /obj/machinery/door/airlock/glass_atmos - airlock_type = /obj/machinery/door/airlock/atmos - -/obj/structure/door_assembly/door_assembly_research - name = "research airlock assembly" - icon = 'icons/obj/doors/airlocks/station/research.dmi' - base_name = "research airlock" - glass_type = /obj/machinery/door/airlock/glass_research - airlock_type = /obj/machinery/door/airlock/research - -/obj/structure/door_assembly/door_assembly_science - name = "science airlock assembly" - icon = 'icons/obj/doors/airlocks/station/science.dmi' - base_name = "science airlock" - glass_type = /obj/machinery/door/airlock/glass_science - airlock_type = /obj/machinery/door/airlock/science - -/obj/structure/door_assembly/door_assembly_med - name = "medical airlock assembly" - icon = 'icons/obj/doors/airlocks/station/medical.dmi' - base_name = "medical airlock" - glass_type = /obj/machinery/door/airlock/glass_medical - airlock_type = /obj/machinery/door/airlock/medical - -/obj/structure/door_assembly/door_assembly_mai - name = "maintenance airlock assembly" - icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' - base_name = "maintenance airlock" - glass_type = /obj/machinery/door/airlock/glass_maintenance - airlock_type = /obj/machinery/door/airlock/maintenance - -/obj/structure/door_assembly/door_assembly_extmai - name = "external maintenance airlock assembly" - icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' - base_name = "external maintenance airlock" - glass_type = /obj/machinery/door/airlock/maintenance/external/glass - airlock_type = /obj/machinery/door/airlock/maintenance/external - -/obj/structure/door_assembly/door_assembly_ext - name = "external airlock assembly" - icon = 'icons/obj/doors/airlocks/external/external.dmi' - base_name = "external airlock" - overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi' - glass_type = /obj/machinery/door/airlock/external/glass - airlock_type = /obj/machinery/door/airlock/external - -/obj/structure/door_assembly/door_assembly_fre - name = "freezer airlock assembly" - icon = 'icons/obj/doors/airlocks/station/freezer.dmi' - base_name = "freezer airlock" - airlock_type = /obj/machinery/door/airlock/freezer - noglass = TRUE - -/obj/structure/door_assembly/door_assembly_hatch - name = "airtight hatch assembly" - icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi' - base_name = "airtight hatch" - overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' - airlock_type = /obj/machinery/door/airlock/hatch - noglass = TRUE - -/obj/structure/door_assembly/door_assembly_mhatch - name = "maintenance hatch assembly" - icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi' - base_name = "maintenance hatch" - overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' - airlock_type = /obj/machinery/door/airlock/maintenance_hatch - noglass = TRUE - -/obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly - name = "high security airlock assembly" - icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi' - base_name = "high security airlock" - overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi' - airlock_type = /obj/machinery/door/airlock/highsecurity - noglass = TRUE - material_type = /obj/item/stack/sheet/plasteel - material_amt = 6 - -/obj/structure/door_assembly/door_assembly_vault - name = "vault door assembly" - icon = 'icons/obj/doors/airlocks/vault/vault.dmi' - base_name = "vault door" - overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' - airlock_type = /obj/machinery/door/airlock/vault - noglass = TRUE - material_type = /obj/item/stack/sheet/plasteel - material_amt = 8 - -/obj/structure/door_assembly/door_assembly_shuttle - name = "shuttle airlock assembly" - icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' - base_name = "shuttle airlock" - overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' - airlock_type = /obj/machinery/door/airlock/shuttle - glass_type = /obj/machinery/door/airlock/shuttle/glass - -/obj/structure/door_assembly/door_assembly_cult - name = "cult airlock assembly" - icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi' - base_name = "cult airlock" - overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi' - airlock_type = /obj/machinery/door/airlock/cult - glass_type = /obj/machinery/door/airlock/cult/glass - -/obj/structure/door_assembly/door_assembly_cult/unruned - icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' - overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi' - airlock_type = /obj/machinery/door/airlock/cult/unruned - glass_type = /obj/machinery/door/airlock/cult/unruned/glass - -/obj/structure/door_assembly/door_assembly_viro - name = "virology airlock assembly" - icon = 'icons/obj/doors/airlocks/station/virology.dmi' - base_name = "virology airlock" - glass_type = /obj/machinery/door/airlock/glass_virology - airlock_type = /obj/machinery/door/airlock/virology - -/obj/structure/door_assembly/door_assembly_centcom - icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' - overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' - airlock_type = /obj/machinery/door/airlock/centcom - noglass = TRUE - -/obj/structure/door_assembly/door_assembly_gold - name = "gold airlock assembly" - icon = 'icons/obj/doors/airlocks/station/gold.dmi' - base_name = "gold airlock" - airlock_type = /obj/machinery/door/airlock/gold - mineral = "gold" - glass_type = /obj/machinery/door/airlock/gold/glass - -/obj/structure/door_assembly/door_assembly_silver - name = "silver airlock assembly" - icon = 'icons/obj/doors/airlocks/station/silver.dmi' - base_name = "silver airlock" - airlock_type = /obj/machinery/door/airlock/silver - mineral = "silver" - glass_type = /obj/machinery/door/airlock/silver/glass - -/obj/structure/door_assembly/door_assembly_diamond - name = "diamond airlock assembly" - icon = 'icons/obj/doors/airlocks/station/diamond.dmi' - base_name = "diamond airlock" - airlock_type = /obj/machinery/door/airlock/diamond - mineral = "diamond" - glass_type = /obj/machinery/door/airlock/diamond/glass - -/obj/structure/door_assembly/door_assembly_uranium - name = "uranium airlock assembly" - icon = 'icons/obj/doors/airlocks/station/uranium.dmi' - base_name = "uranium airlock" - airlock_type = /obj/machinery/door/airlock/uranium - mineral = "uranium" - glass_type = /obj/machinery/door/airlock/uranium/glass - -/obj/structure/door_assembly/door_assembly_plasma - name = "plasma airlock assembly" - icon = 'icons/obj/doors/airlocks/station/plasma.dmi' - base_name = "plasma airlock" - airlock_type = /obj/machinery/door/airlock/plasma - mineral = "plasma" - glass_type = /obj/machinery/door/airlock/plasma/glass - -/obj/structure/door_assembly/door_assembly_bananium - name = "bananium airlock assembly" - desc = "Honk." - icon = 'icons/obj/doors/airlocks/station/bananium.dmi' - base_name = "bananium airlock" - airlock_type = /obj/machinery/door/airlock/clown - mineral = "bananium" - glass_type = /obj/machinery/door/airlock/clown/glass - -/obj/structure/door_assembly/door_assembly_sandstone - name = "sandstone airlock assembly" - icon = 'icons/obj/doors/airlocks/station/sandstone.dmi' - base_name = "sandstone airlock" - airlock_type = /obj/machinery/door/airlock/sandstone - mineral = "sandstone" - glass_type = /obj/machinery/door/airlock/sandstone/glass - -/obj/structure/door_assembly/door_assembly_titanium - name = "titanium airlock assembly" - icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' - base_name = "shuttle airlock" - overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' - glass_type = /obj/machinery/door/airlock/titanium/glass - airlock_type = /obj/machinery/door/airlock/titanium - mineral = "titanium" - -/obj/structure/door_assembly/door_assembly_wood - name = "wooden airlock assembly" - icon = 'icons/obj/doors/airlocks/station/wood.dmi' - base_name = "wooden airlock" - airlock_type = /obj/machinery/door/airlock/wood - mineral = "wood" - glass_type = /obj/machinery/door/airlock/wood/glass - /obj/structure/door_assembly/examine(mob/user) ..() + var/doorname = "" + if(created_name) + doorname = ", written on it is '[created_name]'" switch(state) if(AIRLOCK_ASSEMBLY_NEEDS_WIRES) if(anchored) @@ -275,13 +41,13 @@ if(AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) to_chat(user, "The circuit is connected loosely to its slot, but the maintenance panel is unscrewed and open.") if(!mineral && !glass && !noglass) - to_chat(user, "There is a small paper placard on the assembly. There are empty slots for glass windows and mineral covers.") + to_chat(user, "There is a small paper placard on the assembly[doorname]. There are empty slots for glass windows and mineral covers.") else if(!mineral && glass && !noglass) - to_chat(user, "There is a small paper placard on the assembly. There are empty slots for mineral covers.") + to_chat(user, "There is a small paper placard on the assembly[doorname]. There are empty slots for mineral covers.") else if(mineral && !glass && !noglass) - to_chat(user, "There is a small paper placard on the assembly. There are empty slots for glass windows.") + to_chat(user, "There is a small paper placard on the assembly[doorname]. There are empty slots for glass windows.") else - to_chat(user, "There is a small paper placard on the assembly.") + to_chat(user, "There is a small paper placard on the assembly[doorname].") /obj/structure/door_assembly/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pen)) diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm new file mode 100644 index 0000000000..cdbdbdfb32 --- /dev/null +++ b/code/game/objects/structures/door_assembly_types.dm @@ -0,0 +1,236 @@ +/obj/structure/door_assembly/door_assembly_public + name = "public airlock assembly" + icon = 'icons/obj/doors/airlocks/station2/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' + glass_type = /obj/machinery/door/airlock/public/glass + airlock_type = /obj/machinery/door/airlock/public + +/obj/structure/door_assembly/door_assembly_com + name = "command airlock assembly" + icon = 'icons/obj/doors/airlocks/station/command.dmi' + base_name = "command airlock" + glass_type = /obj/machinery/door/airlock/command/glass + airlock_type = /obj/machinery/door/airlock/command + +/obj/structure/door_assembly/door_assembly_sec + name = "security airlock assembly" + icon = 'icons/obj/doors/airlocks/station/security.dmi' + base_name = "security airlock" + glass_type = /obj/machinery/door/airlock/security/glass + airlock_type = /obj/machinery/door/airlock/security + +/obj/structure/door_assembly/door_assembly_eng + name = "engineering airlock assembly" + icon = 'icons/obj/doors/airlocks/station/engineering.dmi' + base_name = "engineering airlock" + glass_type = /obj/machinery/door/airlock/engineering/glass + airlock_type = /obj/machinery/door/airlock/engineering + +/obj/structure/door_assembly/door_assembly_min + name = "mining airlock assembly" + icon = 'icons/obj/doors/airlocks/station/mining.dmi' + base_name = "mining airlock" + glass_type = /obj/machinery/door/airlock/mining/glass + airlock_type = /obj/machinery/door/airlock/mining + +/obj/structure/door_assembly/door_assembly_atmo + name = "atmospherics airlock assembly" + icon = 'icons/obj/doors/airlocks/station/atmos.dmi' + base_name = "atmospherics airlock" + glass_type = /obj/machinery/door/airlock/atmos/glass + airlock_type = /obj/machinery/door/airlock/atmos + +/obj/structure/door_assembly/door_assembly_research + name = "research airlock assembly" + icon = 'icons/obj/doors/airlocks/station/research.dmi' + base_name = "research airlock" + glass_type = /obj/machinery/door/airlock/research/glass + airlock_type = /obj/machinery/door/airlock/research + +/obj/structure/door_assembly/door_assembly_science + name = "science airlock assembly" + icon = 'icons/obj/doors/airlocks/station/science.dmi' + base_name = "science airlock" + glass_type = /obj/machinery/door/airlock/science/glass + airlock_type = /obj/machinery/door/airlock/science + +/obj/structure/door_assembly/door_assembly_med + name = "medical airlock assembly" + icon = 'icons/obj/doors/airlocks/station/medical.dmi' + base_name = "medical airlock" + glass_type = /obj/machinery/door/airlock/medical/glass + airlock_type = /obj/machinery/door/airlock/medical + +/obj/structure/door_assembly/door_assembly_mai + name = "maintenance airlock assembly" + icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' + base_name = "maintenance airlock" + glass_type = /obj/machinery/door/airlock/maintenance/glass + airlock_type = /obj/machinery/door/airlock/maintenance + +/obj/structure/door_assembly/door_assembly_extmai + name = "external maintenance airlock assembly" + icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' + base_name = "external maintenance airlock" + glass_type = /obj/machinery/door/airlock/maintenance/external/glass + airlock_type = /obj/machinery/door/airlock/maintenance/external + +/obj/structure/door_assembly/door_assembly_ext + name = "external airlock assembly" + icon = 'icons/obj/doors/airlocks/external/external.dmi' + base_name = "external airlock" + overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + glass_type = /obj/machinery/door/airlock/external/glass + airlock_type = /obj/machinery/door/airlock/external + +/obj/structure/door_assembly/door_assembly_fre + name = "freezer airlock assembly" + icon = 'icons/obj/doors/airlocks/station/freezer.dmi' + base_name = "freezer airlock" + airlock_type = /obj/machinery/door/airlock/freezer + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_hatch + name = "airtight hatch assembly" + icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi' + base_name = "airtight hatch" + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/hatch + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_mhatch + name = "maintenance hatch assembly" + icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi' + base_name = "maintenance hatch" + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/maintenance_hatch + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_highsecurity + name = "high security airlock assembly" + icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi' + base_name = "high security airlock" + overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/highsecurity + noglass = TRUE + material_type = /obj/item/stack/sheet/plasteel + material_amt = 6 + +/obj/structure/door_assembly/door_assembly_vault + name = "vault door assembly" + icon = 'icons/obj/doors/airlocks/vault/vault.dmi' + base_name = "vault door" + overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/vault + noglass = TRUE + material_type = /obj/item/stack/sheet/plasteel + material_amt = 8 + +/obj/structure/door_assembly/door_assembly_shuttle + name = "shuttle airlock assembly" + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + base_name = "shuttle airlock" + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/shuttle + glass_type = /obj/machinery/door/airlock/shuttle/glass + +/obj/structure/door_assembly/door_assembly_cult + name = "cult airlock assembly" + icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi' + base_name = "cult airlock" + overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/cult + glass_type = /obj/machinery/door/airlock/cult/glass + +/obj/structure/door_assembly/door_assembly_cult/unruned + icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' + overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/cult/unruned + glass_type = /obj/machinery/door/airlock/cult/unruned/glass + +/obj/structure/door_assembly/door_assembly_viro + name = "virology airlock assembly" + icon = 'icons/obj/doors/airlocks/station/virology.dmi' + base_name = "virology airlock" + glass_type = /obj/machinery/door/airlock/virology/glass + airlock_type = /obj/machinery/door/airlock/virology + +/obj/structure/door_assembly/door_assembly_centcom + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/centcom + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_gold + name = "gold airlock assembly" + icon = 'icons/obj/doors/airlocks/station/gold.dmi' + base_name = "gold airlock" + airlock_type = /obj/machinery/door/airlock/gold + mineral = "gold" + glass_type = /obj/machinery/door/airlock/gold/glass + +/obj/structure/door_assembly/door_assembly_silver + name = "silver airlock assembly" + icon = 'icons/obj/doors/airlocks/station/silver.dmi' + base_name = "silver airlock" + airlock_type = /obj/machinery/door/airlock/silver + mineral = "silver" + glass_type = /obj/machinery/door/airlock/silver/glass + +/obj/structure/door_assembly/door_assembly_diamond + name = "diamond airlock assembly" + icon = 'icons/obj/doors/airlocks/station/diamond.dmi' + base_name = "diamond airlock" + airlock_type = /obj/machinery/door/airlock/diamond + mineral = "diamond" + glass_type = /obj/machinery/door/airlock/diamond/glass + +/obj/structure/door_assembly/door_assembly_uranium + name = "uranium airlock assembly" + icon = 'icons/obj/doors/airlocks/station/uranium.dmi' + base_name = "uranium airlock" + airlock_type = /obj/machinery/door/airlock/uranium + mineral = "uranium" + glass_type = /obj/machinery/door/airlock/uranium/glass + +/obj/structure/door_assembly/door_assembly_plasma + name = "plasma airlock assembly" + icon = 'icons/obj/doors/airlocks/station/plasma.dmi' + base_name = "plasma airlock" + airlock_type = /obj/machinery/door/airlock/plasma + mineral = "plasma" + glass_type = /obj/machinery/door/airlock/plasma/glass + +/obj/structure/door_assembly/door_assembly_bananium + name = "bananium airlock assembly" + desc = "Honk." + icon = 'icons/obj/doors/airlocks/station/bananium.dmi' + base_name = "bananium airlock" + airlock_type = /obj/machinery/door/airlock/clown + mineral = "bananium" + glass_type = /obj/machinery/door/airlock/clown/glass + +/obj/structure/door_assembly/door_assembly_sandstone + name = "sandstone airlock assembly" + icon = 'icons/obj/doors/airlocks/station/sandstone.dmi' + base_name = "sandstone airlock" + airlock_type = /obj/machinery/door/airlock/sandstone + mineral = "sandstone" + glass_type = /obj/machinery/door/airlock/sandstone/glass + +/obj/structure/door_assembly/door_assembly_titanium + name = "titanium airlock assembly" + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + base_name = "shuttle airlock" + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + glass_type = /obj/machinery/door/airlock/titanium/glass + airlock_type = /obj/machinery/door/airlock/titanium + mineral = "titanium" + +/obj/structure/door_assembly/door_assembly_wood + name = "wooden airlock assembly" + icon = 'icons/obj/doors/airlocks/station/wood.dmi' + base_name = "wooden airlock" + airlock_type = /obj/machinery/door/airlock/wood + mineral = "wood" + glass_type = /obj/machinery/door/airlock/wood/glass diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index fe6a8c69c2..b803f3f0c2 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -11,7 +11,7 @@ roundstart = FALSE death = FALSE mob_species = /datum/species/pod - flavour_text = "You are a sentient ecosystem - an example of the mastery over life that your creators possessed. Your masters, benevolent as they were, created uncounted \ + flavour_text = "You are a sentient ecosystem, an example of the mastery over life that your creators possessed. Your masters, benevolent as they were, created uncounted \ seed vaults and spread them across the universe to every planet they could chart. You are in one such seed vault. Your goal is to cultivate and spread life wherever it will go while waiting \ for contact from your creators. Estimated time of last contact: Deployment, 5x10^3 millennia ago." assignedrole = "Lifebringer" @@ -43,7 +43,8 @@ death = FALSE anchored = FALSE density = FALSE - flavour_text = "You are an ash walker. Your tribe worships the Necropolis. The wastes are sacred ground, its monsters a blessed bounty. You have seen lights in the distance... they foreshadow the arrival of outsiders that seek to tear apart the Necropolis and its domain. Fresh sacrifices for your nest. You do not know how their magic works, nor where they come from, or the significance of their items." + flavour_text = "You are an ash walker. Your tribe worships the Necropolis. The wastes are sacred ground, its monsters a blessed bounty. \ + You have seen lights in the distance... they foreshadow the arrival of outsiders that seek to tear apart the Necropolis and its domain. Fresh sacrifices for your nest." assignedrole = "Ash Walker" /obj/effect/mob_spawn/human/ash_walker/special(mob/living/new_spawn) @@ -81,7 +82,7 @@ roundstart = FALSE death = FALSE mob_species = /datum/species/shadow - flavour_text = "You are cursed. Years ago, you sacrificed the lives of your trusted friends and the humanity of yourself to reach the Wish Granter. Though you \ + flavour_text = "You are cursed. Years ago, you sacrificed the lives of your trusted friends and the humanity of yourself to reach the Wish Granter. Though you \ did so, it has come at a cost: your very body rejects the light, dooming you to wander endlessly in this horrible wasteland." assignedrole = "Exile" @@ -117,7 +118,7 @@ var/has_owner = FALSE var/can_transfer = TRUE //if golems can switch bodies to this new shell var/mob/living/owner = null //golem's owner if it has one - flavour_text = "You are a Free Golem. Your family worships The Liberator. In his infinite and divine wisdom, he set your clan free to \ + flavour_text = "You are a Free Golem. Your family worships The Liberator. In his infinite and divine wisdom, he set your clan free to \ travel the stars with a single declaration: \"Yeah go do whatever.\" Though you are bound to the one who created you, it is customary in your society to repeat those same words to newborn \ golems, so that no golem may ever be forced to serve again." @@ -130,8 +131,8 @@ if(!mapload && A) notify_ghosts("\A [initial(species.prefix)] golem shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE) if(has_owner && creator) - flavour_text = "You are a golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. \ - Serve [creator], and assist [creator.p_them()] in completing [creator.p_their()] goals at any cost." + flavour_text = "You are a Golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. \ + Serve [creator], and assist [creator.p_them()] in completing [creator.p_their()] goals at any cost." owner = creator /obj/effect/mob_spawn/human/golem/special(mob/living/new_spawn, name) @@ -197,7 +198,7 @@ death = FALSE random = TRUE mob_species = /datum/species/human - flavour_text = "You've been stranded in this godless prison of a planet for longer than you can remember. Each day you barely scrape by, and between the terrible \ + flavour_text = "You've been stranded in this godless prison of a planet for longer than you can remember. Each day you barely scrape by, and between the terrible \ conditions of your makeshift shelter, the hostile creatures, and the ash drakes swooping down from the cloudless skies, all you can wish for is the feel of soft grass between your toes and \ the fresh air of Earth. These thoughts are dispelled by yet another recollection of how you got here... " assignedrole = "Hermit" @@ -244,7 +245,7 @@ name = "broken rejuvenation pod" desc = "A small sleeper typically used to instantly restore minor wounds. This one seems broken, and its occupant is comatose." mob_name = "a translocated vet" - flavour_text = "What...? Where are you? Where are the others? This is still the animal hospital - you should know, you've been an intern here for weeks - but \ + flavour_text = "What...? Where are you? Where are the others? This is still the animal hospital - you should know, you've been an intern here for weeks - but \ everyone's gone. One of the cats scratched you just a few minutes ago. That's why you were in the pod - to heal the scratch. The scabs are still fresh; you see them right now. So where is \ everyone? Where did they go? What happened to the hospital? And is that smoke you smell? You need to find someone else. Maybe they can tell you what happened." assignedrole = "Translocated Vet" @@ -264,7 +265,7 @@ outfit = /datum/outfit/lavalandprisoner roundstart = FALSE death = FALSE - flavour_text = "Good. It seems as though your ship crashed. You're a prisoner, sentenced to hard work in one of Nanotrasen's labor camps, but it seems as \ + flavour_text = "Good. It seems as though your ship crashed. You're a prisoner, sentenced to hard work in one of Nanotrasen's labor camps, but it seems as \ though fate has other plans for you. You remember that you were convicted of " assignedrole = "Escaped Prisoner" @@ -303,8 +304,8 @@ roundstart = FALSE random = TRUE outfit = /datum/outfit/hotelstaff - flavour_text = "You are a staff member of a top-of-the-line space hotel! Cater to guests and DON'T leave the hotel, lest the manager fire you for\ - dereliction of duty!" + flavour_text = "You are a staff member of a top-of-the-line space hotel! Cater to guests and DON'T leave the hotel, lest the manager fire you for\ + dereliction of duty!" assignedrole = "Hotel Staff" /datum/outfit/hotelstaff @@ -319,8 +320,8 @@ name = "hotel security sleeper" mob_name = "hotel security member" outfit = /datum/outfit/hotelstaff/security - flavour_text = "You are a peacekeeper assigned to this hotel to protect the interests of the company while keeping the peace between \ - guests and the staff. Do NOT leave the hotel, as that is grounds for contract termination." + flavour_text = "You are a peacekeeper assigned to this hotel to protect the interests of the company while keeping the peace between \ + guests and the staff. Do NOT leave the hotel, as that is grounds for contract termination." objectives = "Do not leave your assigned hotel. Try and keep the peace between staff and guests, non-lethal force heavily advised if possible." /datum/outfit/hotelstaff/security @@ -355,7 +356,7 @@ /obj/effect/mob_spawn/human/demonic_friend/Initialize(mapload, datum/mind/owner_mind, obj/effect/proc_holder/spell/targeted/summon_friend/summoning_spell) . = ..() owner = owner_mind - flavour_text = "You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for their short mortal coil. Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought. [owner.name]'s death will also return you to hell." + flavour_text = "You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for their short mortal coil. Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought. [owner.name]'s death will also return you to hell." var/area/A = get_area(src) if(!mapload && A) notify_ghosts("\A friendship shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE) @@ -414,7 +415,9 @@ /obj/effect/mob_spawn/human/syndicate/battlecruiser name = "Syndicate Battlecruiser Ship Operative" - flavour_text = "You are a crewmember aboard the syndicate flagship: the SBC Starfury. Your job is to follow your captain's orders, maintain the ship, and keep the engine running. If you are not familiar with how the supermatter engine functions: do not attempt to start it.

    The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives.    " + flavour_text = "You are a crewmember aboard the syndicate flagship: the SBC Starfury. Your job is to follow your captain's orders, maintain the ship, and keep the engine running. If you are not familiar with how the supermatter engine functions: do not attempt to start it.
    \ +
    \ + The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives.    " outfit = /datum/outfit/syndicate_empty/SBC /datum/outfit/syndicate_empty/SBC @@ -425,7 +428,9 @@ /obj/effect/mob_spawn/human/syndicate/battlecruiser/assault name = "Syndicate Battlecruiser Assault Operative" - flavour_text = "You are an assault operative aboard the syndicate flagship: the SBC Starfury. Your job is to follow your captain's orders, keep intruders out of the ship, and assault Space Station 13. There is an armory, multiple assault ships, and beam cannons to attack the station with.

    Work as a team with your fellow operatives and work out a plan of attack. If you are overwhelmed, escape back to your ship!    " + flavour_text = "You are an assault operative aboard the syndicate flagship: the SBC Starfury. Your job is to follow your captain's orders, keep intruders out of the ship, and assault Space Station 13. There is an armory, multiple assault ships, and beam cannons to attack the station with.
    \ +
    \ + Work as a team with your fellow operatives and work out a plan of attack. If you are overwhelmed, escape back to your ship!    " outfit = /datum/outfit/syndicate_empty/SBC/assault /datum/outfit/syndicate_empty/SBC/assault @@ -441,7 +446,9 @@ /obj/effect/mob_spawn/human/syndicate/battlecruiser/captain name = "Syndicate Battlecruiser Captain" - flavour_text = "You are the captain aboard the syndicate flagship: the SBC Starfury. Your job is to oversee your crew, defend the ship, and destroy Space Station 13. The ship has an armory, multiple ships, beam cannons, and multiple crewmembers to accomplish this goal.

    As the captain, this whole operation falls on your shoulders. You do not need to nuke the station, causing sufficient damage and preventing your ship from being destroyed will be enough.    " + flavour_text = "You are the captain aboard the syndicate flagship: the SBC Starfury. Your job is to oversee your crew, defend the ship, and destroy Space Station 13. The ship has an armory, multiple ships, beam cannons, and multiple crewmembers to accomplish this goal.
    \ +
    \ + As the captain, this whole operation falls on your shoulders. You do not need to nuke the station, causing sufficient damage and preventing your ship from being destroyed will be enough.    " outfit = /datum/outfit/syndicate_empty/SBC/assault/captain id_access_list = list(150,151) @@ -467,9 +474,9 @@ death = FALSE random = TRUE mob_species = /datum/species/human - flavour_text = "You are a security officer working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \ + flavour_text = "You are a security officer working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artifical Program telling you that you would only be asleep for eight hours. As you open \ - your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod." + your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod." uniform = /obj/item/clothing/under/rank/security shoes = /obj/item/clothing/shoes/jackboots id = /obj/item/card/id/away/old/sec @@ -491,9 +498,9 @@ death = FALSE random = TRUE mob_species = /datum/species/human - flavour_text = "You are an engineer working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \ + flavour_text = "You are an engineer working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artifical Program telling you that you would only be asleep for eight hours. As you open \ - your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod." + your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod." uniform = /obj/item/clothing/under/rank/engineer shoes = /obj/item/clothing/shoes/workboots id = /obj/item/card/id/away/old/eng @@ -515,9 +522,9 @@ death = FALSE random = TRUE mob_species = /datum/species/human - flavour_text = "You are a scientist working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \ + flavour_text = "You are a scientist working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artifical Program telling you that you would only be asleep for eight hours. As you open \ - your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod." + your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod." uniform = /obj/item/clothing/under/rank/scientist shoes = /obj/item/clothing/shoes/laceup id = /obj/item/card/id/away/old/sci @@ -545,7 +552,7 @@ anchored = TRUE density = FALSE show_flavour = FALSE //Flavour only exists for spawners menu - flavour_text = "You are a space pirate. The station refused to pay for your protection, protect the ship, siphon the credits from the station and raid it for even more loot." + flavour_text = "You are a space pirate. The station refused to pay for your protection, protect the ship, siphon the credits from the station and raid it for even more loot." assignedrole = "Space Pirate" var/rank = "Mate" diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index d6b50d0b1a..5cdadb186c 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -148,4 +148,4 @@ new /obj/item/stack/rods(loc, 4) qdel(src) -#undef VIABLE_MOB_CHECK \ No newline at end of file +#undef VIABLE_MOB_CHECK diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index b1d1af6342..83549a56d2 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -14,7 +14,7 @@ /turf/closed/wall, /obj/structure/falsewall) smooth = SMOOTH_MORE - // flags_1 = CONDUCT_1 + // flags = CONDUCT_1 /obj/structure/lattice/examine(mob/user) ..() diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm index afcace17a7..d21379cb44 100644 --- a/code/game/objects/structures/manned_turret.dm +++ b/code/game/objects/structures/manned_turret.dm @@ -211,4 +211,4 @@ var/obj/machinery/manned_turret/E = user.buckled E.calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(user, params) E.direction_track(user, targeted_atom) - E.checkfire(targeted_atom, user) \ No newline at end of file + E.checkfire(targeted_atom, user) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index c124540d7d..259c72647d 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -37,7 +37,7 @@ /obj/structure/mineral_door/Move() var/turf/T = loc - ..() + . = ..() move_update_air(T) /obj/structure/mineral_door/CollidedWith(atom/movable/AM) diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index d468e87a34..f4936b1d80 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -21,4 +21,4 @@ to_chat(user, "You wet [I] in [src].") playsound(loc, 'sound/effects/slosh.ogg', 25, 1) else - return ..() + return ..() \ No newline at end of file diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index 1ae513f847..a8ca42bff5 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -202,7 +202,7 @@ var/new_angle = WRAP(rotation_angle + norm_inc, 180, -180) if(ISINRANGE_EX(norm_inc, -90, 90)) return FALSE - P.Angle = new_angle + P.setAngle(new_angle) return ..() //DOUBLE @@ -229,7 +229,7 @@ var/new_angle = WRAP(rotation_angle + norm_inc, 180, -180) if(ISINRANGE_EX(norm_inc, -90, 90)) new_angle += 180 - P.Angle = new_angle + P.setAngle(new_angle) return ..() //BOX @@ -251,7 +251,7 @@ anchored = TRUE /obj/structure/reflector/box/auto_reflect(obj/item/projectile/P) - P.Angle = rotation_angle + P.setAngle(rotation_angle) return ..() /obj/structure/reflector/ex_act() diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 9df47743a4..550c89d1ae 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -33,7 +33,7 @@ FLOOR SAFES /obj/structure/safe/Initialize(mapload) - ..() + . = ..() if(!mapload) return diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 254ec956c3..ae853b4aed 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -135,11 +135,6 @@ Cargo(brown), Science(purple), Escape(red and white), and Medbay(blue).\nIn the center of the station, you see the Bridge(dark blue).\n\ Around those, you see Hallways/Entrances(light grey), Public Areas(grey), and Maintenance(dark grey)." -/obj/structure/sign/map/left/ceres - icon_state = "map-CS" - desc = "A framed picture of the station.\nClockwise from the top, you see Security (red), Dorms (light-green), Bridge (dark-blue), AI Core (gray), \ - Cargo (brown), Medbay (blue), Arrivals/Departures(orange/cyan), Research (purple), Service (dark-green), and Engineering in the center (yellow)." - /obj/structure/sign/securearea name = "\improper SECURE AREA" desc = "A warning sign which reads 'SECURE AREA'." @@ -246,7 +241,7 @@ desc = "This plaque commemorates those who have fallen in glorious combat. For all the charred, dizzy, and beaten men who have died in its hands." /obj/structure/sign/nanotrasen - name = "\improper NanoTrasen Logo " + name = "\improper Nanotrasen Logo" desc = "A sign with the Nanotrasen Logo on it. Glory to Nanotrasen!" icon_state = "nanotrasen" @@ -354,4 +349,4 @@ /obj/structure/sign/logo name = "nanotrasen logo" desc = "The Nanotrasen corporate logo." - icon_state = "ss13sign-1" + icon_state = "nanotrasen_sign1" diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 58b4186ad5..2ff0d5ef7a 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -16,7 +16,7 @@ pinned_target = null /obj/structure/target_stake/Move() - ..() + . = ..() if(pinned_target) pinned_target.forceMove(loc) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index ab0f676007..c7595f3981 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -569,7 +569,6 @@ qdel(src) - //Shower Curtains// //Defines used are pre-existing in layers.dm// diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index bb5be3a501..0949f540c7 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -47,7 +47,7 @@ /obj/structure/windoor_assembly/Move() var/turf/T = loc - ..() + . = ..() setDir(ini_dir) move_update_air(T) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index f5aec5c274..0986f2f66e 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -357,7 +357,7 @@ /obj/structure/window/Move() var/turf/T = loc - ..() + . = ..() setDir(ini_dir) move_update_air(T) diff --git a/code/game/say.dm b/code/game/say.dm index 570974c0bc..817238f427 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -4,18 +4,18 @@ And the base of the send_speech() proc, which is the core of saycode. */ GLOBAL_LIST_INIT(freqtospan, list( - "1351" = "sciradio", - "1355" = "medradio", - "1357" = "engradio", - "1347" = "suppradio", - "1349" = "servradio", - "1359" = "secradio", - "1353" = "comradio", - "1447" = "aiprivradio", - "1213" = "syndradio", - "1337" = "centcomradio", - "1215" = "redteamradio", - "1217" = "blueteamradio" + "[FREQ_SCIENCE]" = "sciradio", + "[FREQ_MEDICAL]" = "medradio", + "[FREQ_ENGINEERING]" = "engradio", + "[FREQ_SUPPLY]" = "suppradio", + "[FREQ_SERVICE]" = "servradio", + "[FREQ_SECURITY]" = "secradio", + "[FREQ_COMMAND]" = "comradio", + "[FREQ_AI_PRIVATE]" = "aiprivradio", + "[FREQ_SYNDICATE]" = "syndradio", + "[FREQ_CENTCOM]" = "centcomradio", + "[FREQ_CTF_RED]" = "redteamradio", + "[FREQ_CTF_BLUE]" = "blueteamradio" )) /atom/movable/proc/say(message, datum/language/language = null) @@ -168,6 +168,41 @@ GLOBAL_LIST_INIT(freqtospan, list( var/atom/movable/source var/obj/item/device/radio/radio +INITIALIZE_IMMEDIATE(/atom/movable/virtualspeaker) +/atom/movable/virtualspeaker/Initialize(mapload, atom/movable/M, radio) + . = ..() + radio = radio + source = M + if (istype(M)) + name = M.GetVoice() + verb_say = M.verb_say + verb_ask = M.verb_ask + verb_exclaim = M.verb_exclaim + verb_yell = M.verb_yell + + // The mob's job identity + if(ishuman(M)) + // Humans use their job as seen on the crew manifest. This is so the AI + // can know their job even if they don't carry an ID. + var/datum/data/record/findjob = find_record("name", name, GLOB.data_core.general) + if(findjob) + job = findjob.fields["rank"] + else + job = "Unknown" + else if(iscarbon(M)) // Carbon nonhuman + job = "No ID" + else if(isAI(M)) // AI + job = "AI" + else if(iscyborg(M)) // Cyborg + var/mob/living/silicon/robot/B = M + job = "[B.designation] Cyborg" + else if(istype(M, /mob/living/silicon/pai)) // Personal AI (pAI) + job = "Personal AI" + else if(isobj(M)) // Cold, emotionless machines + job = "Machine" + else // Unidentifiable mob + job = "Unknown" + /atom/movable/virtualspeaker/GetJob() return job diff --git a/code/game/sound.dm b/code/game/sound.dm index 9cfa197738..48accadb59 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -149,6 +149,7 @@ soundin = pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg') if ("can_open") soundin = pick('sound/effects/can_open1.ogg', 'sound/effects/can_open2.ogg', 'sound/effects/can_open3.ogg') + //START OF CIT CHANGES - adds random vore sounds if ("struggle_sound") soundin = pick( 'sound/vore/pred/struggle_01.ogg','sound/vore/pred/struggle_02.ogg','sound/vore/pred/struggle_03.ogg', 'sound/vore/pred/struggle_04.ogg','sound/vore/pred/struggle_05.ogg') @@ -179,6 +180,7 @@ 'sound/vore/prey/death_04.ogg','sound/vore/prey/death_05.ogg','sound/vore/prey/death_06.ogg', 'sound/vore/prey/death_07.ogg','sound/vore/prey/death_08.ogg','sound/vore/prey/death_09.ogg', 'sound/vore/prey/death_10.ogg') + //END OF CIT CHANGES if("bullet_miss") soundin = pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg') if("gun_dry_fire") @@ -190,7 +192,7 @@ if("gun_remove_empty_magazine") soundin = pick('sound/weapons/gun_magazine_remove_empty_1.ogg', 'sound/weapons/gun_magazine_remove_empty_2.ogg', 'sound/weapons/gun_magazine_remove_empty_3.ogg', 'sound/weapons/gun_magazine_remove_empty_4.ogg') if("gun_slide_lock") - soundin = pick('sound/weapons/gun_slide_lock_1.ogg', 'sound/weapons/gun_slide_lock_2.ogg', 'sound/weapons/gun_slide_lock_3.ogg', 'sound/weapons/gun_slide_lock_4.ogg', 'sound/weapons/gun_slide_lock_5.ogg') + soundin = pick('sound/weapons/gun_slide_lock_1.ogg', 'sound/weapons/gun_slide_lock_2.ogg', 'sound/weapons/gun_slide_lock_3.ogg', 'sound/weapons/gun_slide_lock_4.ogg', 'sound/weapons/gun_slide_lock_5.ogg') if("law") soundin = pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg') if("honkbot_e") diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index e9ff95af84..dc229971d6 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -146,6 +146,9 @@ var/uses_overlay = TRUE var/obj/effect/clockwork/overlay/floor/realappearence +/turf/open/floor/clockwork/Bless() //Who needs holy blessings when you have DADDY RATVAR? + return + /turf/open/floor/clockwork/Initialize() . = ..() if(uses_overlay) diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm index 24056658c4..a06f7c9458 100644 --- a/code/game/turfs/simulated/wall/misc_walls.dm +++ b/code/game/turfs/simulated/wall/misc_walls.dm @@ -70,6 +70,10 @@ if(realappearence) qdel(realappearence) realappearence = null + if(heated) + var/mob/camera/eminence/E = get_eminence() + if(E) + E.superheated_walls-- return ..() /turf/closed/wall/clockwork/ReplaceWithLattice() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 7da53425bd..e95ea32046 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -63,7 +63,7 @@ new_angle_s -= 360 while(new_angle_s < -180) new_angle_s += 360 - P.Angle = new_angle_s + P.setAngle(new_angle_s) return TRUE /turf/closed/wall/proc/dismantle_wall(devastated=0, explode=0) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index f0563ade79..97ebcd3a26 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -411,7 +411,7 @@ return if(has_gravity(src)) playsound(src, "bodyfall", 50, 1) - + faller.drop_all_held_items() /turf/proc/add_decal(decal,group) LAZYINITLIST(decals) diff --git a/code/game/world.dm b/code/game/world.dm index a665b8505d..b1174b3386 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -30,20 +30,19 @@ GLOBAL_PROTECT(security_mode) if(CONFIG_GET(flag/usewhitelist)) load_whitelist() LoadBans() - reload_custom_roundstart_items_list() + reload_custom_roundstart_items_list()//Cit change - loads donator items. Remind me to remove when I port over bay's loadout system GLOB.timezoneOffset = text2num(time2text(0,"hh")) * 36000 if(fexists(RESTART_COUNTER_PATH)) GLOB.restart_counter = text2num(trim(file2text(RESTART_COUNTER_PATH))) fdel(RESTART_COUNTER_PATH) - + if("no-init" in params) return Master.Initialize(10, FALSE) - /world/proc/SetupExternalRSC() #if (PRELOAD_RSC == 0) external_rsc_urls = world.file2list("config/external_rsc_urls.txt","\n") @@ -65,15 +64,15 @@ GLOBAL_PROTECT(security_mode) var/db_major = text2num(query_db_version.item[1]) var/db_minor = text2num(query_db_version.item[2]) if(db_major != DB_MAJOR_VERSION || db_minor != DB_MINOR_VERSION) - var/which = "behind" - if(db_major < DB_MAJOR_VERSION || db_minor < DB_MINOR_VERSION) - which = "ahead of" - message_admins("Database schema ([db_major].[db_minor]) is [which] the latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors") - log_sql("Database schema ([db_major].[db_minor]) is [which] the latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors") + message_admins("Database schema ([db_major].[db_minor]) doesn't match the latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors") + log_sql("Database schema ([db_major].[db_minor]) doesn't match the latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors") else message_admins("Could not get schema version from database") + log_sql("Could not get schema version from database") else - log_world("Your server failed to establish a connection with the database.") + log_sql("Your server failed to establish a connection with the database.") + else + log_sql("Database is not enabled in configuration.") /world/proc/SetRoundID() if(CONFIG_GET(flag/sql_enabled)) @@ -131,6 +130,7 @@ GLOBAL_PROTECT(security_mode) SERVER_TOOLS_ON_TOPIC //redirect to server tools if necessary var/static/list/topic_handlers = TopicHandlers() + var/list/input = params2list(T) var/datum/world_topic/handler for(var/I in topic_handlers) diff --git a/modular_citadel/code/game/machinery/Sleeper.dm b/modular_citadel/code/game/machinery/Sleeper.dm new file mode 100644 index 0000000000..4cf04524b2 --- /dev/null +++ b/modular_citadel/code/game/machinery/Sleeper.dm @@ -0,0 +1,2 @@ +/obj/machinery/sleeper + min_health = 30 diff --git a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm new file mode 100644 index 0000000000..5b8fb5dada --- /dev/null +++ b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm @@ -0,0 +1,76 @@ +/obj/item/device/electropack/shockcollar + name = "shock collar" + desc = "A reinforced metal collar. It seems to have some form of wiring near the front. Strange.." + icon = 'icons/obj/clothing/neck.dmi' + icon_state = "shockcollar" + item_state = "shockcollar" + body_parts_covered = NECK + slot_flags = SLOT_NECK + w_class = WEIGHT_CLASS_SMALL + strip_delay = 60 + equip_delay_other = 60 + materials = list(MAT_METAL=5000, MAT_GLASS=2000) + var/tagname = null + +/obj/item/device/electropack/shockcollar/attack_hand(mob/user) + if(loc == user) + if(slot_flags == SLOT_NECK) + if(user.get_item_by_slot(slot_neck)) + to_chat(user, "The collar is fastened tight! You'll need help taking this off!") + return + ..() + +/obj/item/device/electropack/shockcollar/receive_signal(datum/signal/signal) + if(!signal || signal.encryption != code) + return + + if(isliving(loc) && on) + if(shock_cooldown != 0) + return + shock_cooldown = 1 + spawn(100) + shock_cooldown = 0 + var/mob/living/L = loc + step(L, pick(GLOB.cardinals)) + + to_chat(L, "You feel a sharp shock from the collar!") + var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread + s.set_up(3, 1, L) + s.start() + + L.Knockdown(100) + + if(master) + master.receive_signal() + return + +/obj/item/device/electropack/shockcollar/attack_self(mob/user) //Turns out can't fully source this from the parent item, spritepath gets confused if power toggled. Will come back to this when I know how to code better and readd powertoggle.. + var/option = "Change Name" + option = input(user, "What do you want to do?", "[src]", option) as null|anything in list("Change Name", "Change Frequency") + switch(option) + if("Change Name") + var/t = input(user, "Would you like to change the name on the tag?", "Name your new pet", tagname ? tagname : "Spot") as null|text + if(t) + tagname = copytext(sanitize(t), 1, MAX_NAME_LEN) + name = "[initial(name)] - [tagname]" + if("Change Frequency") + if(!ishuman(user)) + return + user.set_machine(src) + var/dat = {"
    + Frequency/Code for shock collar:
    + Frequency: + - + - [format_frequency(frequency)] + + + +
    + Code: + - + - [code] + + + +
    +     "} + + user << browse(dat, "window=radio") + onclose(user, "radio") + return diff --git a/modular_citadel/code/game/objects/items/handcuffs.dm b/modular_citadel/code/game/objects/items/handcuffs.dm new file mode 100644 index 0000000000..8c5bbdb58d --- /dev/null +++ b/modular_citadel/code/game/objects/items/handcuffs.dm @@ -0,0 +1,4 @@ +/obj/item/restraints/handcuffs/fake/kinky + name = "kinky handcuffs" + desc = "Fake handcuffs meant for erotic roleplay." + icon_state = "handcuffGag" diff --git a/tgstation.dme b/tgstation.dme index 01effafe8d..c24ba9e90e 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -32,6 +32,7 @@ #include "code\__DEFINES\citadel_defines.dm" #include "code\__DEFINES\cleaning.dm" #include "code\__DEFINES\clockcult.dm" +#include "code\__DEFINES\colors.dm" #include "code\__DEFINES\combat.dm" #include "code\__DEFINES\components.dm" #include "code\__DEFINES\configuration.dm" @@ -162,6 +163,7 @@ #include "code\_onclick\hud\blob_overmind.dm" #include "code\_onclick\hud\blobbernauthud.dm" #include "code\_onclick\hud\constructs.dm" +#include "code\_onclick\hud\credits.dm" #include "code\_onclick\hud\devil.dm" #include "code\_onclick\hud\drones.dm" #include "code\_onclick\hud\fullscreen.dm" @@ -245,6 +247,7 @@ #include "code\controllers\subsystem\icon_smooth.dm" #include "code\controllers\subsystem\idlenpcpool.dm" #include "code\controllers\subsystem\inbounds.dm" +#include "code\controllers\subsystem\input.dm" #include "code\controllers\subsystem\ipintel.dm" #include "code\controllers\subsystem\job.dm" #include "code\controllers\subsystem\language.dm" @@ -489,11 +492,9 @@ #include "code\game\area\Space_Station_13_areas.dm" #include "code\game\area\areas\away_content.dm" #include "code\game\area\areas\centcom.dm" -#include "code\game\area\areas\derelict.dm" #include "code\game\area\areas\holodeck.dm" #include "code\game\area\areas\mining.dm" #include "code\game\area\areas\misc.dm" -#include "code\game\area\areas\ruins.dm" #include "code\game\area\areas\shuttles.dm" #include "code\game\area\areas\space_content.dm" #include "code\game\area\areas\ruins\_ruins.dm" @@ -508,7 +509,6 @@ #include "code\game\gamemodes\game_mode.dm" #include "code\game\gamemodes\objective.dm" #include "code\game\gamemodes\objective_items.dm" -#include "code\game\gamemodes\objective_team.dm" #include "code\game\gamemodes\blob\blob_report.dm" #include "code\game\gamemodes\blob\overmind.dm" #include "code\game\gamemodes\blob\powers.dm" @@ -739,7 +739,6 @@ #include "code\game\machinery\computer\launchpad_control.dm" #include "code\game\machinery\computer\law.dm" #include "code\game\machinery\computer\medical.dm" -#include "code\game\machinery\computer\message.dm" #include "code\game\machinery\computer\monastery_shuttle.dm" #include "code\game\machinery\computer\Operating.dm" #include "code\game\machinery\computer\pod.dm" @@ -774,11 +773,13 @@ #include "code\game\machinery\telecomms\machine_interactions.dm" #include "code\game\machinery\telecomms\telecomunications.dm" #include "code\game\machinery\telecomms\computers\logbrowser.dm" +#include "code\game\machinery\telecomms\computers\message.dm" #include "code\game\machinery\telecomms\computers\telemonitor.dm" #include "code\game\machinery\telecomms\machines\allinone.dm" #include "code\game\machinery\telecomms\machines\broadcaster.dm" #include "code\game\machinery\telecomms\machines\bus.dm" #include "code\game\machinery\telecomms\machines\hub.dm" +#include "code\game\machinery\telecomms\machines\message_server.dm" #include "code\game\machinery\telecomms\machines\processor.dm" #include "code\game\machinery\telecomms\machines\receiver.dm" #include "code\game\machinery\telecomms\machines\relay.dm" @@ -816,7 +817,6 @@ #include "code\game\objects\obj_defense.dm" #include "code\game\objects\objs.dm" #include "code\game\objects\structures.dm" -#include "code\game\objects\weapons.dm" #include "code\game\objects\effects\alien_acid.dm" #include "code\game\objects\effects\anomalies.dm" #include "code\game\objects\effects\bump_teleporter.dm" @@ -875,7 +875,6 @@ #include "code\game\objects\items\charter.dm" #include "code\game\objects\items\chrono_eraser.dm" #include "code\game\objects\items\cigs_lighters.dm" -#include "code\game\objects\items\clown.dm" #include "code\game\objects\items\clown_items.dm" #include "code\game\objects\items\control_wand.dm" #include "code\game\objects\items\cosmetics.dm" @@ -1049,6 +1048,7 @@ #include "code\game\objects\structures\displaycase.dm" #include "code\game\objects\structures\divine.dm" #include "code\game\objects\structures\door_assembly.dm" +#include "code\game\objects\structures\door_assembly_types.dm" #include "code\game\objects\structures\dresser.dm" #include "code\game\objects\structures\electricchair.dm" #include "code\game\objects\structures\extinguisher.dm" @@ -1330,7 +1330,6 @@ #include "code\modules\client\verbs\looc.dm" #include "code\modules\client\verbs\ooc.dm" #include "code\modules\client\verbs\ping.dm" -#include "code\modules\client\verbs\sethotkeys.dm" #include "code\modules\client\verbs\suicide.dm" #include "code\modules\client\verbs\who.dm" #include "code\modules\clothing\chameleon.dm" @@ -1640,6 +1639,16 @@ #include "code\modules\jobs\job_types\security.dm" #include "code\modules\jobs\job_types\silicon.dm" #include "code\modules\jobs\map_changes\map_changes.dm" +#include "code\modules\keybindings\bindings_admin.dm" +#include "code\modules\keybindings\bindings_atom.dm" +#include "code\modules\keybindings\bindings_carbon.dm" +#include "code\modules\keybindings\bindings_client.dm" +#include "code\modules\keybindings\bindings_human.dm" +#include "code\modules\keybindings\bindings_living.dm" +#include "code\modules\keybindings\bindings_mob.dm" +#include "code\modules\keybindings\bindings_robot.dm" +#include "code\modules\keybindings\focus.dm" +#include "code\modules\keybindings\setup.dm" #include "code\modules\language\aphasia.dm" #include "code\modules\language\beachbum.dm" #include "code\modules\language\codespeak.dm" @@ -1714,7 +1723,6 @@ #include "code\modules\mob\login.dm" #include "code\modules\mob\logout.dm" #include "code\modules\mob\mob.dm" -#include "code\modules\mob\mob_cleanup.dm" #include "code\modules\mob\mob_defines.dm" #include "code\modules\mob\mob_helpers.dm" #include "code\modules\mob\mob_movement.dm" @@ -1828,7 +1836,6 @@ #include "code\modules\mob\living\carbon\human\species.dm" #include "code\modules\mob\living\carbon\human\status_procs.dm" #include "code\modules\mob\living\carbon\human\update_icons.dm" -#include "code\modules\mob\living\carbon\human\whisper.dm" #include "code\modules\mob\living\carbon\human\species_types\abductors.dm" #include "code\modules\mob\living\carbon\human\species_types\android.dm" #include "code\modules\mob\living\carbon\human\species_types\angel.dm" @@ -2250,7 +2257,6 @@ #include "code\modules\research\designs.dm" #include "code\modules\research\destructive_analyzer.dm" #include "code\modules\research\experimentor.dm" -#include "code\modules\research\message_server.dm" #include "code\modules\research\protolathe.dm" #include "code\modules\research\rdconsole.dm" #include "code\modules\research\rdmachines.dm" @@ -2403,7 +2409,6 @@ #include "code\modules\surgery\organs\augments_chest.dm" #include "code\modules\surgery\organs\augments_eyes.dm" #include "code\modules\surgery\organs\augments_internal.dm" -#include "code\modules\surgery\organs\autoimplanter.dm" #include "code\modules\surgery\organs\autosurgeon.dm" #include "code\modules\surgery\organs\ears.dm" #include "code\modules\surgery\organs\eyes.dm" @@ -2474,7 +2479,10 @@ #include "modular_citadel\cydonian_armor.dm" #include "modular_citadel\polychromic_clothes.dm" #include "modular_citadel\code\datums\uplink_items_cit.dm" +#include "modular_citadel\code\game\objects\machinery\Sleeper.dm" +#include "modular_citadel\code\game\objects\items\handcuffs.dm" #include "modular_citadel\code\game\objects\items\devices\PDA\PDA.dm" +#include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm" #include "modular_citadel\code\game\objects\items\melee\eutactic_blades.dm" #include "modular_citadel\code\modules\crafting\recipes.dm" #include "modular_citadel\code\modules\mob\living\carbon\human\human_defense.dm"